From e0909aed7645ecfd5e641c7699436869aca0d787 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 15 Aug 2006 03:28:13 +0000 Subject: [PATCH] 2006-08-14 Dan Williams * Patch from Christian Persch * configure.in po/LINGUAS vpn-daemons/openvpn/po/LINGUAS vpn-daemons/openvpn/configure.in vpn-daemons/pptp/po/LINGUAS vpn-daemons/pptp/configure.in vpn-daemons/vpnc/po/LINGUAS vpn-daemons/vpnc/configure.in - Convert to LINGUAS method so translators don't have to modify configure.in, just stuff in po/. Gnome #343132, requires intltool 0.35 or higher git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1959 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 15 +++++++++++++ configure.in | 3 +-- po/LINGUAS | 38 ++++++++++++++++++++++++++++++++ vpn-daemons/openvpn/configure.in | 5 +---- vpn-daemons/openvpn/po/LINGUAS | 15 +++++++++++++ vpn-daemons/pptp/configure.in | 5 +---- vpn-daemons/pptp/po/LINGUAS | 6 +++++ vpn-daemons/vpnc/configure.in | 5 +---- vpn-daemons/vpnc/po/LINGUAS | 6 +++++ 9 files changed, 84 insertions(+), 14 deletions(-) create mode 100644 po/LINGUAS create mode 100644 vpn-daemons/openvpn/po/LINGUAS create mode 100644 vpn-daemons/pptp/po/LINGUAS create mode 100644 vpn-daemons/vpnc/po/LINGUAS diff --git a/ChangeLog b/ChangeLog index a1c4858d8e..53c14f69b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2006-08-14 Dan Williams + + * Patch from Christian Persch + * configure.in + po/LINGUAS + vpn-daemons/openvpn/po/LINGUAS + vpn-daemons/openvpn/configure.in + vpn-daemons/pptp/po/LINGUAS + vpn-daemons/pptp/configure.in + vpn-daemons/vpnc/po/LINGUAS + vpn-daemons/vpnc/configure.in + - Convert to LINGUAS method so translators don't have to modify + configure.in, just stuff in po/. Gnome #343132, requires intltool + 0.35 or higher + 2006-08-14 Dan Williams Patch from Alex Smith diff --git a/configure.in b/configure.in index 0b39eddc28..51c318dc8c 100644 --- a/configure.in +++ b/configure.in @@ -46,8 +46,7 @@ dnl GETTEXT_PACKAGE=NetworkManager AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) -ALL_LINGUAS="bg bs ca cs da de el en_CA es fi fr gu hr hu it ja ko lt lv mk nb ne nl pa pt_BR rw sk sq sr sr@Latn sv uk vi wa zh_CN zh_TW" -AC_PROG_INTLTOOL([0.27.2]) +IT_PROG_INTLTOOL([0.35]) AM_GLIB_GNU_GETTEXT dnl diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000000..1b2eb92899 --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1,38 @@ +# please keep this list sorted alphabetically +# +bg +bs +ca +cs +da +de +el +en_CA +es +fi +fr +gu +hr +hu +it +ja +ko +lt +lv +mk +nb +ne +nl +pa +pt_BR +rw +sk +sq +sr +sr@Latn +sv +uk +vi +wa +zh_CN +zh_TW diff --git a/vpn-daemons/openvpn/configure.in b/vpn-daemons/openvpn/configure.in index 997c5a2113..74e819a478 100644 --- a/vpn-daemons/openvpn/configure.in +++ b/vpn-daemons/openvpn/configure.in @@ -35,14 +35,11 @@ AC_PROG_GCC_TRADITIONAL AC_FUNC_MEMCMP AC_CHECK_FUNCS(select socket uname) -ALL_LINGUAS="ca da es fi fr hu ja nl pt_BR sk sv vi zh_CN" -AC_SUBST(ALL_LINGUAS) - GETTEXT_PACKAGE=NetworkManager-openvpn AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) -AC_PROG_INTLTOOL([0.27.2]) +IT_PROG_INTLTOOL([0.35]) AM_GLIB_GNU_GETTEXT PKG_CHECK_MODULES(GTHREAD, gthread-2.0) diff --git a/vpn-daemons/openvpn/po/LINGUAS b/vpn-daemons/openvpn/po/LINGUAS new file mode 100644 index 0000000000..734c53efb3 --- /dev/null +++ b/vpn-daemons/openvpn/po/LINGUAS @@ -0,0 +1,15 @@ +# please keep this list sorted alphabetically +# +ca +da +es +fi +fr +hu +ja +nl +pt_BR +sk +sv +vi +zh_CN diff --git a/vpn-daemons/pptp/configure.in b/vpn-daemons/pptp/configure.in index 3a7b81e446..3a6e30b916 100644 --- a/vpn-daemons/pptp/configure.in +++ b/vpn-daemons/pptp/configure.in @@ -91,14 +91,11 @@ AC_PROG_GCC_TRADITIONAL AC_FUNC_MEMCMP AC_CHECK_FUNCS(select socket uname) -ALL_LINGUAS="da ja sv zh_CN" -AC_SUBST(ALL_LINGUAS) - GETTEXT_PACKAGE=NetworkManager-ppp_vpn AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) -AC_PROG_INTLTOOL([0.27.2]) +IT_PROG_INTLTOOL([0.35]) AM_GLIB_GNU_GETTEXT PKG_CHECK_MODULES(GTHREAD, gthread-2.0) diff --git a/vpn-daemons/pptp/po/LINGUAS b/vpn-daemons/pptp/po/LINGUAS new file mode 100644 index 0000000000..c5f27c0dec --- /dev/null +++ b/vpn-daemons/pptp/po/LINGUAS @@ -0,0 +1,6 @@ +# please keep this list sorted alphabetically +# +da +ja +sv +zh_CN diff --git a/vpn-daemons/vpnc/configure.in b/vpn-daemons/vpnc/configure.in index 7423cc5898..88e2128fa0 100644 --- a/vpn-daemons/vpnc/configure.in +++ b/vpn-daemons/vpnc/configure.in @@ -35,14 +35,11 @@ AC_PROG_GCC_TRADITIONAL AC_FUNC_MEMCMP AC_CHECK_FUNCS(select socket uname) -ALL_LINGUAS="da ja sv zh_CN" -AC_SUBST(ALL_LINGUAS) - GETTEXT_PACKAGE=NetworkManager-vpnc AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) -AC_PROG_INTLTOOL([0.27.2]) +IT_PROG_INTLTOOL([0.35]) AM_GLIB_GNU_GETTEXT PKG_CHECK_MODULES(GTHREAD, gthread-2.0) diff --git a/vpn-daemons/vpnc/po/LINGUAS b/vpn-daemons/vpnc/po/LINGUAS new file mode 100644 index 0000000000..c5f27c0dec --- /dev/null +++ b/vpn-daemons/vpnc/po/LINGUAS @@ -0,0 +1,6 @@ +# please keep this list sorted alphabetically +# +da +ja +sv +zh_CN