* Install discover1 and xresprobe in desktop.preinst if not already

installed, both of these as well as laptop-detect are used by xserver-org
  if available (tasksel already depends on laptop-detect, so it will already
  be available).
* Patch from Kenshi Muto to make translated task names be displayed.
  Closes: #348716

debian/changelog

@@ -41,12 +41,19 @@ tasksel (2.39) UNRELEASED; urgency=low
   * Add preinst script for desktop task, to install read-edid and mdetect
     for X server autoconfiguration.
   * Clean up executation of commands.
-  * Policy update.
+  * Install discover1 and xresprobe in desktop.preinst if not already
+    installed, both of these as well as laptop-detect are used by xserver-org
+    if available (tasksel already depends on laptop-detect, so it will already
+    be available).
 
   [ Eugeniy Meshcheryakov ]
   * Replaced aspell-ukr by aspell-uk in 'ukrainian' task.
 
- -- Eugeniy Meshcheryakov <eugen@debian.org>  Thu, 12 Jan 2006 16:20:05 +0200
+  [ Joey Hess ]
+  * Patch from Kenshi Muto to make translated task names be displayed.
+    Closes: #348716
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 19 Jan 2006 14:24:40 -0500
 
 tasksel (2.38) unstable; urgency=low
 

debian/po/ar.po

@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel_debian_po\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2006-01-13 11:02+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -34,8 +34,14 @@ msgid ""
 "your needs, you can choose to install one or more of the following "
 "predefined collections of software."
 msgstr ""
-"لا شيء مثبّت حالياً سوى صميم ديبيان. لضبط التثبيت لاحتياجاتك يمكنك تثبيت"
-"واحد أو أكثر من مجموعات البرامج المعرّفة مسبقاً التّالية."
+"لا شيء مثبّت حالياً سوى صميم ديبيان. لضبط التثبيت لاحتياجاتك يمكنك تثبيتواحد "
+"أو أكثر من مجموعات البرامج المعرّفة مسبقاً التّالية."
+
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
 
 #. Type: multiselect
 #. Description
@@ -56,4 +62,3 @@ msgstr "يمكنك تثبيت واحد أو أكثر من مجموعات الب
 #: ../templates:18
 msgid "Debian software selection"
 msgstr "انتقاء برامج دبيان"
-

debian/po/bg.po

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2006-01-11 10:53+0200\n"
 "Last-Translator: Ognyan Kulev <ogi@fmi.uni-sofia.bg>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -29,7 +29,16 @@ msgid ""
 "At the moment, only the core of Debian is installed. To tune the system to "
 "your needs, you can choose to install one or more of the following "
 "predefined collections of software."
-msgstr "В момента са инсталирани само най-жизненоважните програми на Debian. За да нагласите системата към Вашите нужди, можете да изберете измежду един или повече от следните предварително зададени набори от софтуер."
+msgstr ""
+"В момента са инсталирани само най-жизненоважните програми на Debian. За да "
+"нагласите системата към Вашите нужди, можете да изберете измежду един или "
+"повече от следните предварително зададени набори от софтуер."
+
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
 
 #. Type: multiselect
 #. Description

debian/po/bn.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tasksel_Debian HEAD\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2006-01-05 21:00+0600\n"
 "Last-Translator: Progga <progga@BengaLinux.Org>\n"
 "Language-Team: Bangla <core@BengaLinux.Org>\n"
@@ -27,6 +27,12 @@ msgstr ""
 "সাজানোর জন্য পূর্বনির্ধারিত এই সফটওয়্যার সংগ্রহগুলো থেকে আপনি এক বা একাধিক সংগ্রহ "
 "ইনস্টল করতে পারেন।"
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/bs.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel_debian\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2004-12-25 13:20+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -37,6 +37,12 @@ msgstr ""
 "predefinisanih kolekcija softwarea. Iskusni korisnici mogu preferirati da "
 "ručno izaberu pakete."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/ca.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2004-07-22 19:09+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -29,6 +29,12 @@ msgstr ""
 "més de les següents col·leccions de programari. És possible que els usuaris "
 "amb més experiència prefereixen seleccionar els paquets manualment."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/cs.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-11-20 09:05+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -35,6 +35,12 @@ msgstr ""
 "dle svých potřeb, můžete nyní nainstalovat jednu nebo více úloh. Úlohy jsou "
 "připravené kolekce souvisejícího softwaru."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/cy.po

@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2004-11-24 13:30-0500\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -39,6 +39,12 @@ msgstr ""
 "casgliadau canlynol o feddalwardd. Mae'n bosib hoffai  ddefnyddwyr mwy "
 "profiadol ddewis pecynnau â llaw."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/da.po

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel v2\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-11-20 10:30+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -36,6 +36,12 @@ msgstr ""
 "installationen til dine behov, kan du vælge at installere en eller flere af "
 "følgende foruddefinerede programsamlinger."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12
@@ -60,4 +66,3 @@ msgstr "Valg af Debianprogrammer"
 
 #~ msgid "${CHOICES}, manual package selection"
 #~ msgstr "${CHOICES}, manuelt valg af pakker"
-

debian/po/de.po

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel/debian/po\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2006-01-04 20:46+0100\n"
 "Last-Translator: Jens Seidel <jensseidel@users.sf.net>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -35,6 +35,12 @@ msgstr ""
 "Ihre Bedürfnisse anzupassen, können Sie eine oder mehrere der folgenden "
 "vordefinierten Software-Sammlungen installieren."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12
@@ -48,8 +54,8 @@ msgid ""
 "You can choose to install one or more of the following predefined "
 "collections of software."
 msgstr ""
-"Sie können eine oder mehrere der folgenden vordefinierten "
-"Software-Sammlungen zur Installation auswählen."
+"Sie können eine oder mehrere der folgenden vordefinierten Software-"
+"Sammlungen zur Installation auswählen."
 
 #. Type: title
 #. Description

debian/po/el.po

@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-12-19 13:16+0200\n"
 "Last-Translator: George Papamichelakis <george@step.gr>\n"
 "Language-Team:  <debian-l10n-greek@lists.debian.org>\n"
@@ -37,6 +37,12 @@ msgstr ""
 "επιλέξετε την εγκατάσταση μιας ή και περισσοτέρων από τις ακόλουθες συλλογές "
 "από λογισμικό."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/es.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel 2.04\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-12-01 00:41+0100\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian Spanish Team <debian-l10n-spanish@lists.debian.org>\n"
@@ -21,7 +21,16 @@ msgid ""
 "At the moment, only the core of Debian is installed. To tune the system to "
 "your needs, you can choose to install one or more of the following "
 "predefined collections of software."
-msgstr "De momento sólo está instalado el núcleo de Debian. Puede escoger la instalación de las siguientes colecciones predefinidas de programas ara adaptar más la instalación a sus necesidades."
+msgstr ""
+"De momento sólo está instalado el núcleo de Debian. Puede escoger la "
+"instalación de las siguientes colecciones predefinidas de programas ara "
+"adaptar más la instalación a sus necesidades."
+
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
 
 #. Type: multiselect
 #. Description

debian/po/et.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel debian\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-06-05 18:26+0300\n"
 "Last-Translator: Siim Põder <windo@windowlicker.dyn.ee>\n"
 "Language-Team: Debiani installeri eestindus <debian-boot-et@linux.ee>\n"
@@ -39,6 +39,12 @@ msgstr ""
 "häälestada, võid valida mõned järgnevaist eeldefineeritud tarkvara "
 "kogumitest. Kogenud kasutajad võivad eelistada pakkide käsitsi valimist."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/eu.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-06-11 16:04+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Librezale.org <librezale@librezale.org>\n"
@@ -37,6 +37,12 @@ msgstr ""
 "zure beharretara egokitzeko, aurreaukeratutako pakete bilduma hauetako bat "
 "edo gehiago instalatu ditzakezu."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/fa.po

@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fa\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2004-06-27 12:15+0430\n"
 "Last-Translator: Arash Bijanzadeh <a.bijanzadeh@linuxiran.org>\n"
 "Language-Team: Farsi <fa@li.org>\n"
@@ -39,6 +39,12 @@ msgstr ""
 "کنید. کاربران پیش رفته تر ترجیح خواهند داد بسته ها را به صورت دستی انتخاب "
 "کنند."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/fi.po

@@ -16,13 +16,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel 2.00\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2006-01-12 13:52+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\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
 #. Description
@@ -36,6 +36,12 @@ msgstr ""
 "asennusta tarpeittesi mukaan valitsemalla asennettavaksi yhden tai useamman "
 "seuraavista ennalta määritellyistä ohjelmakokoelmista."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/fr.po

@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-11-19 11:05+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -39,6 +39,12 @@ msgstr ""
 "l'installation à vos besoins, vous pouvez choisir d'installer un ou "
 "plusieurs ensembles prédéfinis de logiciels."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12
@@ -60,4 +66,3 @@ msgstr ""
 #: ../templates:18
 msgid "Debian software selection"
 msgstr "Sélection des logiciels Debian"
-

debian/po/gl.po

@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-11-30 11:42+0100\n"
 "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -38,6 +38,12 @@ msgstr ""
 "instalación ás súas necesidades pode instalar unha ou máis das seguintes "
 "coleccións de software."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/he.po

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2006-01-12 19:17+0200\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: Hebrew\n"
@@ -33,6 +33,12 @@ msgstr ""
 "ברגע זה, רק הליבה של Debian מותקנת. כדי לכוונן את המערכת לצרכים שלך, תוכל "
 "לבחור להתקין אחד או יותר מאוספי התוכנה שהוגדרו."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/hr.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian-installer HR\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2004-07-13 23:51+0200\n"
 "Last-Translator: Kruno <kruno@linux.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -25,6 +25,12 @@ msgstr ""
 "prepostavljenih skupina programa. Iskusni korisnici mo¾da æe htjeti ruèni "
 "izabir paketa."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/hu.po

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel 2.00 debconf\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2004-06-27 14:02+0200\n"
 "Last-Translator: VERÓK István <vi@fsf.hu>\n"
 "Language-Team: Debian Hungarian Localization Team <debian-l10n-"
@@ -37,6 +37,12 @@ msgstr ""
 "telepítheti. Tapasztaltabb felhasználók számára a csomagok egyenkénti "
 "sajátkezű összeválogatásának lehetősége is nyitva áll."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/id.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel-debian\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2004-12-15 18:19+0700\n"
 "Last-Translator: Parlin Imanuel Toh <parlin@ui.edu>\n"
 "Language-Team: Debian Indonesian <debid@yahoogroups.com>\n"
@@ -25,6 +25,12 @@ msgstr ""
 "kebutuhan anda, anda dapat memilih satu atau lebih kumpulan perangkat lunak "
 "yang telah didefinisikan sebelumnya."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12
@@ -46,4 +52,3 @@ msgstr ""
 #: ../templates:18
 msgid "Debian software selection"
 msgstr "Pemilihan perangkat lunak Debian"
-

debian/po/it.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-12-24 15:20+0100\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -26,6 +26,12 @@ msgstr ""
 "l'installazione alle proprie esigenze, si deve scegliere di installare una a "
 "più delle seguenti collezioni predefinite di software."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/ja.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2006-01-05 08:44+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -30,7 +30,16 @@ msgid ""
 "At the moment, only the core of Debian is installed. To tune the system to "
 "your needs, you can choose to install one or more of the following "
 "predefined collections of software."
-msgstr "現時点では、Debian のコアのみがインストールされている状態です。あなたのニーズに合うようにシステムを調整するために、以下の定義済みソフトウェアコレクションから 1 つ以上をインストールできます。"
+msgstr ""
+"現時点では、Debian のコアのみがインストールされている状態です。あなたのニーズ"
+"に合うようにシステムを調整するために、以下の定義済みソフトウェアコレクション"
+"から 1 つ以上をインストールできます。"
+
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
 
 #. Type: multiselect
 #. Description

debian/po/ko.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel_debian\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-11-27 23:31+0900\n"
 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
 "Language-Team: Korean <debian-i18n-ko@lists.debian.org>\n"
@@ -24,6 +24,12 @@ msgstr ""
 "현재 데비안의 핵심적인 부분만 설치되어 있습니다. 필요한 것을 설치하려면, 다"
 "음 소프트웨어 모음 중 설치하려는 소프트웨어 모음을 선택하십시오."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/lt.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel_debian\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-12-27 00:40+0200\n"
 "Last-Translator: Kęstutis Biliūnas <kebil@kaunas.init.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -27,6 +27,12 @@ msgstr ""
 "įdiegimą savo poreikiams, Jūs galite pasirinkti vieną ar kelis iš žemiau "
 "apibrėžtų programinės įrangos rinkinių."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/mg.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mg\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-03-31 10:25+0200\n"
 "Last-Translator: Jaonary Rabarisoa <mpandikateny@linuxmg.org>\n"
 "Language-Team: Malagasy <mpandikateny@linuxmg.org>\n"
@@ -39,6 +39,12 @@ msgstr ""
 "Ireo izay efa za-draharaha dia afaka misafidy an-tanana ny fonosana izay "
 "ilainy."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/mk.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2006-01-16 12:29+0100\n"
 "Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -25,7 +25,14 @@ msgid ""
 "predefined collections of software."
 msgstr ""
 "Во моментот, само сржта на Дебиан е инстaлирана. За да ја средиш "
-"инсталацијата по твои потреби, може да одбереш да се инсталираат една или повеќе од предефинираните колекции на софтвер. "
+"инсталацијата по твои потреби, може да одбереш да се инсталираат една или "
+"повеќе од предефинираните колекции на софтвер. "
+
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
 
 #. Type: multiselect
 #. Description
@@ -48,4 +55,3 @@ msgstr ""
 #: ../templates:18
 msgid "Debian software selection"
 msgstr "Селекција на софтвер  во Дебиан"
-

debian/po/nb.po

@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2006-01-05 00:30+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -36,8 +36,14 @@ msgid ""
 "predefined collections of software."
 msgstr ""
 "Nå er det bare Debians grunnsystem som er installert. For å tilpasse "
-"systemet til dine behov, så kan du velge å installere en eller flere "
-"av de følgende forhåndsvalgte gruppene av programvare."
+"systemet til dine behov, så kan du velge å installere en eller flere av de "
+"følgende forhåndsvalgte gruppene av programvare."
+
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
 
 #. Type: multiselect
 #. Description
@@ -64,4 +70,3 @@ msgstr "Programvareutvalg for Debian"
 
 #~ msgid "${CHOICES}, manual package selection"
 #~ msgstr "${CHOICES}, manuelt pakkevalg"
-

debian/po/nl.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2006-01-07 00:47+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -26,8 +26,20 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../templates:4
-msgid "At the moment, only the core of Debian is installed. To tune the system to your needs, you can choose to install one or more of the following predefined collections of software."
-msgstr "Momenteel is enkel de Debian-kern geïnstalleerd. Om de installatie aan uw behoeften aan te passen kunt u een of meer van de voorgedefinieerde software-collecties installeren."
+msgid ""
+"At the moment, only the core of Debian is installed. To tune the system to "
+"your needs, you can choose to install one or more of the following "
+"predefined collections of software."
+msgstr ""
+"Momenteel is enkel de Debian-kern geïnstalleerd. Om de installatie aan uw "
+"behoeften aan te passen kunt u een of meer van de voorgedefinieerde software-"
+"collecties installeren."
+
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
 
 #. Type: multiselect
 #. Description
@@ -38,8 +50,12 @@ msgstr "Welke software wilt u installeren?"
 #. Type: multiselect
 #. Description
 #: ../templates:12
-msgid "You can choose to install one or more of the following predefined collections of software."
-msgstr "U heeft de mogelijkheid om een of meer van de volgende voorgedefinieerde softwarecollecties te gebruiken."
+msgid ""
+"You can choose to install one or more of the following predefined "
+"collections of software."
+msgstr ""
+"U heeft de mogelijkheid om een of meer van de volgende voorgedefinieerde "
+"softwarecollecties te gebruiken."
 
 #. Type: title
 #. Description
@@ -49,4 +65,3 @@ msgstr "Debian softwareselectie"
 
 #~ msgid "${CHOICES}, manual package selection"
 #~ msgstr "${CHOICES}, handmatige selectie van pakketten"
-

debian/po/nn.po

@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel_debian\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2004-08-29 23:11+0200\n"
 "Last-Translator: Axel Bojer <axelb@skolelinux.no>\n"
 "Language-Team: Norsk Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -40,6 +40,12 @@ msgstr ""
 "fleire førehandsdefinerte samlingar med programvare. Erfarne brukarar kan "
 "føretrekkje å velja pakkar manuelt."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/pl.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-12-20 12:05+0100\n"
 "Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -35,6 +35,12 @@ msgstr ""
 "instalacjê do Twoich potrzeb mo¿esz wybraæ instalacjê jednego lub wiêcej z "
 "poni¿szych predefiniowanych zestawów oprogramowania."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/pt.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2004-12-13 20:20+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese Translation Team <traduz@debianpt.org>\n"
@@ -28,6 +28,12 @@ msgstr ""
 "sistema de acordo com as suas necessidades, pode escolher instalar uma ou "
 "mais das seguintes colecções de software pré-definidas."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/pt_BR.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-11-22 20:24-0200\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -35,6 +35,12 @@ msgstr ""
 "necessidades de instalação, você pode optar por instalar uma ou mais das "
 "coleções de software pré-definidas a seguir."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/ro.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-11-20 21:58+0200\n"
 "Last-Translator: Eddy Petrişor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -23,7 +23,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1))\n"
 
 #. Type: multiselect
 #. Description
@@ -34,8 +35,14 @@ msgid ""
 "predefined collections of software."
 msgstr ""
 "Momentan, numai nucleul sistemului Debian este instalat. Pentru a regla "
-"sistemul conform cu propriile dvs. necesităţi, puteţi alege să instalaţi "
-"una sau mai multe din următoarele colecţii predefinite de programe."
+"sistemul conform cu propriile dvs. necesităţi, puteţi alege să instalaţi una "
+"sau mai multe din următoarele colecţii predefinite de programe."
+
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
 
 #. Type: multiselect
 #. Description
@@ -58,4 +65,3 @@ msgstr ""
 #: ../templates:18
 msgid "Debian software selection"
 msgstr "Selecţia de programe Debian"
-

debian/po/ru.po

@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel-templates_ru\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-11-19 12:04+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -41,6 +41,12 @@ msgstr ""
 "потребностей, вы можете выбрать один и более из уже готовых наборов "
 "программного обеспечения."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12
@@ -62,4 +68,3 @@ msgstr ""
 #: ../templates:18
 msgid "Debian software selection"
 msgstr "Выбор программного обеспечения Debian"
-

debian/po/sk.po

@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2006-01-07 12:46+0100\n"
 "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -24,6 +24,12 @@ msgstr ""
 "podľa svojich potrieb, môžete teraz inštalovať jednu alebo viac pripravených "
 "kolekcií súvisiaceho softvéru."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/sq.po

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2004-11-18 01:46+0100\n"
 "Last-Translator: Elian Myftiu <pinguiniREMOVEBOLD at fastwebnet dot it>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
@@ -36,6 +36,12 @@ msgstr ""
 "një koleksion të parapërcaktuar programesh nga lista e mëposhtme. Përdorues "
 "ekspertë mund të preferojnë zgjedhjen manuale të paketave."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/sv.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel 2.07 debconf\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-11-20 11:06+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <debian-boot@lists.debian.org>\n"
@@ -26,8 +26,20 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../templates:4
-msgid "At the moment, only the core of Debian is installed. To tune the system to your needs, you can choose to install one or more of the following predefined collections of software."
-msgstr "För närvarande är enbart Debians baspaket installerade. För att anpassa installationen efter dina behov kan du välja att installera en eller flera av följande fördefinierade paketgrupper."
+msgid ""
+"At the moment, only the core of Debian is installed. To tune the system to "
+"your needs, you can choose to install one or more of the following "
+"predefined collections of software."
+msgstr ""
+"För närvarande är enbart Debians baspaket installerade. För att anpassa "
+"installationen efter dina behov kan du välja att installera en eller flera "
+"av följande fördefinierade paketgrupper."
+
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
 
 #. Type: multiselect
 #. Description
@@ -38,8 +50,12 @@ msgstr "Välj programvara att installera:"
 #. Type: multiselect
 #. Description
 #: ../templates:12
-msgid "You can choose to install one or more of the following predefined collections of software."
-msgstr "Du kan välja att installera en eller flera av följande fördefinierade paketgrupper."
+msgid ""
+"You can choose to install one or more of the following predefined "
+"collections of software."
+msgstr ""
+"Du kan välja att installera en eller flera av följande fördefinierade "
+"paketgrupper."
 
 #. Type: title
 #. Description
@@ -49,4 +65,3 @@ msgstr "Debians programvaruväljare"
 
 #~ msgid "${CHOICES}, manual package selection"
 #~ msgstr "${CHOICES}, manuellt paketval"
-

debian/po/templates.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\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"
@@ -25,6 +25,12 @@ msgid ""
 "predefined collections of software."
 msgstr ""
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/tl.po

@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-11-22 23:58+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -20,7 +20,16 @@ msgid ""
 "At the moment, only the core of Debian is installed. To tune the system to "
 "your needs, you can choose to install one or more of the following "
 "predefined collections of software."
-msgstr "Sa ngayon, ang pinaka-payak na sistema ng Debian ay nakaluklok. Upang maangkop ang pagkaluklok sa inyong mga pangangailangan, maaari kayong pumili na magluklok ng isa o ilan sa mga sumusunod na mga koleksyon ng software."
+msgstr ""
+"Sa ngayon, ang pinaka-payak na sistema ng Debian ay nakaluklok. Upang "
+"maangkop ang pagkaluklok sa inyong mga pangangailangan, maaari kayong pumili "
+"na magluklok ng isa o ilan sa mga sumusunod na mga koleksyon ng software."
+
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
 
 #. Type: multiselect
 #. Description

debian/po/tr.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-12-05 01:10+0200\n"
 "Last-Translator: Recai Oktaş <roktas@omu.edu.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -23,9 +23,14 @@ msgid ""
 "predefined collections of software."
 msgstr ""
 "Debian'ın hâlihazırda sadece temel kısmı kurulu durumda.  Sistemi "
-"ihtiyaçlarınıza uygun hale getirmek için, önceden tanımlanmış "
-"aşağıdaki yazılım demetlerinden bir veya daha fazlasını kurmayı "
-"seçebilirsiniz."
+"ihtiyaçlarınıza uygun hale getirmek için, önceden tanımlanmış aşağıdaki "
+"yazılım demetlerinden bir veya daha fazlasını kurmayı seçebilirsiniz."
+
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
 
 #. Type: multiselect
 #. Description

debian/po/uk.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2006-01-11 18:54+0200\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen@univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -23,7 +23,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: multiselect
 #. Description
@@ -33,10 +34,16 @@ msgid ""
 "your needs, you can choose to install one or more of the following "
 "predefined collections of software."
 msgstr ""
-"На даний момент, встановлена тільки основна частина Debian. Для того, "
-"щоб підлаштувати інсталяцію під ваші потреби, ви можете вибрати встановлення "
+"На даний момент, встановлена тільки основна частина Debian. Для того, щоб "
+"підлаштувати інсталяцію під ваші потреби, ви можете вибрати встановлення "
 "одного або кількох наступних наборів програмного забезпечення."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12
@@ -58,4 +65,3 @@ msgstr ""
 #: ../templates:18
 msgid "Debian software selection"
 msgstr "Вибір програмного забезпечення Debian"
-

debian/po/vi.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel_debian\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2006-01-13 16:08+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -28,6 +28,12 @@ msgstr ""
 "cài đặt cho phù hợp với yêu cầu của mình, bạn có thể chọn cài một hoặc một "
 "vài những nhóm chương trình sau."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/wo.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel_debian_po\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-07-08 18:40+0000\n"
 "Last-Translator: Mouhamadou Mamoune Mbacke <mouhamadoumamoune@gmail.com>\n"
 "Language-Team: Wolof\n"
@@ -38,6 +38,12 @@ msgstr ""
 "porogaraam yii ñu dajale ba noppi. Jëfandikoo kat yi am ekperyaas amaana ñu "
 "bëgg a tann paket yi ak seen loxo."
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/zh_CN.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2005-11-24 22:53-0600\n"
 "Last-Translator: Ming Hua <minghua@rice.edu>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -39,6 +39,12 @@ msgstr ""
 "目前您仅安装了 Debian 的核心部分。要想调整系统以使之符合您的需求，请选择安装"
 "以下一个或多个预定义的软件集。"
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/po/zh_TW.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel/debian\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2005-11-18 14:50-0500\n"
+"POT-Creation-Date: 2006-01-18 22:50+0900\n"
 "PO-Revision-Date: 2004-08-19 16:46+0800\n"
 "Last-Translator: Tetralet <tetralet@pchome.com.tw>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -37,6 +37,12 @@ msgstr ""
 "些軟體來進行安裝，以使得安裝程序能更符合您的需求。而一些進階的使用者則也可以"
 "藉由手動來選擇套件。"
 
+#. Type: multiselect
+#. Choices
+#: ../templates:11
+msgid "${ORIGCHOICES}"
+msgstr "${CHOICES}"
+
 #. Type: multiselect
 #. Description
 #: ../templates:12

debian/rules

@@ -51,7 +51,6 @@ binary-indep: build install
 	dh_strip
 	dh_compress
 	dh_installdebconf
-	perl -pi -e 's/^Choices: \$${CHOICES}/Choices: \$${ORIGCHOICES}/' debian/tasksel/DEBIAN/templates
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps

debian/templates

@@ -1,6 +1,7 @@
 Template: tasksel/first
 Type: multiselect
-Choices: ${CHOICES}
+# Translators: translate ORIGCHOICES as CHOICES.
+_Choices: ${ORIGCHOICES}
 _Description: Choose software to install:
  At the moment, only the core of Debian is installed. To tune the
  system to your needs, you can choose to install one or more of the
@@ -8,7 +9,8 @@ _Description: Choose software to install:
 
 Template: tasksel/tasks
 Type: multiselect
-Choices: ${CHOICES}
+# Translators: translate ORIGCHOICES as CHOICES.
+_Choices: ${ORIGCHOICES}
 _Description: Choose software to install:
  You can choose to install one or more of the following predefined
  collections of software.

info/desktop.preinst

@@ -1,11 +1,11 @@
 #!/bin/sh
 set -e
 
-# Neither mdetect or read-edid are strictly needed, but they make X
+# None of these packages are strictly needed, but they make X
 # autoconfiguration work better. Need to install them before X is
 # preconfigured. Note that they are also listed as part of the task, which
 # will take care of their removal when the task is removed.
-for pkg in mdetect read-edid; do
+for pkg in mdetect read-edid discover1 xresprobe; do
 	if apt-cache show "$pkg" >/dev/null 2>&1 &&
 	   ! dpkg --get-selections | grep "$pkg" | grep -q install; then
 		apt-get -q -y -f install $pkg >/dev/null || true

po/tasksel.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-02 15:28-0500\n"
+"POT-Creation-Date: 2006-01-18 23:04+0900\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"

tasks/po/fi.po

@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: newtasksel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-18 14:45-0500\n"
+"POT-Creation-Date: 2006-01-19 14:21-0500\n"
 "PO-Revision-Date: 2006-01-16 14:18+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. Description
 #: ../po/debian-tasks.desc:3
@@ -194,8 +194,8 @@ msgid ""
 "This task installs packages and documentation in Czech to help Czech "
 "speaking people use Debian."
 msgstr ""
-"Asentaa paketit ja dokumentaation tsekiksi auttamaan tsekinkielisiä "
-"Debianin käytössä."
+"Asentaa paketit ja dokumentaation tsekiksi auttamaan tsekinkielisiä Debianin "
+"käytössä."
 
 #. Description
 #: ../po/debian-tasks.desc:139
@@ -266,7 +266,8 @@ msgid ""
 "This task provides basic desktop software and serves as a basis for the "
 "Gnome and KDE desktop tasks."
 msgstr ""
-"Työpöydän perusohjelmat ja toimii perustuksena Gnome- ja KDE-työpöytäympäristöille."
+"Työpöydän perusohjelmat ja toimii perustuksena Gnome- ja KDE-"
+"työpöytäympäristöille."
 
 #. Description
 #: ../po/debian-tasks.desc:187
@@ -372,8 +373,7 @@ msgstr "Gnome-työpöytäympäristö"
 msgid ""
 "This task provides basic \"desktop\" software using the Gnome desktop "
 "environment."
-msgstr ""
-"Tarjoaa työpöydän perusohjelmat käyttämällä Gnome-työpöytäympäristöä."
+msgstr "Tarjoaa työpöydän perusohjelmat käyttämällä Gnome-työpöytäympäristöä."
 
 #. Description
 #: ../po/debian-tasks.desc:269