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

r1934 - in glibc-package/branches/glibc-2.5/debian: . debhelper.in po



Author: aurel32
Date: 2007-02-05 05:42:57 +0100 (Mon, 05 Feb 2007)
New Revision: 1934

Modified:
   glibc-package/branches/glibc-2.5/debian/changelog
   glibc-package/branches/glibc-2.5/debian/debhelper.in/locales.templates
   glibc-package/branches/glibc-2.5/debian/po/ca.po
   glibc-package/branches/glibc-2.5/debian/po/cs.po
   glibc-package/branches/glibc-2.5/debian/po/da.po
   glibc-package/branches/glibc-2.5/debian/po/de.po
   glibc-package/branches/glibc-2.5/debian/po/el.po
   glibc-package/branches/glibc-2.5/debian/po/es.po
   glibc-package/branches/glibc-2.5/debian/po/eu.po
   glibc-package/branches/glibc-2.5/debian/po/fi.po
   glibc-package/branches/glibc-2.5/debian/po/fr.po
   glibc-package/branches/glibc-2.5/debian/po/gl.po
   glibc-package/branches/glibc-2.5/debian/po/it.po
   glibc-package/branches/glibc-2.5/debian/po/ja.po
   glibc-package/branches/glibc-2.5/debian/po/ko.po
   glibc-package/branches/glibc-2.5/debian/po/lt.po
   glibc-package/branches/glibc-2.5/debian/po/nl.po
   glibc-package/branches/glibc-2.5/debian/po/pl.po
   glibc-package/branches/glibc-2.5/debian/po/pt.po
   glibc-package/branches/glibc-2.5/debian/po/pt_BR.po
   glibc-package/branches/glibc-2.5/debian/po/ro.po
   glibc-package/branches/glibc-2.5/debian/po/ru.po
   glibc-package/branches/glibc-2.5/debian/po/sv.po
   glibc-package/branches/glibc-2.5/debian/po/templates.pot
   glibc-package/branches/glibc-2.5/debian/po/tr.po
   glibc-package/branches/glibc-2.5/debian/po/uk.po
   glibc-package/branches/glibc-2.5/debian/po/vi.po
   glibc-package/branches/glibc-2.5/debian/po/zh_CN.po
Log:
  * debhelper.in/locales.templates: recommends UTF-8 locales by default.



Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/changelog	2007-02-05 04:42:57 UTC (rev 1934)
@@ -84,6 +84,7 @@
     kernel version to 2.6.1, except on m68k where it is set to 2.4.1.
   * patches/any/cvs-2.5-branch-update.diff: new patch (2.5 branch update) from
     upstream CVS.
+  * debhelper.in/locales.templates: recommends UTF-8 locales by default.
 
   [ Denis Barbier ]
   * Remove localedata/locale-en_NZ.diff (merged upstream).

Modified: glibc-package/branches/glibc-2.5/debian/debhelper.in/locales.templates
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/locales.templates	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/locales.templates	2007-02-05 04:42:57 UTC (rev 1934)
@@ -12,6 +12,11 @@
  .
  When `All locales' is selected, /etc/locale.gen will be set as a symlink to
  /usr/share/i18n/SUPPORTED.
+ .
+ UTF-8 locales should be chosen by default.  If you are a performing a
+ new installation, or are unsure which character set to use, UTF-8 is
+ usually the best choice.  Other character sets are useful for
+ backwards compatibility with older systems and software.
 
 Template: locales/default_environment_locale
 Type: select

Modified: glibc-package/branches/glibc-2.5/debian/po/ca.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/ca.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/ca.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -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-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -39,7 +39,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 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 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 #, fuzzy
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
@@ -61,12 +61,22 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
 msgstr ""
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -82,7 +92,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 #, fuzzy
 msgid ""
 "Many packages in Debian use locales to display text in the correct language "
@@ -96,7 +106,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 #, fuzzy
 msgid ""
 "Note: This will select the language for your whole system. If you're running "

Modified: glibc-package/branches/glibc-2.5/debian/po/cs.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/cs.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/cs.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -37,7 +37,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 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 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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 +59,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -67,6 +67,16 @@
 "Vyberete-li 'Všechny locales', ze souboru /etc/locale.gen se stane "
 "symbolický odkaz na /usr/share/i18n/SUPPORTED."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -81,7 +91,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -95,7 +105,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/da.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/da.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/da.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -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-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -37,7 +37,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 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 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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 +59,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -67,6 +67,16 @@
 "Når 'Alle lokalitetsfiler' er valgt, vil /etc/locale.gen blive oprettet som "
 "en symbolsk henvisning til /usr/share/i18n/SUPPORTED."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -81,7 +91,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -95,7 +105,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/de.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/de.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/de.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -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-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -37,18 +37,18 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 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 ""
-"Standorteinstellungen ist ein System, um zwischen verschiedenen "
-"Sprachen umzuschalten. Nutzer k�n damit ihre Sprache, ihr Land, "
-"ihren Zeichensatz, die Sortierreihenfolge und anderes mehr festlegen."
+"Standorteinstellungen ist ein System, um zwischen verschiedenen Sprachen "
+"umzuschalten. Nutzer k�n damit ihre Sprache, ihr Land, ihren Zeichensatz, "
+"die Sortierreihenfolge und anderes mehr festlegen."
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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 +60,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -68,6 +68,16 @@
 "Falls `Alle Standorteinstellungen' gew�t ist, wird /etc/locale.gen als "
 "Symlink auf /usr/share/i18n/SUPPORTED eingerichtet."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -82,7 +92,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 +106,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/el.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/el.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/el.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -40,7 +40,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -51,7 +51,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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' "
@@ -64,12 +64,22 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
 msgstr ""
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -85,7 +95,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -100,7 +110,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/es.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/es.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/es.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -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-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -39,7 +39,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -50,7 +50,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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' "
@@ -62,7 +62,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -70,6 +70,16 @@
 "Si selecciona �Todos los locales�, /etc/locale.gen ser�n enlace simb�o "
 "a /usr/share/i18n/SUPPORTED."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -84,7 +94,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -98,7 +108,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/eu.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/eu.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/eu.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\n"
 "PO-Revision-Date: 2006-11-16 23:57+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: librezale <librezale@librezale.org>\n"
@@ -30,35 +30,47 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 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-ak hizkuntza anitz artean aldatzeko ingurugiroa da erabiltzaileek beren "
-"hizkuntza, herrialdea, karaktere-jokoa, erkatze ordena etabar ezarri ahal izateko."
+"Locale-ak hizkuntza anitz artean aldatzeko ingurugiroa da erabiltzaileek "
+"beren hizkuntza, herrialdea, karaktere-jokoa, erkatze ordena etabar ezarri "
+"ahal izateko."
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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 ""
-"Hautatu zein locale sortu behar diren.  Hautapena `/etc/locale.gen'-en gordeko "
-"da, zein eskuz editatu dezakezu (editatu ondoren `locale-gen' exekutatu."
+"Hautatu zein locale sortu behar diren.  Hautapena `/etc/locale.gen'-en "
+"gordeko da, zein eskuz editatu dezakezu (editatu ondoren `locale-gen' "
+"exekutatu."
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
 msgstr ""
-"`locale guztiak' hautatu ezkero, /etc/locale.gen /usr/share/i18n/SUPPORTED-ra "
-"lotura sinboliko bat bezala ezarriko da."
+"`locale guztiak' hautatu ezkero, /etc/locale.gen /usr/share/i18n/SUPPORTED-"
+"ra lotura sinboliko bat bezala ezarriko da."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -73,7 +85,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -82,12 +94,12 @@
 msgstr ""
 "Debian pakete anitzek locale-ak erabiltzen dituzte erabiltzaileari dagokion "
 "hizkuntzan testuak bistaratzeko. Locale lehenetsia alda dezakezu ez bazara "
-"jatorrizko ingeles hiztuna. Aukerak sortu behar diren locale-etan oinarriturik "
-"daude."
+"jatorrizko ingeles hiztuna. Aukerak sortu behar diren locale-etan "
+"oinarriturik daude."
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -95,7 +107,6 @@
 "default locale."
 msgstr ""
 "Oharra: Honek zure sistemako hizkuntza aukeratuko du. Hautatutako hizkuntza "
-"denek erabiltzen ez duten erabiltzaile anitzeko sistema bat bada, agian erabiltzaile "
-"horiek arazoetan aurki daitezke eta nahiago dezakezu locale lehenetsirik ez "
-"ezartzea."
-
+"denek erabiltzen ez duten erabiltzaile anitzeko sistema bat bada, agian "
+"erabiltzaile horiek arazoetan aurki daitezke eta nahiago dezakezu locale "
+"lehenetsirik ez ezartzea."

Modified: glibc-package/branches/glibc-2.5/debian/po/fi.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/fi.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/fi.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -38,7 +38,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -49,7 +49,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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' "
@@ -61,12 +61,22 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
 msgstr ""
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -82,7 +92,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 +106,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/fr.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/fr.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/fr.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -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-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -37,7 +37,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 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 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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 +60,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -69,6 +69,16 @@
 "locale.gen est remplac�ar un lien symbolique vers /usr/share/i18n/"
 "SUPPORTED."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -83,7 +93,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -98,7 +108,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/gl.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/gl.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/gl.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -29,7 +29,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -39,7 +39,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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' "
@@ -51,7 +51,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -59,6 +59,16 @@
 "Ao escoller \"Todas as configuracións locais\" hase estabrecer /etc/locale."
 "gen coma unha ligazón simbólica a /usr/share/i18n/SUPPORTED."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -73,7 +83,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -87,7 +97,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/it.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/it.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/it.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -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-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -29,7 +29,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -40,7 +40,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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' "
@@ -52,7 +52,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -60,6 +60,16 @@
 "Scegliendo �Tutti i locale�, /etc/locale.gen viene impostato come un link "
 "simbolico a /usr/share/i18n/SUPPORTED."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -74,7 +84,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -88,7 +98,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/ja.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/ja.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/ja.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -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-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -37,7 +37,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 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 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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,12 +59,22 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
 msgstr ""
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -79,7 +89,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 +102,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/ko.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/ko.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/ko.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -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-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -39,7 +39,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 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 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 #, fuzzy
 msgid ""
 "Choose which locales to generate.  The selection will be saved to `/etc/"
@@ -60,12 +60,22 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
 msgstr ""
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -80,7 +90,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -90,7 +100,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/lt.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/lt.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/lt.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: glibc_2.3.6-15_templates\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\n"
 "PO-Revision-Date: 2006-06-19 01:26+0300\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -32,7 +32,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 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 +42,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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' "
@@ -54,7 +54,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -62,6 +62,16 @@
 "Jei pasirinktas variantas „Visos lokalės“, /etc/locale.gen bus simbolinė "
 "nuoroda į /usr/share/i18n/SUPPORTED."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -76,7 +86,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -89,7 +99,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/nl.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/nl.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/nl.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: glibc\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -37,7 +37,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 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 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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 +59,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -67,6 +67,16 @@
 "Wanneer 'Alle Localisaties' geselecteerd is, dan wordt /etc/locale.gen een "
 "symbolische link naar /usr/share/i18n/SUPPORTED."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -81,7 +91,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 +106,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/pl.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/pl.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/pl.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -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-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -25,7 +25,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -36,7 +36,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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' "
@@ -49,7 +49,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -57,6 +57,16 @@
 "Po wybraniu `Wszystkie dostępne', plik /etc/locale.gen będzie dowiązaniem "
 "symbolicznym do/usr/share/i18n/SUPPORTED."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -71,7 +81,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -86,7 +96,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/pt.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/pt.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/pt.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -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-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -29,7 +29,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -40,7 +40,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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' "
@@ -52,7 +52,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -60,6 +60,16 @@
 "Quando 'Todos os locales' estiver selecionada, /etc/locale.gen será umlink "
 "simbolico para /usr/share/i18n/SUPPORTED."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -74,7 +84,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -88,7 +98,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/pt_BR.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/pt_BR.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/pt_BR.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: libc6\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\n"
 "PO-Revision-Date: 2006-06-26 21:50+0200\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs."
 "org>\n"
@@ -38,7 +38,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -49,7 +49,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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' "
@@ -61,7 +61,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -69,6 +69,16 @@
 "Quando `Todos os \"locales\"' for selecionado, /etc/locale.gen será "
 "configurado como uma ligação simbólica para /usr/share/i18n/SUPPORTED."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -83,7 +93,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -97,7 +107,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/ro.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/ro.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/ro.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glibc 2.3.6.dsl-4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-09 12:21-0600\n"
+"Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\n"
 "PO-Revision-Date: 2006-09-18 19:51+0300\n"
 "Last-Translator: Stan Ioan-Eugen <stan.ieugen@gmail.com>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. Type: multiselect
 #. Choices
@@ -35,8 +35,10 @@
 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 este un cadru de lucru pentru utilizatori, care le permite acestora să schimbe "
-"între mai multe limbi pentru a folosi propria lor limbă, ţară, caractere, formatare datei, etc."
+msgstr ""
+"Locale este un cadru de lucru pentru utilizatori, care le permite acestora "
+"să schimbe între mai multe limbi pentru a folosi propria lor limbă, ţară, "
+"caractere, formatare datei, etc."
 
 #. Type: multiselect
 #. Description
@@ -45,8 +47,10 @@
 "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 "Alegeţi ce locale să fie generate.  Această selecţie va fi salvată în `/etc/locale.gen',"
-"fişier care poate fi editat şi manual (după care va trebui să rulaţi `locale-gen')."
+msgstr ""
+"Alegeţi ce locale să fie generate.  Această selecţie va fi salvată în `/etc/"
+"locale.gen',fişier care poate fi editat şi manual (după care va trebui să "
+"rulaţi `locale-gen')."
 
 #. Type: multiselect
 #. Description
@@ -54,9 +58,20 @@
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
-msgstr "Dacă veţi alege \"Toate localele\", /etc/locale.gen va fi o legătură simbolică la"
-"/usr/share/i18n/SUPPORTED."
+msgstr ""
+"Dacă veţi alege \"Toate localele\", /etc/locale.gen va fi o legătură "
+"simbolică la/usr/share/i18n/SUPPORTED."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -77,11 +92,11 @@
 "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 "Multe pachete din Debian folosesc locale pentru a afişa text în limba corectă "
-"pentru utilizatori. Puteţi schimba valoarea implicită pentru locale dacă nu "
-"cunoaşteţi bine limba engleză. Aceste opţiuni sunt bazate pe localele alese"
-"pentru a fi generate. "
-""
+msgstr ""
+"Multe pachete din Debian folosesc locale pentru a afişa text în limba "
+"corectă pentru utilizatori. Puteţi schimba valoarea implicită pentru locale "
+"dacă nu cunoaşteţi bine limba engleză. Aceste opţiuni sunt bazate pe "
+"localele alesepentru a fi generate. "
 
 #. Type: select
 #. Description
@@ -91,8 +106,8 @@
 "a multi-user system where not all of your users speak the language of your "
 "choice, then they will run into difficulties and you might want not to set a "
 "default locale."
-msgstr "Notă: Această opţiune va stabili limba pentru tot sistemul. Dacă aveţi un sistem"
-"multi-utilizator unde nu toţi utilizatorii vorbesc limba aleasă, atunci ei vor "
-"întâmpina dificultăţi, motiv pentru care ar fi bine să nu stabiliţi nici o localizare "
-"implicită."
-
+msgstr ""
+"Notă: Această opţiune va stabili limba pentru tot sistemul. Dacă aveţi un "
+"sistemmulti-utilizator unde nu toţi utilizatorii vorbesc limba aleasă, "
+"atunci ei vor întâmpina dificultăţi, motiv pentru care ar fi bine să nu "
+"stabiliţi nici o localizare implicită."

Modified: glibc-package/branches/glibc-2.5/debian/po/ru.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/ru.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/ru.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: glibc_2.3.6-15\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-04-06 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\n"
 "PO-Revision-Date: 2006-07-23 14:02+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -18,78 +18,88 @@
 
 #. Type: multiselect
 #. Choices
-#: ../debhelper.in/locales.templates:4
+#: ../debhelper.in/locales.templates:1001
 msgid "All locales"
 msgstr "Все локали"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:5
+#: ../debhelper.in/locales.templates:1002
 msgid "Locales to be generated:"
 msgstr "Локали, которые будут сгенерированы:"
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:5
+#: ../debhelper.in/locales.templates:1002
 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 ""
-"Локаль -- это инфраструктура для поддержки в системе нескольких "
-"языков и позволяет пользователю настроить язык сообщений, "
-"страну, алфавит, порядок сортировки и тому подобные вещи."
+"Локаль -- это инфраструктура для поддержки в системе нескольких языков и "
+"позволяет пользователю настроить язык сообщений, страну, алфавит, порядок "
+"сортировки и тому подобные вещи."
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:5
+#: ../debhelper.in/locales.templates:1002
 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 ""
-"Выберите локали, которые нужно сгенерировать. Выбор будет сохранён в файле "
-"`/etc/locale.gen', который вы можете редактировать вручную (после "
+"Выберите локали, которые нужно сгенерировать. Выбор будет сохранён в файле `/"
+"etc/locale.gen', который вы можете редактировать вручную (после "
 "редактирования нужно запустить `locale-gen')."
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:5
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
 msgstr ""
-"Если выбрано `Все локали', то будет создана символическая ссылка /etc/locale.gen, "
-"указывающая на /usr/share/i18n/SUPPORTED."
+"Если выбрано `Все локали', то будет создана символическая ссылка /etc/locale."
+"gen, указывающая на /usr/share/i18n/SUPPORTED."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
-#: ../debhelper.in/locales.templates:19
+#: ../debhelper.in/locales.templates:2001
 msgid "None"
 msgstr "Нет"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:21
+#: ../debhelper.in/locales.templates:2002
 msgid "Default locale for the system environment:"
 msgstr "Локаль по умолчанию в системе:"
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:21
+#: ../debhelper.in/locales.templates:2002
 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 ""
-"Многие пакеты в Debian используют локали для отображения сообщений на "
-"языке пользователя. Вы можете изменить локаль по умолчанию, если английский "
-"не является вашим родным языком. Эти значения основаны на выбранных "
-"вами локалях для генерации."
+"Многие пакеты в Debian используют локали для отображения сообщений на языке "
+"пользователя. Вы можете изменить локаль по умолчанию, если английский не "
+"является вашим родным языком. Эти значения основаны на выбранных вами "
+"локалях для генерации."
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:21
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -100,4 +110,3 @@
 "в многопользовательской среде, где не все пользователи говорят на выбранном "
 "вами языке, то у них могут возникнуть проблемы и в этом случае лучше не "
 "устанавливать локаль по умолчанию."
-

Modified: glibc-package/branches/glibc-2.5/debian/po/sv.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/sv.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/sv.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -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-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -36,7 +36,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 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 +47,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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 +59,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -67,6 +67,16 @@
 "N�\"Alla lokaler\" v�s, kommer /etc/locale.gen att st�a in som en "
 "symbolisk l� till /usr/share/i18n/SUPPORTED."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -81,7 +91,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -95,7 +105,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/templates.pot
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/templates.pot	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/templates.pot	2007-02-05 04:42:57 UTC (rev 1934)
@@ -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-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -30,7 +30,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -38,7 +38,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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' "
@@ -47,12 +47,22 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
 msgstr ""
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -67,7 +77,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -77,7 +87,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/tr.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/tr.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/tr.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: locales\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -29,7 +29,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -40,7 +40,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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' "
@@ -52,12 +52,22 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
 msgstr ""
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -72,7 +82,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -86,7 +96,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/uk.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/uk.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/uk.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2006-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\n"
 "PO-Revision-Date: 2006-02-21 10:12+0200\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen@univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -40,7 +40,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -51,7 +51,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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' "
@@ -63,7 +63,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
@@ -71,6 +71,16 @@
 "Коли обрано „Всі локалі“, /etc/locale.gen буде символьним посиланням на /usr/"
 "share/i18n/SUPPORTED."
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -85,7 +95,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 +109,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/vi.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/vi.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/vi.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -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-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -30,7 +30,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -41,7 +41,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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,12 +53,22 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
 msgstr ""
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -73,7 +83,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 "
@@ -87,7 +97,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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/branches/glibc-2.5/debian/po/zh_CN.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/zh_CN.po	2007-02-04 12:57:47 UTC (rev 1933)
+++ glibc-package/branches/glibc-2.5/debian/po/zh_CN.po	2007-02-05 04:42:57 UTC (rev 1934)
@@ -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-06-26 21:47+0200\n"
+"POT-Creation-Date: 2007-02-05 05:41+0100\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"
@@ -41,7 +41,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1003
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "Locale is a framework to switch between multiple languages for users who can "
 "select to use their language, country, characters, collation order, etc."
@@ -51,7 +51,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1004
+#: ../debhelper.in/locales.templates:1002
 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' "
@@ -62,12 +62,22 @@
 
 #. Type: multiselect
 #. Description
-#: ../debhelper.in/locales.templates:1005
+#: ../debhelper.in/locales.templates:1002
 msgid ""
 "When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
 "usr/share/i18n/SUPPORTED."
 msgstr ""
 
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid ""
+"UTF-8 locales should be chosen by default.  If you are a performing a new "
+"installation, or are unsure which character set to use, UTF-8 is usually the "
+"best choice.  Other character sets are useful for backwards compatibility "
+"with older systems and software."
+msgstr ""
+
 #. Type: select
 #. Choices
 #: ../debhelper.in/locales.templates:2001
@@ -83,7 +93,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2003
+#: ../debhelper.in/locales.templates:2002
 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 +106,7 @@
 
 #. Type: select
 #. Description
-#: ../debhelper.in/locales.templates:2004
+#: ../debhelper.in/locales.templates:2002
 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: