Dan Williams wrote: > Hi, > > In order to start the 0.6.6 release cycle, I've tagged 0.6.5.98 (0.6.6 > rc1) and uploaded the tarball to: > > http://people.redhat.com/dcbw/NetworkManager/0.6.6/NetworkManager-0.6.5.98.tar.gz > > Please test and report major issues (crashers, build system issues, etc) > but _not_ feature requests. There will be one more release candidate, > versioned 0.6.5.99, before the actual 0.6.6 release. > Hi, here are a couple of smaller patches NM 0.6 1.) NM-po-linguas.patch Switch NM to using po/LINGUAS as recommended by [1] nm-applet 0.6 2.) nm-applet-po-linguas.patch Switch nm-applet to using po/LINGUAS as recommended by [1] 3.) nm-applet-potfiles.patch Add a missing file with translatable strings to po/POTFILES.in. Otherwise "make (dist)check" will fail 4.) po_*.patch Some smaller po file corrections which were submitted by Debian users. Would be nice to have upstream. Btw, with nm-editor now in nm-applet, there are a lot of untranslated strings. Can we alarm the translators somehow? 5.) configure.ac should have a "versioned" pkgconfig check for NetworkManager and libnm-util. nm-applet 0.6.5.98 doesn't compile against NM <= 0.6.5. Cheers, Michael [1] http://live.gnome.org/GnomeGoals/PoLinguas -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
Index: configure.ac =================================================================== --- configure.ac (Revision 525) +++ configure.ac (Arbeitskopie) @@ -49,8 +49,7 @@ GETTEXT_PACKAGE=nm-applet AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) -ALL_LINGUAS="ar be latin bg bs ca cs da de dz el en_CA en_GB es et fi fr gl gu hr hu it ja ko lt pl mk nb ne nl pa pt pt_BR ru rw sk sl sq sr Latn sr sv tr uk vi wa zh_CN zh_HK zh_TW" -AC_PROG_INTLTOOL([0.27.2]) +IT_PROG_INTLTOOL([0.35.0]) AM_GLIB_GNU_GETTEXT dnl Index: po/LINGUAS =================================================================== --- po/LINGUAS (Revision 0) +++ po/LINGUAS (Revision 0) @@ -0,0 +1,49 @@ +# please keep this list sorted alphabetically +# +ar +be latin +bg +bs +ca +cs +da +de +dz +el +en_CA +en_GB +es +et +fi +fr +gl +gu +hr +hu +it +ja +ko +lt +pl +mk +nb +ne +nl +pa +pt +pt_BR +ru +rw +sk +sl +sq +sr Latn +sr +sv +tr +uk +vi +wa +zh_CN +zh_HK +zh_TW
Index: po/POTFILES.in =================================================================== --- po/POTFILES.in (Revision 525) +++ po/POTFILES.in (Arbeitskopie) @@ -11,6 +11,7 @@ src/menu-items.c src/nm-gconf-wso.c src/nm-gconf-wso-wpa-eap.c +src/nm-wired-dialog.c src/other-network-dialog.c src/passphrase-dialog.c src/vpn-password-dialog.c
Index: configure.in =================================================================== --- configure.in (Revision 3318) +++ configure.in (Arbeitskopie) @@ -46,8 +46,7 @@ GETTEXT_PACKAGE=NetworkManager AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) -ALL_LINGUAS="ar be latin bg bs ca cs da de dz el en_CA en_GB es et fi fr gl gu hr hu it ja ka ko lt pl mk nb ne nl pa pt_BR rw sk sq sr Latn sr sv uk vi wa zh_CN zh_TW" -AC_PROG_INTLTOOL([0.27.2]) +IT_PROG_INTLTOOL([0.35.0]) AM_GLIB_GNU_GETTEXT dnl Index: po/LINGUAS =================================================================== --- po/LINGUAS (Revision 0) +++ po/LINGUAS (Revision 0) @@ -0,0 +1,45 @@ +# please keep this list sorted alphabetically +# +ar +be latin +bg +bs +ca +cs +da +de +dz +el +en_CA +en_GB +es +et +fi +fr +gl +gu +hr +hu +it +ja +ka +ko +lt +pl +mk +nb +ne +nl +pa +pt_BR +rw +sk +sq +sr Latn +sr +sv +uk +vi +wa +zh_CN +zh_TW
Index: po/fr.po =================================================================== RCS file: /cvs/gnome/NetworkManager/po/fr.po,v retrieving revision 1.2.6.2 diff -u -3 -p -r1.2.6.2 fr.po --- po/fr.po 12 Jun 2006 15:47:57 -0000 1.2.6.2 +++ po/fr.po 30 Nov 2006 17:29:17 -0000 @@ -250,7 +250,7 @@ msgstr "_Se connecter à un autre résea #: ../gnome/applet/applet.c:1562 msgid "Create _New Wireless Network..." -msgstr "Créer_un nouveau réseau sans fil..." +msgstr "Créer _un nouveau réseau sans fil..." #: ../gnome/applet/applet.c:1685 msgid "_VPN Connections"
Index: po/de.po =================================================================== --- po/de.po (Revision 2227) +++ po/de.po (Arbeitskopie) @@ -276,7 +276,7 @@ #. 'Enable Networking' item #: ../gnome/applet/applet.c:2170 msgid "Enable _Networking" -msgstr "Netzwerk_aktivieren" +msgstr "Netzwerk _aktivieren" #. 'Enable Wireless' item #: ../gnome/applet/applet.c:2176
--- po/ja.po.orig 2006-06-17 04:46:19.000000000 +0900 +++ po/ja.po 2007-06-26 20:51:13.000000000 +0900 @@ -204,7 +204,7 @@ #: ../gnome/applet/applet.c:1093 msgid "Wired network connection" -msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?" +msgstr "æ??ç·?ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?" #: ../gnome/applet/applet.c:1097 msgid "Connected to an Ad-Hoc wireless network" @@ -382,7 +382,7 @@ #: ../gnome/applet/menu-items.c:88 #, c-format msgid "Wired Network (%s)" -msgstr "ç?¡ç·?ã??ã??ã??ã?¯ã?¼ã?¯ (%s)" +msgstr "æ??ç·?ã??ã??ã??ã?¯ã?¼ã?¯ (%s)" #: ../gnome/applet/menu-items.c:91 msgid "_Wired Network"
Attachment:
signature.asc
Description: OpenPGP digital signature