Hello community, here is the log from the commit of package vinagre for openSUSE:12.1:Update:Test checked in at 2012-02-16 10:38:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/vinagre (Old) and /work/SRC/openSUSE:12.1:Update:Test/.vinagre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vinagre", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/vinagre/vinagre.changes 2012-02-16 10:38:58.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.vinagre.new/vinagre.changes 2012-02-16 10:39:00.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Nov 17 09:47:46 UTC 2011 - dims...@opensuse.org + +- Update to version 3.2.2: + + Use a button-sized image on ‘Authenticate’ button + + Hold the slave PTY open, so that SSH does not fail + + Updated translations. + +------------------------------------------------------------------- Old: ---- vinagre-3.2.1.tar.bz2 New: ---- vinagre-3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vinagre.spec ++++++ --- /var/tmp/diff_new_pack.37C0Q6/_old 2012-02-16 10:39:00.000000000 +0100 +++ /var/tmp/diff_new_pack.37C0Q6/_new 2012-02-16 10:39:00.000000000 +0100 @@ -20,7 +20,7 @@ Name: vinagre Summary: VNC client for GNOME -Version: 3.2.1 +Version: 3.2.2 Release: 1 # FIXME: when patch0 is dropped, remove the first make that is needed to generate a header; it'll get fixed properly upstream because the missing file will be in the tarball # FIXME: Check if bgo#653558 has been fixed. Once fixed, remove the -Wl,--no-as-needed hack in the build section and verify if the plugins work. ++++++ vinagre-3.2.1.tar.bz2 -> vinagre-3.2.2.tar.bz2 ++++++ ++++ 2143 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/ChangeLog new/vinagre-3.2.2/ChangeLog --- old/vinagre-3.2.1/ChangeLog 2011-10-17 21:39:57.000000000 +0200 +++ new/vinagre-3.2.2/ChangeLog 2011-11-14 18:10:33.000000000 +0100 @@ -1,3 +1,45 @@ +2011-11-14 David King <amigad...@amigadave.com> + + Update NEWS for 3.2.2 release + +2011-11-03 Jiro Matsuzawa <jmatsuz...@src.gnome.org> + + Updated Japanese translation + +2011-11-01 David King <amigad...@amigadave.com> + + Use a button-sized image on ‘Authenticate’ button + + Jens Georg noticed that the ‘Authenticate’ button used an image that was + very large, causing it to expand too much horizontally. The image was + incorrectly set to be Gtk.IconSize.DIALOG, which should have been + Gtk.IconSize.BUTTON. + +2011-10-28 YunQiang Su <y...@src.gnome.org> + + fix an zh_CN translation mistake + +2011-10-23 Gabor Kelemen <kelem...@gnome.hu> + + Fix an accelerator conflict + +2011-10-22 Gabor Kelemen <kelem...@gnome.hu> + + Little fixes for the Hungarian help translation + +2011-10-18 Tristan Schmelcher <tristan_schmelc...@alumni.uwaterloo.ca> + + Hold the slave PTY open, so that SSH does not fail + + Optionally hold the slave PTY open in the parent. Needed to prevent EIO + from read() on the master if exec'ing a program that enumerates and + closes open fds before opening /dev/tty (ssh). Partially fixes bug + 644432. + +2011-10-17 David King <amigad...@amigadave.com> + + Post-release version bump to 3.2.2 + 2011-10-17 David King <amigad...@amigadave.com> Update NEWS for 3.2.1 release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/NEWS new/vinagre-3.2.2/NEWS --- old/vinagre-3.2.1/NEWS 2011-10-17 21:15:20.000000000 +0200 +++ new/vinagre-3.2.2/NEWS 2011-11-14 18:06:28.000000000 +0100 @@ -1,3 +1,24 @@ +Vinagre 3.2.2 +============= + +David King (3): + Post-release version bump to 3.2.2 + Use a button-sized image on ‘Authenticate’ button + Update NEWS for 3.2.2 release + +Gabor Kelemen (2): + Little fixes for the Hungarian help translation + Fix an accelerator conflict + +Jiro Matsuzawa (1): + Updated Japanese translation + +Tristan Schmelcher (1): + Hold the slave PTY open, so that SSH does not fail + +YunQiang Su (1): + fix an zh_CN translation mistake + Vinagre 3.2.1 ============= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/configure.ac new/vinagre-3.2.2/configure.ac --- old/vinagre-3.2.1/configure.ac 2011-10-17 21:14:22.000000000 +0200 +++ new/vinagre-3.2.2/configure.ac 2011-11-14 18:03:39.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ([2.64]) -AC_INIT([Vinagre], [3.2.1], [https://bugzilla.gnome.org/enter_bug.cgi?product=vinagre], [vinagre], [http://projects.gnome.org/vinagre/]) +AC_INIT([Vinagre], [3.2.2], [https://bugzilla.gnome.org/enter_bug.cgi?product=vinagre], [vinagre], [http://projects.gnome.org/vinagre/]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR([vinagre/vinagre-main.c]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/data/vinagre-file.desktop.in new/vinagre-3.2.2/data/vinagre-file.desktop.in --- old/vinagre-3.2.1/data/vinagre-file.desktop.in 2011-10-17 21:36:06.000000000 +0200 +++ new/vinagre-3.2.2/data/vinagre-file.desktop.in 2011-11-14 18:09:11.000000000 +0100 @@ -12,4 +12,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=vinagre X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=3.2.1 +X-GNOME-Bugzilla-Version=3.2.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/data/vinagre.desktop.in new/vinagre-3.2.2/data/vinagre.desktop.in --- old/vinagre-3.2.1/data/vinagre.desktop.in 2011-10-17 21:36:06.000000000 +0200 +++ new/vinagre-3.2.2/data/vinagre.desktop.in 2011-11-14 18:09:11.000000000 +0100 @@ -11,4 +11,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=vinagre X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=3.2.1 +X-GNOME-Bugzilla-Version=3.2.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/help/hu/connect-file.page new/vinagre-3.2.2/help/hu/connect-file.page --- old/vinagre-3.2.1/help/hu/connect-file.page 2011-10-17 21:39:55.000000000 +0200 +++ new/vinagre-3.2.2/help/hu/connect-file.page 2011-11-14 18:10:30.000000000 +0100 @@ -5,7 +5,7 @@ <link type="guide" xref="index#connections"/> <link type="seealso" xref="connect"/> <title type="sort">2</title> - <desc>Távolikapcsolat-fájl használata távoli géphez kapcsolódáshoz.</desc> + <desc>Távolikapcsolat-fájl használata a távoli géphez kapcsolódáshoz.</desc> <credit type="author"> <name>Ekaterina Gerasimova</name> <email>kittykat3...@googlemail.com</email> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/help/hu/connect.page new/vinagre-3.2.2/help/hu/connect.page --- old/vinagre-3.2.1/help/hu/connect.page 2011-10-17 21:39:55.000000000 +0200 +++ new/vinagre-3.2.2/help/hu/connect.page 2011-11-14 18:10:30.000000000 +0100 @@ -38,7 +38,7 @@ <item> <p>Nyomja meg a <gui>Kapcsolódás</gui> gombot.</p> <note> - <p>Ezen a ponton előfordulhat, hogy a távoli asztalnak jóvá kell hagynia a kapcsolódást. Ebben az esetben a megjelenítő fekete maradhat, amíg a jóváhagyása meg nem érkezik.</p> + <p>Ezen a ponton előfordulhat, hogy a távoli asztalnak jóvá kell hagynia a kapcsolódást. Ebben az esetben a megjelenítő fekete maradhat, amíg a jóváhagyása nem érkezik meg.</p> </note> <note> <p>Bizonyos kapcsolatoknál hitelesítés szükséges, ekkor megjelenik egy párbeszédablak. Itt meg kell adnia a belépéshez szükséges adatokat, ezek a távoli géptől függően például felhasználónév és jelszó lehetnek. Ha bejelöli az <gui>Emlékezzen a hitelesítési adatokra</gui> négyzetet, akkor a <app>Vinagre</app> elmenti azt a kulcstartójára.</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/help/hu/hu.po new/vinagre-3.2.2/help/hu/hu.po --- old/vinagre-3.2.1/help/hu/hu.po 2011-10-17 21:39:56.000000000 +0200 +++ new/vinagre-3.2.2/help/hu/hu.po 2011-11-14 18:10:31.000000000 +0100 @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: vinagre master\n" "POT-Creation-Date: 2011-09-02 06:43+0000\n" -"PO-Revision-Date: 2011-09-21 10:27+0200\n" +"PO-Revision-Date: 2011-10-22 13:08+0200\n" "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n" -"Language-Team: Magyar <gnome-hu-list at gnome dot org>\n" +"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "Language: hu\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: KBabel 1.11.4\n" #: C/view-only.page:7(desc) msgid "Disable interaction with the remote desktop." @@ -129,10 +129,8 @@ #| msgid "" #| "@@image: 'figures/vinagre-connect-dialog.png'; " #| "md5=3fc6d3998c0df3fdf5ddcfc9effdd87b" -msgid "" -"@@image: 'figures/vinagre-scaling.png'; md5=d307923fd473871d8d4c8fc81d716256" -msgstr "" -"@@image: 'figures/vinagre-scaling.png'; md5=d307923fd473871d8d4c8fc81d716256" +msgid "@@image: 'figures/vinagre-scaling.png'; md5=d307923fd473871d8d4c8fc81d716256" +msgstr "@@image: 'figures/vinagre-scaling.png'; md5=d307923fd473871d8d4c8fc81d716256" #: C/scaling.page:7(desc) msgid "Scale the remote desktop to fit the display area." @@ -236,8 +234,7 @@ msgstr "Fordított kapcsolatok engedélyezése" #: C/reverse-connections.page:33(p) -msgid "" -"Open <guiseq><gui>Remote</gui><gui>Reverse Connections...</gui></guiseq>." +msgid "Open <guiseq><gui>Remote</gui><gui>Reverse Connections...</gui></guiseq>." msgstr "" "Válassza a <guiseq><gui>Gép</gui><gui>Fordított kapcsolatok…</gui> </guiseq> " "menüpontot." @@ -294,10 +291,8 @@ "külső IP-címet és a portszámot." #: C/keyboard-shortcuts.page:7(desc) -msgid "" -"Use keyboard shortcuts with <app>Vinagre</app> instead of the remote machine." -msgstr "" -"Gyorsbillentyűk használata a <app>Vinagreban</app> a távoli gép helyett." +msgid "Use keyboard shortcuts with <app>Vinagre</app> instead of the remote machine." +msgstr "Gyorsbillentyűk használata a <app>Vinagreban</app> a távoli gép helyett." #: C/keyboard-shortcuts.page:18(title) #| msgid "Allow keyboard shortcuts" @@ -490,7 +485,7 @@ #: C/connect-file.page:9(desc) msgid "Use a remote connection file to connect to a remote machine." -msgstr "Távolikapcsolat-fájl használata távoli géphez kapcsolódáshoz." +msgstr "Távolikapcsolat-fájl használata a távoli géphez kapcsolódáshoz." #: C/connect-file.page:19(title) #| msgid "Connecting with a .vnc file" @@ -508,8 +503,7 @@ #: C/connect-file.page:26(p) msgid "Choose <guiseq><gui>Remote</gui><gui>Open</gui></guiseq>." -msgstr "" -"Válassza a <guiseq><gui>Gép</gui><gui>Megnyitás</gui></guiseq> menüpontot." +msgstr "Válassza a <guiseq><gui>Gép</gui><gui>Megnyitás</gui></guiseq> menüpontot." #: C/connect-file.page:29(p) msgid "Select the file you want to open." @@ -575,16 +569,14 @@ #: C/connect.page:25(p) msgid "Choose <guiseq><gui>Remote</gui><gui>Connect</gui></guiseq>." -msgstr "" -"Válassza a <guiseq><gui>Gép</gui><gui>Kapcsolódás</gui></guiseq> menüpontot." +msgstr "Válassza a <guiseq><gui>Gép</gui><gui>Kapcsolódás</gui></guiseq> menüpontot." #: C/connect.page:27(title) msgid "Connect dialog" msgstr "Kapcsolódás ablak" #: C/connect.page:32(p) -msgid "" -"Choose the <gui>Protocol</gui> and the <gui>Host</gui> for the connection." +msgid "Choose the <gui>Protocol</gui> and the <gui>Host</gui> for the connection." msgstr "" "Válasszon a <gui>Protokoll</gui> listából, és töltse ki a <gui>Gép</gui> " "mezőt a kapcsolódáshoz." @@ -624,7 +616,7 @@ msgstr "" "Ezen a ponton előfordulhat, hogy a távoli asztalnak jóvá kell hagynia a " "kapcsolódást. Ebben az esetben a megjelenítő fekete maradhat, amíg a " -"jóváhagyása meg nem érkezik." +"jóváhagyása nem érkezik meg." #: C/connect.page:52(p) msgid "" @@ -705,3 +697,4 @@ #~ msgstr "" #~ "Kattintson a <gui>Kapcsolódás</gui> gombra. Ekkor a távoli gép " #~ "megerősítést kér a kapcsolat létrehozatalához." + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/m4/libtool.m4 new/vinagre-3.2.2/m4/libtool.m4 --- old/vinagre-3.2.1/m4/libtool.m4 2011-10-17 21:35:32.000000000 +0200 +++ new/vinagre-3.2.2/m4/libtool.m4 2011-09-25 11:18:31.000000000 +0200 @@ -2421,14 +2421,7 @@ *) objformat=elf ;; esac fi - # Handle Gentoo/FreeBSD as it was Linux - case $host_vendor in - gentoo) - version_type=linux ;; - *) - version_type=freebsd-$objformat ;; - esac - + version_type=freebsd-$objformat case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -2439,12 +2432,6 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; - linux) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - need_lib_prefix=no - need_version=no - ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -2623,10 +2610,14 @@ # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/po/hu.po new/vinagre-3.2.2/po/hu.po --- old/vinagre-3.2.1/po/hu.po 2011-09-24 09:48:11.000000000 +0200 +++ new/vinagre-3.2.2/po/hu.po 2011-10-30 18:28:59.000000000 +0100 @@ -11,14 +11,14 @@ "Project-Id-Version: vinagre master\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-09-21 03:57+0200\n" -"PO-Revision-Date: 2011-09-21 03:57+0200\n" +"PO-Revision-Date: 2011-10-23 13:02+0200\n" "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n" -"Language-Team: Magyar <gnome-hu-list at gnome dot org>\n" +"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/org.gnome.Vinagre.gschema.xml.in.h:1 @@ -47,8 +47,7 @@ msgid "" "Set to \"true\" to always start the program listening for reverse " "connections." -msgstr "" -"Állítsa igazra a fordított kapcsolatok indítás utáni folyamatos figyeléséhez." +msgstr "Állítsa igazra a fordított kapcsolatok indítás utáni folyamatos figyeléséhez." #: ../data/org.gnome.Vinagre.gschema.xml.in.h:5 msgid "Specifies the maximum number of items in the host dropdown entry." @@ -69,8 +68,7 @@ msgstr "Más kliensek maradjanak-e kapcsolódva" #: ../data/org.gnome.Vinagre.gschema.xml.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" +msgid "Whether we should show tabs even when there is only one active connection" msgstr "Akkor is megjelenjenek-e a fülek, ha csak egy aktív kapcsolat van" #: ../data/org.gnome.Vinagre.gschema.xml.in.h:9 @@ -308,8 +306,7 @@ #: ../plugins/vnc/vinagre-vnc-connection.c:316 #: ../plugins/vnc/vinagre-vnc-plugin.c:199 #, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." msgstr "" "A „shared” jelző értéke hibás: %d. Az értéke 0 vagy 1 lehetne, figyelmen " "kívül marad." @@ -512,7 +509,7 @@ #: ../plugins/vnc/vinagre-vnc-tab.c:632 msgid "_Original size" -msgstr "_Eredeti méret" +msgstr "Ere_deti méret" #: ../plugins/vnc/vinagre-vnc-tab.c:633 msgid "Adjusts the window to the remote desktop's size" @@ -636,25 +633,20 @@ msgstr "Hiba a könyvjelzők előkészítésekor: A fájl üresnek tűnik" #: ../vinagre/vinagre-bookmarks.c:379 -msgid "" -"Error while initializing bookmarks: The file is not a vinagre bookmarks file" -msgstr "" -"Hiba a könyvjelzők előkészítésekor: A fájl nem egy vinagre könyvjelzőfájl" +msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" +msgstr "Hiba a könyvjelzők előkészítésekor: A fájl nem egy vinagre könyvjelzőfájl" #: ../vinagre/vinagre-bookmarks.c:452 ../vinagre/vinagre-bookmarks.c:459 msgid "Error while saving bookmarks: Failed to create the XML structure" -msgstr "" -"Hiba a könyvjelzők mentése közben: Az XML-struktúra létrehozása meghiúsult" +msgstr "Hiba a könyvjelzők mentése közben: Az XML-struktúra létrehozása meghiúsult" #: ../vinagre/vinagre-bookmarks.c:466 ../vinagre/vinagre-bookmarks.c:473 msgid "Error while saving bookmarks: Failed to initialize the XML structure" -msgstr "" -"Hiba a könyvjelzők mentése közben: Az XML-struktúra előkészítése meghiúsult" +msgstr "Hiba a könyvjelzők mentése közben: Az XML-struktúra előkészítése meghiúsult" #: ../vinagre/vinagre-bookmarks.c:482 msgid "Error while saving bookmarks: Failed to finalize the XML structure" -msgstr "" -"Hiba a könyvjelzők mentése közben: Az XML-struktúra befejezése meghiúsult" +msgstr "Hiba a könyvjelzők mentése közben: Az XML-struktúra befejezése meghiúsult" #: ../vinagre/vinagre-bookmarks.c:491 #, c-format @@ -689,8 +681,7 @@ #: ../vinagre/vinagre-bookmarks-migration.c:163 msgid "Error while migrating bookmarks: VNC plugin is not activated" -msgstr "" -"Hiba a könyvjelzők átköltöztetése közben: a VNC bővítmény nincs aktiválva" +msgstr "Hiba a könyvjelzők átköltöztetése közben: a VNC bővítmény nincs aktiválva" #: ../vinagre/vinagre-bookmarks-migration.c:215 msgid "Failed to create the directory" @@ -728,10 +719,8 @@ #: ../vinagre/vinagre-bookmarks-ui.c:87 ../vinagre/vinagre-bookmarks-ui.c:199 #, c-format -msgid "" -"The name \"%s\" is already used in this folder. Please use a different name." -msgstr "" -"Ez a név („%s”) már használatban van a mappában. Használjon másik nevet." +msgid "The name \"%s\" is already used in this folder. Please use a different name." +msgstr "Ez a név („%s”) már használatban van a mappában. Használjon másik nevet." #: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:189 #: ../vinagre/vinagre-bookmarks-ui.c:200 @@ -1339,3 +1328,4 @@ #~ "információkért nézze meg a dokumentációt.\n" #~ "\n" #~ "Ez az üzenet csak egyszer jelenik meg." + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/po/ja.po new/vinagre-3.2.2/po/ja.po --- old/vinagre-3.2.1/po/ja.po 2011-09-19 17:46:52.000000000 +0200 +++ new/vinagre-3.2.2/po/ja.po 2011-11-14 18:03:15.000000000 +0100 @@ -10,10 +10,10 @@ "Project-Id-Version: vinagre gnome-2-30\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=vinagre&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-09-10 07:14+0000\n" -"PO-Revision-Date: 2011-09-11 08:48+0900\n" +"POT-Creation-Date: 2011-11-01 19:09+0000\n" +"PO-Revision-Date: 2011-11-03 14:31+0900\n" "Last-Translator: Jiro Matsuzawa <jmatsuz...@src.gnome.org>\n" -"Language-Team: Japanese <takeshi.aih...@gmail.com>\n" +"Language-Team: Japanese <gnome-translat...@gnome.gr.jp>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -118,9 +118,9 @@ "behind a firewall. The remote side is supposed to initiate the connection " "with you. For further information, read the help." msgstr "" -"リバースコネクションを有効にするとファイアーウォール越しにマシンにアクセスで" -"きるようになります。リモート側が接続を開始することになっています。リバースコ" -"ネクションについて詳しく知りたい場合はヘルプを参照してください。" +"リバースコネクションを有効にするとファイアウォール越しにマシンにアクセスでき" +"るようになります。リモート側が接続を開始することになっています。リバースコネ" +"クションについて詳しく知りたい場合はヘルプを参照してください。" #: ../data/vinagre.ui.h:5 #, fuzzy @@ -613,7 +613,7 @@ "この機能を有効にする方法については、パッケージ付属の README ファイルを参照し" "てください。" -#: ../plugins/vnc/vinagre-vnc-tunnel.c:96 +#: ../plugins/vnc/vinagre-vnc-tunnel.c:97 #: ../plugins/spice/vinagre-spice-tunnel.c:103 #, c-format msgid "Unable to find a free TCP port" @@ -876,7 +876,7 @@ msgstr "リモートデスクトップの選択" #: ../vinagre/vinagre-connection.c:524 ../vinagre/vinagre-tab.c:574 -#: ../vinagre/vinagre-tube-handler.c:255 +#: ../vinagre/vinagre-tube-handler.c:256 #, c-format msgid "The protocol %s is not supported." msgstr "%s というプロトコルはサポートしていません。" @@ -942,13 +942,13 @@ msgid "Authentication failed" msgstr "認証に失敗しました" -#: ../vinagre/vinagre-notebook.c:526 +#: ../vinagre/vinagre-notebook.c:536 #, fuzzy #| msgid "Connection" msgid "Connecting…" msgstr "接続" -#: ../vinagre/vinagre-notebook.c:553 +#: ../vinagre/vinagre-notebook.c:558 msgid "Close connection" msgstr "接続を閉じます" @@ -1002,11 +1002,11 @@ msgid "Cannot initialize preferences manager." msgstr "設定マネージャーを初期化できません" -#: ../vinagre/vinagre-reverse-vnc-listener-dialog.c:100 +#: ../vinagre/vinagre-reverse-vnc-listener-dialog.c:102 msgid "IPv4:" msgstr "IPv4:" -#: ../vinagre/vinagre-reverse-vnc-listener-dialog.c:112 +#: ../vinagre/vinagre-reverse-vnc-listener-dialog.c:114 msgid "" "\n" "\n" @@ -1016,7 +1016,7 @@ "\n" "IPv6:" -#: ../vinagre/vinagre-reverse-vnc-listener-dialog.c:172 +#: ../vinagre/vinagre-reverse-vnc-listener-dialog.c:174 #, c-format msgid "On the port %d" msgstr "ポート %d で" @@ -1033,45 +1033,45 @@ "there any other running program consuming all your TCP ports?" msgstr "" -#: ../vinagre/vinagre-ssh.c:113 +#: ../vinagre/vinagre-ssh.c:114 msgid "Timed out when logging into SSH host" msgstr "SSH ホストへのログイン時にタイムアウトしました" -#: ../vinagre/vinagre-ssh.c:187 +#: ../vinagre/vinagre-ssh.c:190 msgid "Unable to spawn ssh program" msgstr "ssh プログラムを起動できませんでした" -#: ../vinagre/vinagre-ssh.c:204 +#: ../vinagre/vinagre-ssh.c:207 #, c-format msgid "Unable to spawn ssh program: %s" msgstr "ssh プログラムを起動できませんでした: %s" -#: ../vinagre/vinagre-ssh.c:420 +#: ../vinagre/vinagre-ssh.c:424 msgid "Timed out when logging in" msgstr "ログイン処理がタイムアウトしました" -#: ../vinagre/vinagre-ssh.c:450 ../vinagre/vinagre-ssh.c:598 -#: ../vinagre/vinagre-ssh.c:682 +#: ../vinagre/vinagre-ssh.c:454 ../vinagre/vinagre-ssh.c:602 +#: ../vinagre/vinagre-ssh.c:686 msgid "Permission denied" msgstr "認証に失敗しました" -#: ../vinagre/vinagre-ssh.c:509 +#: ../vinagre/vinagre-ssh.c:513 msgid "Password dialog canceled" msgstr "パスワードダイアログがキャンセルされました" -#: ../vinagre/vinagre-ssh.c:532 +#: ../vinagre/vinagre-ssh.c:536 msgid "Could not send password" msgstr "パスワードを送れません" -#: ../vinagre/vinagre-ssh.c:540 +#: ../vinagre/vinagre-ssh.c:544 msgid "Log In Anyway" msgstr "とにかくログインする" -#: ../vinagre/vinagre-ssh.c:540 +#: ../vinagre/vinagre-ssh.c:544 msgid "Cancel Login" msgstr "ログインをキャンセルする" -#: ../vinagre/vinagre-ssh.c:549 +#: ../vinagre/vinagre-ssh.c:553 #, fuzzy, c-format #| msgid "" #| "The identity of the remote computer (%s) is unknown.\n" @@ -1092,35 +1092,35 @@ "リモートコンピューターが送信してきた ID は %s です。続けても安全であるか完全" "に確信が持てない場合は、システム管理者に連絡してください。" -#: ../vinagre/vinagre-ssh.c:567 +#: ../vinagre/vinagre-ssh.c:571 msgid "Login dialog canceled" msgstr "ログインダイアログがキャンセルされました" -#: ../vinagre/vinagre-ssh.c:588 +#: ../vinagre/vinagre-ssh.c:592 msgid "Can't send host identity confirmation" msgstr "ホストの正体を確認できません" -#: ../vinagre/vinagre-ssh.c:623 ../vinagre/vinagre-tab.c:807 +#: ../vinagre/vinagre-ssh.c:627 ../vinagre/vinagre-tab.c:807 msgid "Error saving the credentials on the keyring." msgstr "証明書をキーリングに保存する際にエラーが発生しました。" -#: ../vinagre/vinagre-ssh.c:689 +#: ../vinagre/vinagre-ssh.c:693 msgid "Hostname not known" msgstr "ホスト名が不明です" -#: ../vinagre/vinagre-ssh.c:696 +#: ../vinagre/vinagre-ssh.c:700 msgid "No route to host" msgstr "ホストへの経路がありません" -#: ../vinagre/vinagre-ssh.c:703 +#: ../vinagre/vinagre-ssh.c:707 msgid "Connection refused by server" msgstr "サーバーに接続が拒否されました" -#: ../vinagre/vinagre-ssh.c:710 +#: ../vinagre/vinagre-ssh.c:714 msgid "Host key verification failed" msgstr "ホスト鍵認証に失敗しました" -#: ../vinagre/vinagre-ssh.c:747 +#: ../vinagre/vinagre-ssh.c:751 msgid "Unable to find a valid SSH program" msgstr "有効な SSH プログラムを見つけられませんでした" @@ -1156,38 +1156,38 @@ msgid "Error saving screenshot" msgstr "スクリーンショットを保存する際にエラーが発生しました" -#: ../vinagre/vinagre-tube-handler.c:231 +#: ../vinagre/vinagre-tube-handler.c:232 #, c-format msgid "Impossible to get service property: %s" msgstr "サービスのプロパティを取得できません: %s" -#: ../vinagre/vinagre-tube-handler.c:297 +#: ../vinagre/vinagre-tube-handler.c:298 #, c-format msgid "Impossible to create the connection: %s" msgstr "接続を作成できません: %s" -#: ../vinagre/vinagre-tube-handler.c:336 +#: ../vinagre/vinagre-tube-handler.c:337 #, c-format msgid "Impossible to accept the stream tube: %s" msgstr "ストリーム・チューブを受け入れることができません: %s" #. Translators: this is an error message when we fail to get the name of an empathy/telepathy buddy. %s will be replaced by the actual error message. -#: ../vinagre/vinagre-tube-handler.c:474 +#: ../vinagre/vinagre-tube-handler.c:475 #, c-format msgid "Impossible to get the contact name: %s" msgstr "接続名を取得できません: %s" -#: ../vinagre/vinagre-tube-handler.c:511 +#: ../vinagre/vinagre-tube-handler.c:512 #, c-format msgid "Impossible to get the avatar: %s" msgstr "アバターを取得できません: %s" -#: ../vinagre/vinagre-tube-handler.c:532 +#: ../vinagre/vinagre-tube-handler.c:533 #, c-format msgid "%s wants to share their desktop with you." msgstr "%s があなたのデスクトップの共有を要求しています。" -#: ../vinagre/vinagre-tube-handler.c:537 +#: ../vinagre/vinagre-tube-handler.c:538 msgid "Desktop sharing invitation" msgstr "デスクトップ共有の要求" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/po/zh_CN.po new/vinagre-3.2.2/po/zh_CN.po --- old/vinagre-3.2.1/po/zh_CN.po 2011-09-19 17:46:52.000000000 +0200 +++ new/vinagre-3.2.2/po/zh_CN.po 2011-11-14 18:03:39.000000000 +0100 @@ -13,7 +13,7 @@ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=vinagre&keywords=I18N+L10N&component=general\n" "POT-Creation-Date: 2011-09-12 13:25+0000\n" -"PO-Revision-Date: 2011-09-13 13:02+0800\n" +"PO-Revision-Date: 2011-10-28 13:32+0800\n" "Last-Translator: YunQiang Su <wzss...@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n...@googlegroups.com>\n" "MIME-Version: 1.0\n" @@ -1027,7 +1027,7 @@ #: ../vinagre/vinagre-tab.c:374 msgid "Leave fullscreen" -msgstr "继续全屏" +msgstr "退出全屏" #: ../vinagre/vinagre-tab.c:536 msgid "Error saving recent connection." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/vinagre/pty_open.c new/vinagre-3.2.2/vinagre/pty_open.c --- old/vinagre-3.2.1/vinagre/pty_open.c 2011-08-13 14:06:34.000000000 +0200 +++ new/vinagre-3.2.2/vinagre/pty_open.c 2011-10-30 18:28:59.000000000 +0100 @@ -404,9 +404,10 @@ const char *directory, int columns, int rows, int *stdin_fd, int *stdout_fd, int *stderr_fd, + int *held_fd, pid_t *child, gboolean reapchild, gboolean login) { - int fd, i; + int fd, hold_fd, i; char c; int ready_a[2] = { 0, 0 }; int ready_b[2] = { 0, 0 }; @@ -416,6 +417,17 @@ int stdout_pipe[2]; int stderr_pipe[2]; + /* Optionally hold the slave PTY open in the parent. Needed to prevent + * EIO from read() on the master if exec'ing a program that enumerates + * and closes open fds before opening /dev/tty (ssh). Partially fixes + * bug 644432. */ + if (held_fd) { + hold_fd = open(path, O_RDWR|O_NOCTTY); + if (hold_fd == -1) { + return -1; + } + } + /* Open pipes for synchronizing between parent and child. */ if (_pty_pipe_open_bi(&ready_a[0], &ready_a[1], &ready_b[0], &ready_b[1]) == -1) { @@ -457,6 +469,7 @@ close(stdin_pipe[1]); close(stdout_pipe[0]); close(stderr_pipe[0]); + if (held_fd) close(hold_fd); if(reapchild) { close(pid_pipe[0]); @@ -575,6 +588,7 @@ *stdin_fd = stdin_pipe[1]; *stdout_fd = stdout_pipe[0]; *stderr_fd = stderr_pipe[0]; + if (held_fd) *held_fd = hold_fd; return 0; break; @@ -603,6 +617,7 @@ close(ready_b[1]); bail_ready: *child = -1; + if (held_fd) close(hold_fd); return -1; } @@ -716,7 +731,8 @@ _pty_open_unix98(pid_t *child, guint flags, char **env_add, const char *command, char **argv, const char *directory, int columns, int rows, - int *stdin_fd, int *stdout_fd, int *stderr_fd) + int *stdin_fd, int *stdout_fd, int *stderr_fd, + int *held_fd) { int fd; char *buf; @@ -736,6 +752,7 @@ argv, directory, columns, rows, stdin_fd, stdout_fd, stderr_fd, + held_fd, child, flags & PTY_REAP_CHILD, flags & PTY_LOGIN_TTY) != 0) { @@ -773,13 +790,15 @@ pty_open(pid_t *child, guint flags, char **env_add, const char *command, char **argv, const char *directory, int columns, int rows, - int *stdin_fd, int *stdout_fd, int *stderr_fd) + int *stdin_fd, int *stdout_fd, int *stderr_fd, + int *held_fd) { int ret = -1; if (ret == -1) { ret = _pty_open_unix98(child, flags, env_add, command, argv, directory, columns, rows, - stdin_fd, stdout_fd, stderr_fd); + stdin_fd, stdout_fd, stderr_fd, + held_fd); } return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/vinagre/pty_open.h new/vinagre-3.2.2/vinagre/pty_open.h --- old/vinagre-3.2.1/vinagre/pty_open.h 2011-08-13 14:06:34.000000000 +0200 +++ new/vinagre-3.2.2/vinagre/pty_open.h 2011-10-30 18:28:59.000000000 +0100 @@ -59,7 +59,8 @@ int pty_open(pid_t *child, guint flags, char **env_add, const char *command, char **argv, const char *directory, int columns, int rows, - int *stdin_fd, int *stdout_fd, int *stderr_fd); + int *stdin_fd, int *stdout_fd, int *stderr_fd, + int *held_fd); G_END_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/vinagre/vinagre-ssh.c new/vinagre-3.2.2/vinagre/vinagre-ssh.c --- old/vinagre-3.2.1/vinagre/vinagre-ssh.c 2011-10-17 21:35:17.000000000 +0200 +++ new/vinagre-3.2.2/vinagre/vinagre-ssh.c 2011-10-30 18:28:59.000000000 +0100 @@ -173,13 +173,15 @@ int *stdin_fd, int *stdout_fd, int *stderr_fd, + int *held_fd, GError **error) { #ifdef USE_PTY *tty_fd = pty_open(pid, PTY_REAP_CHILD, NULL, args[0], args, NULL, 300, 300, - stdin_fd, stdout_fd, stderr_fd); + stdin_fd, stdout_fd, stderr_fd, + held_fd); if (*tty_fd == -1) { g_set_error_literal (error, @@ -207,6 +209,7 @@ return FALSE; } *pid = gpid; + if (held_fd) *held_fd = -1; /* Not applicable here. */ #endif return TRUE; @@ -728,7 +731,7 @@ gint *tty, GError **error) { - int tty_fd, stdin_fd, stdout_fd, stderr_fd; + int tty_fd, stdin_fd, stdout_fd, stderr_fd, held_fd; GPid pid; gchar *user, *host, **args; gboolean res; @@ -758,7 +761,7 @@ args = setup_ssh_commandline (host, port, user, extra_arguments, command); if (!spawn_ssh (args, &pid, - &tty_fd, &stdin_fd, &stdout_fd, &stderr_fd, + &tty_fd, &stdin_fd, &stdout_fd, &stderr_fd, &held_fd, error)) { g_strfreev (args); @@ -772,6 +775,9 @@ else res = handle_login (parent, host, port, user, tty_fd, stdout_fd, stderr_fd, error); + /* ssh has opened the PTY slave by now, so we can close it */ + if (held_fd != -1) close(held_fd); + g_strfreev (args); g_free (user); g_free (host); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/vinagre/vinagre-utils.c new/vinagre-3.2.2/vinagre/vinagre-utils.c --- old/vinagre-3.2.1/vinagre/vinagre-utils.c 2011-10-17 21:37:58.000000000 +0200 +++ new/vinagre-3.2.2/vinagre/vinagre-utils.c 2011-11-14 18:04:45.000000000 +0100 @@ -637,7 +637,7 @@ _tmp29_ = gtk_builder_get_object (_tmp28_, "ok_button"); _tmp30_ = _g_object_ref0 (GTK_IS_BUTTON (_tmp29_) ? ((GtkButton*) _tmp29_) : NULL); _data3_->ok_button = _tmp30_; - _tmp31_ = (GtkImage*) gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG); + _tmp31_ = (GtkImage*) gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_BUTTON); _tmp32_ = g_object_ref_sink (_tmp31_); image = _tmp32_; _tmp33_ = _data3_->ok_button; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vinagre-3.2.1/vinagre/vinagre-utils.vala new/vinagre-3.2.2/vinagre/vinagre-utils.vala --- old/vinagre-3.2.1/vinagre/vinagre-utils.vala 2011-10-17 21:14:22.000000000 +0200 +++ new/vinagre-3.2.2/vinagre/vinagre-utils.vala 2011-11-14 18:03:39.000000000 +0100 @@ -121,7 +121,7 @@ var ok_button = xml.get_object ("ok_button") as Button; var image = new Image.from_stock (Stock.DIALOG_AUTHENTICATION, - IconSize.DIALOG); + IconSize.BUTTON); ok_button.image = image; var username_entry = xml.get_object ("username_entry") as Entry; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org