[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r1331 - in glibc-package/trunk/debian: . control.in debhelper.in po



Author: barbier
Date: 2006-04-06 20:10:36 +0000 (Thu, 06 Apr 2006)
New Revision: 1331

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/control
   glibc-package/trunk/debian/control.in/main
   glibc-package/trunk/debian/debhelper.in/locales.templates
   glibc-package/trunk/debian/po/ca.po
   glibc-package/trunk/debian/po/cs.po
   glibc-package/trunk/debian/po/da.po
   glibc-package/trunk/debian/po/de.po
   glibc-package/trunk/debian/po/el.po
   glibc-package/trunk/debian/po/es.po
   glibc-package/trunk/debian/po/fi.po
   glibc-package/trunk/debian/po/fr.po
   glibc-package/trunk/debian/po/gl.po
   glibc-package/trunk/debian/po/it.po
   glibc-package/trunk/debian/po/ja.po
   glibc-package/trunk/debian/po/ko.po
   glibc-package/trunk/debian/po/nl.po
   glibc-package/trunk/debian/po/pl.po
   glibc-package/trunk/debian/po/pt.po
   glibc-package/trunk/debian/po/pt_BR.po
   glibc-package/trunk/debian/po/ru.po
   glibc-package/trunk/debian/po/sv.po
   glibc-package/trunk/debian/po/templates.pot
   glibc-package/trunk/debian/po/tr.po
   glibc-package/trunk/debian/po/uk.po
   glibc-package/trunk/debian/po/vi.po
   glibc-package/trunk/debian/po/zh_CN.po
Log:
Use new features of po-debconf 1.0 to remove unneeded strings from PO files.


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/changelog	2006-04-06 20:10:36 UTC (rev 1331)
@@ -14,6 +14,8 @@
   * update-locale: Fix buggy sanity check between LANGUAGE and LANG.
     (Closes: #361091)
   * Add new Galician debconf translation, by Jacobo Tarrio.  (Closes: #361101)
+  * Use new features of po-debconf 1.0 to remove unneeded strings from PO
+    files.
 
   [ Michael Banck ]
   * Add hurd-machrules-make.diff (fixes build problems with make-3.81 for

Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/control	2006-04-06 20:10:36 UTC (rev 1331)
@@ -10,7 +10,7 @@
  autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
  libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64],
  quilt
-Build-Depends-Indep: perl, po-debconf
+Build-Depends-Indep: perl, po-debconf (>= 1.0)
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
 Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Denis Barbier <barbier@debian.org>, Aurelien Jarno <aurel32@debian.org>
 Standards-Version: 3.6.2

Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/control.in/main	2006-04-06 20:10:36 UTC (rev 1331)
@@ -10,7 +10,7 @@
  autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
  libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64],
  quilt
-Build-Depends-Indep: perl, po-debconf
+Build-Depends-Indep: perl, po-debconf (>= 1.0)
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
 Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Denis Barbier <barbier@debian.org>, Aurelien Jarno <aurel32@debian.org>
 Standards-Version: 3.6.2

Modified: glibc-package/trunk/debian/debhelper.in/locales.templates
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.templates	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/debhelper.in/locales.templates	2006-04-06 20:10:36 UTC (rev 1331)
@@ -1,5 +1,6 @@
 Template: locales/locales_to_be_generated
 Type: multiselect
+#flag:translate:1
 __Choices: All locales, ${locales}
 _Description: Locales to be generated:
  Locale is a framework to switch between multiple languages for users who can
@@ -14,7 +15,8 @@
 
 Template: locales/default_environment_locale
 Type: select
-_Choices: None, ${locales}
+#flag:translate:1
+__Choices: None, ${locales}
 Default: None
 _Description: Default locale for the system environment:
  Many packages in Debian use locales to display text in the correct

Modified: glibc-package/trunk/debian/po/ca.po
===================================================================
--- glibc-package/trunk/debian/po/ca.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/ca.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,26 +26,20 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-msgid "${locales}"
-msgstr ""
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 #, fuzzy
 msgid "Locales to be generated:"
 msgstr "Seleccioneu els locales que voleu generar."
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -53,7 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 #, fuzzy
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
@@ -67,7 +61,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -75,20 +69,20 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 #, fuzzy
 msgid "Default locale for the system environment:"
 msgstr "Quin locale voleu que siga el predeterminat en el sistema?"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 #, fuzzy
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
@@ -102,7 +96,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 #, fuzzy
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
@@ -114,7 +108,3 @@
 "a��un sistema multiusuari on tots els usuaris no parlen la llengua "
 "seleccionada, podrien tindre dificultats, aix�ue potser voleu deixar \"C\" "
 "com el locale per defecte."
-
-#~ msgid ""
-#~ "These choices are based on which locales you have chosen to generate."
-#~ msgstr "Nom�podeu triar entre els locales que heu generat."

Modified: glibc-package/trunk/debian/po/cs.po
===================================================================
--- glibc-package/trunk/debian/po/cs.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/cs.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2006-02-21 09:27+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -25,25 +25,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr "Všechny locales"
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-msgid "${locales}"
-msgstr "${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "Locales, které se mají vygenerovat:"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -53,7 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -65,7 +59,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -75,19 +69,19 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Žádné, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Žádné"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "Výchozí locale pro tento systém:"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -101,7 +95,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/da.po
===================================================================
--- glibc-package/trunk/debian/po/da.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/da.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: glibc-2.3.2.ds1\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2006-02-20 21:33+0200\n"
 "Last-Translator: Morten Brix Pedersen <morten@wtf.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -25,25 +25,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr "Alle lokalitetsfiler"
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-msgid "${locales}"
-msgstr "${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "Lokalitetsfiler der skal genereres:"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -53,7 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -65,29 +59,29 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
 msgstr ""
-"Når 'Alle lokalitetsfiler' er valgt, vil /etc/locale.gen blive oprettet som en"
-" symbolsk henvisning til /usr/share/i18n/SUPPORTED."
+"Når 'Alle lokalitetsfiler' er valgt, vil /etc/locale.gen blive oprettet som "
+"en symbolsk henvisning til /usr/share/i18n/SUPPORTED."
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Ingen, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Ingen"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "Standard lokalitet til systemmiljøet:"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -101,7 +95,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/de.po
===================================================================
--- glibc-package/trunk/debian/po/de.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/de.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2006-02-22 18:52-0200\n"
 "Last-Translator: Helge Kreutzmann <kreutzm@itp.uni-hannover.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -25,25 +25,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr "Alle Standorteinstellungen"
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-msgid "${locales}"
-msgstr "${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "Zu generierende Standorteinstellungen:"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -54,7 +48,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -66,7 +60,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -76,19 +70,19 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Keine, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Keine"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "Standard-Standorteinstellung f� System-Umgebung?"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -102,7 +96,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "
@@ -113,9 +107,3 @@
 "Mehrbenutzer-System betreiben und nicht alle Benutzer die Sprache Ihrer Wahl "
 "sprechen, dann werden sie in Schwierigkeiten geraten und Sie sollten keine "
 "Standard-Standorteinstellung setzen."
-
-#~ msgid ""
-#~ "These choices are based on which locales you have chosen to generate."
-#~ msgstr ""
-#~ "Die Auswahl kann unter den Standorteinstellungen getroffen werden, die "
-#~ "Sie f� System zur Generierung ausgew�t haben."

Modified: glibc-package/trunk/debian/po/el.po
===================================================================
--- glibc-package/trunk/debian/po/el.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/el.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2004-01-21 22:44EEST\n"
 "Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -27,27 +27,20 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-#, fuzzy
-msgid "${locales}"
-msgstr "Κανένα, ${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 #, fuzzy
 msgid "Locales to be generated:"
 msgstr "Επιλέξτε τα γλωσσικά περιβάλλοντα που θέλετε να δημιουργηθούν."
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -58,7 +51,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -71,7 +64,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -79,20 +72,20 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Κανένα, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Κανένα"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 #, fuzzy
 msgid "Default locale for the system environment:"
 msgstr "Ποιο γλωσσικό περιβάλλον επιθυμείτε ως προκαθορισμένο για το σύστημα;"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -107,7 +100,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/es.po
===================================================================
--- glibc-package/trunk/debian/po/es.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/es.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: locales 2.3.6-2\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2006-02-20 23:00+0100\n"
 "Last-Translator: Carlos Valdivia Yag�lyag@dat.etsit.upm.es>\n"
 "Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -27,25 +27,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr "Todos los locales"
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-msgid "${locales}"
-msgstr "${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "Seleccione los locales que desea generar:"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -56,7 +50,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -68,7 +62,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -78,19 +72,19 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Ninguno, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Ninguno"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "�Cu�quiere que sea el locale predeterminado del sistema?"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -104,7 +98,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/fi.po
===================================================================
--- glibc-package/trunk/debian/po/fi.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/fi.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2005-04-09 01:47+0300\n"
 "Last-Translator: Matti Pöllä <mpo@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -25,27 +25,20 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-#, fuzzy
-msgid "${locales}"
-msgstr "Ei mitään, ${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 #, fuzzy
 msgid "Locales to be generated:"
 msgstr "Valitse muodostettavat lokaalit."
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -56,7 +49,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -68,7 +61,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -76,20 +69,20 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Ei mitään, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Ei mitään"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 #, fuzzy
 msgid "Default locale for the system environment:"
 msgstr "Minkä lokaalin tulisi olla järjestelmän oletus?"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -103,7 +96,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/fr.po
===================================================================
--- glibc-package/trunk/debian/po/fr.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/fr.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: glibc VERSION\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2003-10-27 20:40+0100\n"
 "Last-Translator: Denis Barbier <barbier@linuxfr.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -25,25 +25,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr "Tous les choix possibles"
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-msgid "${locales}"
-msgstr "${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "Param�es r�onaux ��rer�:"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -53,57 +47,58 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
 "afterwards)."
 msgstr ""
-"Veuillez choisir les jeux de param�es r�onaux (��locales��, en anglais) qui "
-"seront disponibles sur votre syst��; cette liste est sauv�dans le "
+"Veuillez choisir les jeux de param�es r�onaux (��locales��, en anglais) "
+"qui seront disponibles sur votre syst��; cette liste est sauv�dans le "
 "fichier ��/etc/locale.gen��, que vous pouvez aussi modifier vous-m� (vous "
 "devez alors lancer la commande ��locale-gen�� apr�tout changement)."
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
 msgstr ""
-"Quand l'option ��Tous les choix possibles�� est choisie, le fichier "
-"/etc/locale.gen est remplac�ar un lien symbolique vers /usr/share/i18n/SUPPORTED."
+"Quand l'option ��Tous les choix possibles�� est choisie, le fichier /etc/"
+"locale.gen est remplac�ar un lien symbolique vers /usr/share/i18n/"
+"SUPPORTED."
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Aucun, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Aucun"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "Jeu de param�es r�onaux actif par d�ut�:"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
 "speaker. These choices are based on which locales you have chosen to "
 "generate."
 msgstr ""
-"De nombreux paquets utilisent le m�nisme de localisation pour "
-"afficher les messages destin�aux utilisateurs dans la langue ad�ate. "
-"Vous pouvez changer la valeur par d�ut si votre langue maternelle n'est "
-"pas l'anglais. Les choix disponibles d�ndent des jeux de param�es "
-"r�onaux que vous avez pr�ablement s�ctionn�"
+"De nombreux paquets utilisent le m�nisme de localisation pour afficher les "
+"messages destin�aux utilisateurs dans la langue ad�ate. Vous pouvez "
+"changer la valeur par d�ut si votre langue maternelle n'est pas l'anglais. "
+"Les choix disponibles d�ndent des jeux de param�es r�onaux que vous "
+"avez pr�ablement s�ctionn�"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "
@@ -111,6 +106,6 @@
 "default locale."
 msgstr ""
 "Veuillez noter que cette valeur fixera la langue utilis�par le syst�. Si "
-"l'environnement est multiutilisateurs et que certains utilisateurs ne parlent pas "
-"votre langue, ils risquent d'avoir quelques difficult�et il serait peut-"
-"�e pr�rable de ne pas utiliser de valeur par d�ut."
+"l'environnement est multiutilisateurs et que certains utilisateurs ne "
+"parlent pas votre langue, ils risquent d'avoir quelques difficult�et il "
+"serait peut-�e pr�rable de ne pas utiliser de valeur par d�ut."

Modified: glibc-package/trunk/debian/po/gl.po
===================================================================
--- glibc-package/trunk/debian/po/gl.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/gl.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2006-04-06 17:59+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -17,25 +17,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr "Todas as configuracións locais"
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-msgid "${locales}"
-msgstr "${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "Configuracións locais a xerar:"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -45,7 +39,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -57,7 +51,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -67,19 +61,19 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Ningunha, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Ningunha"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "Configuración local por defecto para o ambiente:"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -93,7 +87,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/it.po
===================================================================
--- glibc-package/trunk/debian/po/it.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/it.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: glibc 2.3.5-6 debconf templates\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2006-02-24 20:41+0100\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -17,36 +17,30 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr "Tutti i locale"
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-msgid "${locales}"
-msgstr "${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "�Locale� da generare:"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
 msgstr ""
 "�Locale� �'infrastruttura che permette agli utenti di scegliere fra pi�"lingue, permettendo di stabilire quale lingua, paese, caratteri, criteri "
-"di ordinamento, ecc. preferiscono."
+"lingue, permettendo di stabilire quale lingua, paese, caratteri, criteri di "
+"ordinamento, ecc. preferiscono."
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -58,7 +52,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -68,19 +62,19 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Nessuno, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Nessuno"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "�Locale� predefinito sul sistema:"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -94,7 +88,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/ja.po
===================================================================
--- glibc-package/trunk/debian/po/ja.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/ja.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: locales 2.3.6-1\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2006-02-11 02:00+0900\n"
 "Last-Translator: GOTO Masanori <gotom@debian.org>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -25,26 +25,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-#, fuzzy
-msgid "${locales}"
-msgstr "�ʤ�, ${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "��������������:"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -54,7 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -66,7 +59,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -74,19 +67,19 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "�ʤ�, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "�ʤ�"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "�����ƥ����Ķ��������ꤹ���ե���������
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -99,7 +92,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/ko.po
===================================================================
--- glibc-package/trunk/debian/po/ko.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/ko.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,26 +26,20 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-msgid "${locales}"
-msgstr ""
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 #, fuzzy
 msgid "Locales to be generated:"
 msgstr "������� �����ʽÿ�"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -53,7 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 #, fuzzy
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
@@ -66,7 +60,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -74,19 +68,19 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -96,7 +90,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/nl.po
===================================================================
--- glibc-package/trunk/debian/po/nl.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/nl.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2006-02-21 09:16+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -25,25 +25,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr "Alle localisaties"
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-msgid "${locales}"
-msgstr "${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "Te genereren localisaties:"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -53,7 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -65,7 +59,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -75,19 +69,19 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Geen, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Geen"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "Standaardlocalisatie voor dit systeem:"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -102,7 +96,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/pl.po
===================================================================
--- glibc-package/trunk/debian/po/pl.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/pl.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: debconf-glibc-locales-pl\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2006-02-21 00:39+0100\n"
 "Last-Translator: Emilian Nowak <emil5@go2.pl>\n"
 "Language-Team:  <pl@li.org>\n"
@@ -13,25 +13,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr "Wszystkie dostępne"
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-msgid "${locales}"
-msgstr "${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "Wybierz ustawienia lokalne, które chcesz wygenerować:"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -42,7 +36,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -55,29 +49,29 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
 msgstr ""
-"Po wybraniu `Wszystkie dostępne', plik /etc/locale.gen będzie dowiązaniem symbolicznym do"
-"/usr/share/i18n/SUPPORTED."
+"Po wybraniu `Wszystkie dostępne', plik /etc/locale.gen będzie dowiązaniem "
+"symbolicznym do/usr/share/i18n/SUPPORTED."
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Brak, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Brak"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "Wybierz domyślne ustawienia lokalne, dla swojego systemu:"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -92,7 +86,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "
@@ -103,4 +97,3 @@
 "większość działających w nim programów. Jeżeli z tego systemu korzysta "
 "więcej użytkowników posłujących się różnymi językami najlepiej będzie "
 "pozostawić domyślne (angielskie) ustawiania lokalne."
-

Modified: glibc-package/trunk/debian/po/pt.po
===================================================================
--- glibc-package/trunk/debian/po/pt.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/pt.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: glibc 2.3.5-7\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2005-11-12 23:24+0000\n"
 "Last-Translator: Simão Pedro Cardoso <pthell@gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -17,25 +17,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr "Todos os locales"
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-msgid "${locales}"
-msgstr "${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "Locales para serem gerados:"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -46,7 +40,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -58,29 +52,29 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
 msgstr ""
-"Quando 'Todos os locales' estiver selecionada, /etc/locale.gen será um"
-"link simbolico para /usr/share/i18n/SUPPORTED."
+"Quando 'Todos os locales' estiver selecionada, /etc/locale.gen será umlink "
+"simbolico para /usr/share/i18n/SUPPORTED."
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Nenhum, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Nenhum"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "Locale padrão para o ambiente do sistema:"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -94,7 +88,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/pt_BR.po
===================================================================
--- glibc-package/trunk/debian/po/pt_BR.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/pt_BR.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: libc6\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2006-02-11 17:30-0200\n"
 "Last-Translator: Andr�u�Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -25,26 +25,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-#, fuzzy
-msgid "${locales}"
-msgstr "Nenhum, ${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "Locales a serem gerados :"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -55,7 +48,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -67,7 +60,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -75,19 +68,19 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Nenhum, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Nenhum"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "Locale padr�para o ambiente do sistema :"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -101,7 +94,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "
@@ -112,7 +105,3 @@
 "esteja executando um sistema multiusu�o onde nem todos os usu�os falem o "
 "idioma de sua escolha, alguns usu�os poder�ter dificuldades e, nesse "
 "caso, voc�alvez prefira n�definir um locale padr�
-
-#~ msgid ""
-#~ "These choices are based on which locales you have chosen to generate."
-#~ msgstr "Estas escolhas s�baseadas em quais locales voc�scolheu gerar."

Modified: glibc-package/trunk/debian/po/ru.po
===================================================================
--- glibc-package/trunk/debian/po/ru.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/ru.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: glibc_2.3.2-8\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2003-11-18 17:41+0500\n"
 "Last-Translator: Ilgiz Kalmetev <translator@ilgiz.pp.ru>\n"
 "Language-Team: russian <debian-russian@lists.debian.org>\n"
@@ -25,27 +25,20 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-#, fuzzy
-msgid "${locales}"
-msgstr "�������� ${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 #, fuzzy
 msgid "Locales to be generated:"
 msgstr "��������� ����������"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -56,7 +49,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -69,7 +62,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -77,20 +70,20 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "�������� ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "��������
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 #, fuzzy
 msgid "Default locale for the system environment:"
 msgstr "�� ��� ��� �� � ����������������"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -104,7 +97,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/sv.po
===================================================================
--- glibc-package/trunk/debian/po/sv.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/sv.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: glibc 2.3.6-1\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2006-02-17 23:58+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -24,25 +24,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr "Alla lokaler"
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-msgid "${locales}"
-msgstr "${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "V� lokalanpassningar att generera:"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -53,7 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -65,7 +59,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -75,19 +69,19 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Ingen, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Ingen"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "V� lokalanpassning som ska vara standard i systemet:"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -101,7 +95,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/templates.pot
===================================================================
--- glibc-package/trunk/debian/po/templates.pot	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/templates.pot	2006-04-06 20:10:36 UTC (rev 1331)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,25 +18,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-msgid "${locales}"
-msgstr ""
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -44,7 +38,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -53,7 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -61,19 +55,19 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -83,7 +77,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/tr.po
===================================================================
--- glibc-package/trunk/debian/po/tr.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/tr.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: locales\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2006-01-27 13:12+0200\n"
 "Last-Translator: Erçin EKER <ercin.eker@linux.org.tr>\n"
 "Language-Team: Türkçe <debian-l10n-turkish@lists.debian.org>\n"
@@ -17,26 +17,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-#, fuzzy
-msgid "${locales}"
-msgstr "Hiçbiri, ${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "Oluşturulacak yereller: "
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -47,7 +40,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -59,7 +52,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -67,19 +60,19 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Hiçbiri, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Hiçbiri"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "Sistem için öntanımlı yerel:"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -93,7 +86,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/uk.po
===================================================================
--- glibc-package/trunk/debian/po/uk.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/uk.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2006-02-21 10:12+0200\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen@univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -28,25 +28,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr "Всі локалі"
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-msgid "${locales}"
-msgstr "${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "Локалі які потрібно згенерувати:"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -57,7 +51,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -69,7 +63,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -79,19 +73,19 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Не встановлювати, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Не встановлювати"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "Локаль за замовчанням в системному оточенні:"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -105,7 +99,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/vi.po
===================================================================
--- glibc-package/trunk/debian/po/vi.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/vi.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: glibc 2.3.2.ds1-22\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2006-01-27 21:41+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -18,26 +18,19 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-#, fuzzy
-msgid "${locales}"
-msgstr "Không có, ${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid "Locales to be generated:"
 msgstr "Những miền địa phương cần tạo ra."
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -48,7 +41,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -60,7 +53,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -68,19 +61,19 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "Không có, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "Không có"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid "Default locale for the system environment:"
 msgstr "Miền địa phương mặc định cho môi trường hệ thống:"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -94,7 +87,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "

Modified: glibc-package/trunk/debian/po/zh_CN.po
===================================================================
--- glibc-package/trunk/debian/po/zh_CN.po	2006-04-06 19:44:39 UTC (rev 1330)
+++ glibc-package/trunk/debian/po/zh_CN.po	2006-04-06 20:10:36 UTC (rev 1331)
@@ -18,7 +18,7 @@
 msgstr ""
 "Project-Id-Version: glibc 2.3.2.ds1\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-02-19 23:11+0100\n"
+"POT-Creation-Date: 2006-04-06 21:47+0200\n"
 "PO-Revision-Date: 2004-02-10 04:25+1300\n"
 "Last-Translator: Hiei Xu <nicky@mail.edu.cn>\n"
 "Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
@@ -28,27 +28,20 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:3
+#: ../debhelper.in/locales.templates:4
 msgid "All locales"
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../debhelper.in/locales.templates:3
-#, fuzzy
-msgid "${locales}"
-msgstr "无, ${locales}"
-
-#. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 #, fuzzy
 msgid "Locales to be generated:"
 msgstr "请选择需要生成的区域设置(locale)。"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -58,7 +51,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
 "locale.gen', which you can also edit manually (you need to run `locale-gen' "
@@ -69,7 +62,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:5
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -77,20 +70,20 @@
 
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:17
-msgid "None, ${locales}"
-msgstr "无, ${locales}"
+#: ../debhelper.in/locales.templates:19
+msgid "None"
+msgstr "无"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 #, fuzzy
 msgid "Default locale for the system environment:"
 msgstr "哪个将作为系统环境默认的区域设置(locale)?"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
 "for users. You can change the default locale if you're not a native English "
@@ -103,7 +96,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:21
 msgid ""
 "Note: This will select the language for your whole system. If you're running "
 "a multi-user system where not all of your users speak the language of your "



Reply to: