[kernel] r19363 - dists/trunk/linux-base/debian/po

Ben Hutchings benh at alioth.debian.org
Sat Sep 1 14:59:05 UTC 2012


Author: benh
Date: Sat Sep  1 14:59:04 2012
New Revision: 19363

Log:
Auto-update debconf template translation files (debconf-updatepo)

Modified:
   dists/trunk/linux-base/debian/po/ca.po
   dists/trunk/linux-base/debian/po/cs.po
   dists/trunk/linux-base/debian/po/da.po
   dists/trunk/linux-base/debian/po/de.po
   dists/trunk/linux-base/debian/po/es.po
   dists/trunk/linux-base/debian/po/et.po
   dists/trunk/linux-base/debian/po/fr.po
   dists/trunk/linux-base/debian/po/it.po
   dists/trunk/linux-base/debian/po/ja.po
   dists/trunk/linux-base/debian/po/nl.po
   dists/trunk/linux-base/debian/po/pl.po
   dists/trunk/linux-base/debian/po/pt.po
   dists/trunk/linux-base/debian/po/pt_BR.po
   dists/trunk/linux-base/debian/po/ru.po
   dists/trunk/linux-base/debian/po/sv.po
   dists/trunk/linux-base/debian/po/templates.pot
   dists/trunk/linux-base/debian/po/vi.po

Modified: dists/trunk/linux-base/debian/po/ca.po
==============================================================================
--- dists/trunk/linux-base/debian/po/ca.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/ca.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-24\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-07-16 15:55+0100\n"
+"Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2010-10-25 00:24+0200\n"
 "Last-Translator: Jordi Mallach <jordi at debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -18,48 +18,59 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid "Update disk device IDs in system configuration?"
 msgstr "Voleu actualitzar els ID dels dispositius de discs a la configuració?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "The new Linux kernel version provides different drivers for some PATA (IDE) "
 "controllers. The names of some hard disk, CD-ROM, and tape devices may "
 "change."
-msgstr "La versió nova del nucli Linux proporciona diferents controladors per a alguns dispositius PATA (IDE). Els noms d'alguns discs durs, CD-ROM i dispositius de cinta poden canviar."
+msgstr ""
+"La versió nova del nucli Linux proporciona diferents controladors per a "
+"alguns dispositius PATA (IDE). Els noms d'alguns discs durs, CD-ROM i "
+"dispositius de cinta poden canviar."
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "It is now recommended to identify disk devices in configuration files by "
 "label or UUID (unique identifier) rather than by device name, which will "
 "work with both old and new kernel versions."
-msgstr "És recomanable que identifiqueu els dispositius de disc als fitxers de configuració per etiqueta o UUID (identificador únic) en lloc de pel seu nom de dispositiu, perquè així funcionaran amb les versions de nucli antiga i nova."
+msgstr ""
+"És recomanable que identifiqueu els dispositius de disc als fitxers de "
+"configuració per etiqueta o UUID (identificador únic) en lloc de pel seu nom "
+"de dispositiu, perquè així funcionaran amb les versions de nucli antiga i "
+"nova."
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "If you choose to not update the system configuration automatically, you must "
 "update device IDs yourself before the next system reboot or the system may "
 "become unbootable."
-msgstr "Si trieu no actualitzar la configuració del sistema automàticament, heu d'actualitzar els ID dels dispositius manualment abans del pròxim reinici del sistema, o el sistema pot deixar d'arrencar."
+msgstr ""
+"Si trieu no actualitzar la configuració del sistema automàticament, heu "
+"d'actualitzar els ID dels dispositius manualment abans del pròxim reinici "
+"del sistema, o el sistema pot deixar d'arrencar."
 
 #. Type: boolean
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "Apply configuration changes to disk device IDs?"
-msgstr "Voleu aplicar els canvis de configuració als ID de dispositius de disc?"
+msgstr ""
+"Voleu aplicar els canvis de configuració als ID de dispositius de disc?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
+#: ../templates:3001
 msgid "These devices will be assigned UUIDs or labels:"
 msgstr "S'assignaran UUID o etiquetes a aquests dispositius:"
 
@@ -67,7 +78,7 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "These configuration files will be updated:"
 msgstr "S'actualitzaran aquests fitxers de configuració:"
 
@@ -75,74 +86,105 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "The device IDs will be changed as follows:"
 msgstr "Els ID dels dispositius canviaran de la manera següent:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid "Configuration files still contain deprecated device names"
 msgstr "Alguns fitxers de configuració encara contenen noms desaconsellats"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid ""
 "The following configuration files still use some device names that may "
 "change when using the new kernel:"
-msgstr "Els fitxers de configuració següents encara empren alguns noms de dispositiu que poden canviar quan s'empre el nucli nou:"
+msgstr ""
+"Els fitxers de configuració següents encara empren alguns noms de dispositiu "
+"que poden canviar quan s'empre el nucli nou:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid "Boot loader configuration check needed"
 msgstr "Es requereix una comprovació de la configuració del carregador"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "The boot loader configuration for this system was not recognized. These "
 "settings in the configuration may need to be updated:"
-msgstr "No s'ha reconegut la configuració del carregador d'aquest sistema. És possible que calga actualitzar aquests paràmetres de la configuració:"
+msgstr ""
+"No s'ha reconegut la configuració del carregador d'aquest sistema. És "
+"possible que calga actualitzar aquests paràmetres de la configuració:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 " * The root device ID passed as a kernel parameter;\n"
 " * The boot device ID used to install and update the boot loader."
 msgstr ""
 " * L'ID del dispositiu arrel que es passa com a paràmetre del nucli,\n"
-" * L'ID del dispositiu d'arrencada emprat per a instaŀlar i actualitzar el carregador."
+" * L'ID del dispositiu d'arrencada emprat per a instaŀlar i actualitzar el "
+"carregador."
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "You should generally identify these devices by UUID or label. However, on "
 "MIPS systems the root device must be identified by name."
-msgstr "En general, hauríeu d'identificar aquests dispositius per UUID o etiqueta. Als sistemes MIPS, però, el dispositiu arrel s'ha d'identificar pel seu nom."
+msgstr ""
+"En general, hauríeu d'identificar aquests dispositius per UUID o etiqueta. "
+"Als sistemes MIPS, però, el dispositiu arrel s'ha d'identificar pel seu nom."
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:8001
 msgid "Boot loader may need to be upgraded"
 msgstr "És possible que calga actualitzar el carregador"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:8001
 msgid "Kernel packages no longer update a default boot loader."
 msgstr "Els paquets del nucli ja no actualitzen el carregador per defecte."
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
+#: ../templates:8001
 msgid ""
 "If the boot loader needs to be updated whenever a new kernel is installed, "
 "the boot loader package should install a script in /etc/kernel/postinst.d.  "
 "Alternately, you can specify the command to update the boot loader by "
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
-msgstr "Si s'ha d'actualitzar el carregador cada vegada que s'instaŀla un nou nucli, el paquet del carregador hauria d'instaŀlar un script en /etc/kernel/postinst.d. Alternativament, podeu especificar l'ordre per a actualitzar el carregador establint la variable «postinst_hook» en /etc/kernel-img.conf."
+msgstr ""
+"Si s'ha d'actualitzar el carregador cada vegada que s'instaŀla un nou nucli, "
+"el paquet del carregador hauria d'instaŀlar un script en /etc/kernel/"
+"postinst.d. Alternativament, podeu especificar l'ordre per a actualitzar el "
+"carregador establint la variable «postinst_hook» en /etc/kernel-img.conf."

Modified: dists/trunk/linux-base/debian/po/cs.po
==============================================================================
--- dists/trunk/linux-base/debian/po/cs.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/cs.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-18\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-07-25 10:32+0200\n"
+"Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2010-07-26 18:02+0200\n"
 "Last-Translator: Michal Simunek <michal.simunek at gmail.com>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -18,13 +18,13 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid "Update disk device IDs in system configuration?"
 msgstr "Aktualizovat v nastavení systému ID diskových zařízení?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "The new Linux kernel version provides different drivers for some PATA (IDE) "
 "controllers. The names of some hard disk, CD-ROM, and tape devices may "
@@ -36,7 +36,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "It is now recommended to identify disk devices in configuration files by "
 "label or UUID (unique identifier) rather than by device name, which will "
@@ -48,7 +48,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "If you choose to not update the system configuration automatically, you must "
 "update device IDs yourself before the next system reboot or the system may "
@@ -62,13 +62,13 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "Apply configuration changes to disk device IDs?"
 msgstr "Použít změny v nastavení ID diskových zařízení?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
+#: ../templates:3001
 msgid "These devices will be assigned UUIDs or labels:"
 msgstr "Těmto zařízením bude přiřazeno UUID či popisek:"
 
@@ -76,7 +76,7 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "These configuration files will be updated:"
 msgstr "Tyto konfigurační soubory budou aktualizovány:"
 
@@ -84,19 +84,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "The device IDs will be changed as follows:"
 msgstr "ID diskových zařízení se změní následovně:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid "Configuration files still contain deprecated device names"
 msgstr "Konfigurační soubory stále obsahují zastaralé názvy zařízení"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid ""
 "The following configuration files still use some device names that may "
 "change when using the new kernel:"
@@ -106,13 +106,13 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid "Boot loader configuration check needed"
 msgstr "Je vyžadováno ověření nastavení zavaděče"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "The boot loader configuration for this system was not recognized. These "
 "settings in the configuration may need to be updated:"
@@ -122,7 +122,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 " * The root device ID passed as a kernel parameter;\n"
 " * The boot device ID used to install and update the boot loader."
@@ -132,7 +132,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "You should generally identify these devices by UUID or label. However, on "
 "MIPS systems the root device must be identified by name."
@@ -142,19 +142,39 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:8001
 msgid "Boot loader may need to be upgraded"
 msgstr "Zavaděč může být nutné aktualizovat"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:8001
 msgid "Kernel packages no longer update a default boot loader."
 msgstr "Jaderný balíček již neaktualizuje výchozí zavaděč."
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
+#: ../templates:8001
 msgid ""
 "If the boot loader needs to be updated whenever a new kernel is installed, "
 "the boot loader package should install a script in /etc/kernel/postinst.d.  "
@@ -162,6 +182,6 @@
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
 msgstr ""
 "Pokud je nutné aktualizovat zavaděč kdykoli je nainstalováno nové jádro, "
-"balíček zavaděče nainstalovuje skript v /etc/kernel/postinst.d. "
-"Můžete také zadat příkaz k aktualizaci zavaděče nastavením proměnné "
-"'postinst_hook' v /etc/kernel-img.conf."
+"balíček zavaděče nainstalovuje skript v /etc/kernel/postinst.d. Můžete také "
+"zadat příkaz k aktualizaci zavaděče nastavením proměnné 'postinst_hook' v /"
+"etc/kernel-img.conf."

Modified: dists/trunk/linux-base/debian/po/da.po
==============================================================================
--- dists/trunk/linux-base/debian/po/da.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/da.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-10-01 10:30+0200\n"
+"Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2010-10-07 05:26+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org> \n"
@@ -18,13 +18,13 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid "Update disk device IDs in system configuration?"
 msgstr "Opdater diskenheds-id'er i systemkonfigurationen?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "The new Linux kernel version provides different drivers for some PATA (IDE) "
 "controllers. The names of some hard disk, CD-ROM, and tape devices may "
@@ -36,7 +36,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "It is now recommended to identify disk devices in configuration files by "
 "label or UUID (unique identifier) rather than by device name, which will "
@@ -48,7 +48,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "If you choose to not update the system configuration automatically, you must "
 "update device IDs yourself before the next system reboot or the system may "
@@ -62,13 +62,13 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "Apply configuration changes to disk device IDs?"
 msgstr "Anvend disse konfigurationsændringer til diskenheds-id'er?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
+#: ../templates:3001
 msgid "These devices will be assigned UUIDs or labels:"
 msgstr "Disse enheder vil få tildelt UUID'er eller etiketter:"
 
@@ -76,7 +76,7 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "These configuration files will be updated:"
 msgstr "Disse konfigurationsfiler vil blive opdateret:"
 
@@ -84,19 +84,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "The device IDs will be changed as follows:"
 msgstr "Enheds-id'erne vil blive ændret som vist i det følgende:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid "Configuration files still contain deprecated device names"
 msgstr "Konfigurationsfiler inderholder stadig forældede enhedsnavne"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid ""
 "The following configuration files still use some device names that may "
 "change when using the new kernel:"
@@ -106,13 +106,13 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid "Boot loader configuration check needed"
 msgstr "Behov for tjek af opstartsindlæseren (boot loader)"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "The boot loader configuration for this system was not recognized. These "
 "settings in the configuration may need to be updated:"
@@ -122,7 +122,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 " * The root device ID passed as a kernel parameter;\n"
 " * The boot device ID used to install and update the boot loader."
@@ -133,7 +133,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "You should generally identify these devices by UUID or label. However, on "
 "MIPS systems the root device must be identified by name."
@@ -143,19 +143,39 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:8001
 msgid "Boot loader may need to be upgraded"
 msgstr "Opstartsindlæseren (boot loader) skal måske opgraderes"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:8001
 msgid "Kernel packages no longer update a default boot loader."
 msgstr "Kernepakker opdaterer ikke længere en opstartsindlæser som standard."
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
+#: ../templates:8001
 msgid ""
 "If the boot loader needs to be updated whenever a new kernel is installed, "
 "the boot loader package should install a script in /etc/kernel/postinst.d.  "
@@ -163,7 +183,7 @@
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
 msgstr ""
 "Hvis opstartsindlæseren (boot loader) skal opdateres, når en ny kerne er "
-"installeret, bør opstartsindlæserens pakke installere et skript i "
-"/etc/kernel/postinst.d. Alternativt kan du angive kommandoen til opdatering "
-"af opstartsindlæseren ved at angive variablen 'postinst_hook' i "
-"/etc/kernel-img.conf."
+"installeret, bør opstartsindlæserens pakke installere et skript i /etc/"
+"kernel/postinst.d. Alternativt kan du angive kommandoen til opdatering af "
+"opstartsindlæseren ved at angive variablen 'postinst_hook' i /etc/kernel-img."
+"conf."

Modified: dists/trunk/linux-base/debian/po/de.po
==============================================================================
--- dists/trunk/linux-base/debian/po/de.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/de.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-11\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-08-07 10:32+0200\n"
+"Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2010-08-08 14:22+0200\n"
 "Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german at lists.debian.org>\n"
@@ -18,13 +18,13 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid "Update disk device IDs in system configuration?"
 msgstr "Laufwerk-Geräte-IDs in der Systemkonfiguration aktualisieren?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "The new Linux kernel version provides different drivers for some PATA (IDE) "
 "controllers. The names of some hard disk, CD-ROM, and tape devices may "
@@ -36,7 +36,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "It is now recommended to identify disk devices in configuration files by "
 "label or UUID (unique identifier) rather than by device name, which will "
@@ -49,7 +49,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "If you choose to not update the system configuration automatically, you must "
 "update device IDs yourself before the next system reboot or the system may "
@@ -64,13 +64,13 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "Apply configuration changes to disk device IDs?"
 msgstr "Konfigurationsänderungen für Laufwerk-Geräte-IDs anwenden?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
+#: ../templates:3001
 msgid "These devices will be assigned UUIDs or labels:"
 msgstr "Diese Geräte werden über UUIDs oder Kennungen identifiziert:"
 
@@ -78,7 +78,7 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "These configuration files will be updated:"
 msgstr "Diese Konfigurationsdateien werden aktualisiert:"
 
@@ -86,19 +86,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "The device IDs will be changed as follows:"
 msgstr "Die Geräte-IDs werden wie folgt geändert:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid "Configuration files still contain deprecated device names"
 msgstr "Konfigurationsdateien enthalten noch veraltete Gerätenamen"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid ""
 "The following configuration files still use some device names that may "
 "change when using the new kernel:"
@@ -108,13 +108,13 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid "Boot loader configuration check needed"
 msgstr "Überprüfung der Bootloader-Konfiguration erforderlich"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "The boot loader configuration for this system was not recognized. These "
 "settings in the configuration may need to be updated:"
@@ -124,7 +124,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 " * The root device ID passed as a kernel parameter;\n"
 " * The boot device ID used to install and update the boot loader."
@@ -136,7 +136,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "You should generally identify these devices by UUID or label. However, on "
 "MIPS systems the root device must be identified by name."
@@ -147,20 +147,40 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:8001
 msgid "Boot loader may need to be upgraded"
 msgstr "Bootloader muss unter Umständen aktualisiert werden"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:8001
 msgid "Kernel packages no longer update a default boot loader."
-msgstr "Kernel-Pakete werden nicht mehr länger den Standard-Bootloader "
-"aktualisieren."
+msgstr ""
+"Kernel-Pakete werden nicht mehr länger den Standard-Bootloader aktualisieren."
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
+#: ../templates:8001
 msgid ""
 "If the boot loader needs to be updated whenever a new kernel is installed, "
 "the boot loader package should install a script in /etc/kernel/postinst.d.  "
@@ -168,7 +188,7 @@
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
 msgstr ""
 "Falls der Bootloader aktualisiert werden muss, wenn ein neuer Kernel "
-"installiert wird, sollte das Bootloader-Paket ein Skript in "
-"/etc/kernel/postinst.d installieren. Alternativ können Sie den Befehl für "
-"die Aktualisierung des Bootloaders über das Setzen der Variable "
-"»postinst_hook« in /etc/kernel-img.conf festlegen."
+"installiert wird, sollte das Bootloader-Paket ein Skript in /etc/kernel/"
+"postinst.d installieren. Alternativ können Sie den Befehl für die "
+"Aktualisierung des Bootloaders über das Setzen der Variable »postinst_hook« "
+"in /etc/kernel-img.conf festlegen."

Modified: dists/trunk/linux-base/debian/po/es.po
==============================================================================
--- dists/trunk/linux-base/debian/po/es.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/es.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -29,15 +29,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32+5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-11 10:35+0100\n"
+"Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2011-03-12 08:16+0000\n"
 "Last-Translator: Omar Campagne <ocampagne at gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.6.1\n"
 "X-POFile-SpellExtra: initrd postinsthook conf lib contrib yes IDE depmod\n"
@@ -47,7 +47,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid "Update disk device IDs in system configuration?"
 msgstr ""
 "¿Desea actualizar los identificadores de los dispositivos de disco en la "
@@ -55,7 +55,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "The new Linux kernel version provides different drivers for some PATA (IDE) "
 "controllers. The names of some hard disk, CD-ROM, and tape devices may "
@@ -67,7 +67,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "It is now recommended to identify disk devices in configuration files by "
 "label or UUID (unique identifier) rather than by device name, which will "
@@ -80,7 +80,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "If you choose to not update the system configuration automatically, you must "
 "update device IDs yourself before the next system reboot or the system may "
@@ -94,7 +94,7 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "Apply configuration changes to disk device IDs?"
 msgstr ""
 "¿Desea realizar estos cambios en la configuración de los identificadores de "
@@ -102,7 +102,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
+#: ../templates:3001
 msgid "These devices will be assigned UUIDs or labels:"
 msgstr "Se van a asignar etiquetas o UUID a los siguientes dispositivos:"
 
@@ -110,7 +110,7 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "These configuration files will be updated:"
 msgstr "Se van a actualizar los siguientes ficheros de configuración:"
 
@@ -118,21 +118,21 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "The device IDs will be changed as follows:"
 msgstr ""
 "Se van a modificar los identificadores de dispositivo de la siguiente forma:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid "Configuration files still contain deprecated device names"
 msgstr ""
 "Los ficheros de configuración aún contienen nombres obsoletos de dispositivo"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid ""
 "The following configuration files still use some device names that may "
 "change when using the new kernel:"
@@ -142,13 +142,13 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid "Boot loader configuration check needed"
 msgstr "Se necesita comprobar la configuración del gestor de arranque"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "The boot loader configuration for this system was not recognized. These "
 "settings in the configuration may need to be updated:"
@@ -158,7 +158,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 " * The root device ID passed as a kernel parameter;\n"
 " * The boot device ID used to install and update the boot loader."
@@ -170,7 +170,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "You should generally identify these devices by UUID or label. However, on "
 "MIPS systems the root device must be identified by name."
@@ -181,27 +181,48 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:8001
 msgid "Boot loader may need to be upgraded"
 msgstr "Puede ser necesario actualizar el gestor de arranque"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:8001
 msgid "Kernel packages no longer update a default boot loader."
-msgstr "Los paquetes del núcleo ya no actualizan el gestor de arranque por omisión."
+msgstr ""
+"Los paquetes del núcleo ya no actualizan el gestor de arranque por omisión."
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
+#: ../templates:8001
 msgid ""
 "If the boot loader needs to be updated whenever a new kernel is installed, "
 "the boot loader package should install a script in /etc/kernel/postinst.d.  "
 "Alternately, you can specify the command to update the boot loader by "
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
 msgstr ""
-"El paquete del gestor de arranque debería instalar un script en "
-"«/etc/kernel/postinst.d» si tiene que actualizarse cada vez que se instala "
-"un nuevo núcleo. También puede especificar la orden a ejecutar para "
-"actualizar el gestor de arranque configurando la variable «postinst_hook» "
-"en el fichero de configuración «/etc/kernel-img.conf»."
+"El paquete del gestor de arranque debería instalar un script en «/etc/kernel/"
+"postinst.d» si tiene que actualizarse cada vez que se instala un nuevo "
+"núcleo. También puede especificar la orden a ejecutar para actualizar el "
+"gestor de arranque configurando la variable «postinst_hook» en el fichero de "
+"configuración «/etc/kernel-img.conf»."

Modified: dists/trunk/linux-base/debian/po/et.po
==============================================================================
--- dists/trunk/linux-base/debian/po/et.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/et.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-11\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-07-16 15:55+0100\n"
+"Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2010-04-24 14:20+0300\n"
 "Last-Translator: mihkel <turakas gmail com>\n"
 "Language-Team: Estonian <et at li.org>\n"
@@ -22,13 +22,13 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid "Update disk device IDs in system configuration?"
 msgstr "Värskenda süsteemi seadetes ketta seadmete ID-d?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "The new Linux kernel version provides different drivers for some PATA (IDE) "
 "controllers. The names of some hard disk, CD-ROM, and tape devices may "
@@ -40,7 +40,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "It is now recommended to identify disk devices in configuration files by "
 "label or UUID (unique identifier) rather than by device name, which will "
@@ -52,7 +52,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "If you choose to not update the system configuration automatically, you must "
 "update device IDs yourself before the next system reboot or the system may "
@@ -66,13 +66,13 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "Apply configuration changes to disk device IDs?"
 msgstr "Rakenda ketta seadmete ID-de konfiratsiooni muudatused?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
+#: ../templates:3001
 msgid "These devices will be assigned UUIDs or labels:"
 msgstr "Nendele seadmetele määratakse UUID-d või sildid:"
 
@@ -80,7 +80,7 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "These configuration files will be updated:"
 msgstr "Need konfiguratsioonifailid uuendatakse:"
 
@@ -88,19 +88,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "The device IDs will be changed as follows:"
 msgstr "Seadme ID-d muudetakse järgnevalt:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid "Configuration files still contain deprecated device names"
 msgstr "Konfiguratsioonifailid sisaldavad ikka iganenud seadmete nimesid"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid ""
 "The following configuration files still use some device names that may "
 "change when using the new kernel:"
@@ -110,13 +110,13 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid "Boot loader configuration check needed"
 msgstr "Vajalik alglaaduri konfiguratsiooni kontroll"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "The boot loader configuration for this system was not recognized. These "
 "settings in the configuration may need to be updated:"
@@ -126,7 +126,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 " * The root device ID passed as a kernel parameter;\n"
 " * The boot device ID used to install and update the boot loader."
@@ -136,7 +136,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "You should generally identify these devices by UUID or label. However, on "
 "MIPS systems the root device must be identified by name."
@@ -146,19 +146,39 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:8001
 msgid "Boot loader may need to be upgraded"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:8001
 msgid "Kernel packages no longer update a default boot loader."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
+#: ../templates:8001
 msgid ""
 "If the boot loader needs to be updated whenever a new kernel is installed, "
 "the boot loader package should install a script in /etc/kernel/postinst.d.  "

Modified: dists/trunk/linux-base/debian/po/fr.po
==============================================================================
--- dists/trunk/linux-base/debian/po/fr.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/fr.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-11\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-07-25 10:32+0200\n"
+"Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2010-07-26 12:24-0400\n"
 "Last-Translator: David Prévot <david at tilapin.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -20,7 +20,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid "Update disk device IDs in system configuration?"
 msgstr ""
 "Faut-il mettre à jour les identifiants des partitions dans la configuration "
@@ -28,7 +28,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "The new Linux kernel version provides different drivers for some PATA (IDE) "
 "controllers. The names of some hard disk, CD-ROM, and tape devices may "
@@ -40,7 +40,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "It is now recommended to identify disk devices in configuration files by "
 "label or UUID (unique identifier) rather than by device name, which will "
@@ -53,7 +53,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "If you choose to not update the system configuration automatically, you must "
 "update device IDs yourself before the next system reboot or the system may "
@@ -68,14 +68,14 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "Apply configuration changes to disk device IDs?"
 msgstr ""
 "Appliquer les changements de configuration aux identifiants des partitions ?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
+#: ../templates:3001
 msgid "These devices will be assigned UUIDs or labels:"
 msgstr ""
 "Les périphériques suivants seront identifiés par une étiquette (« label ») "
@@ -85,7 +85,7 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "These configuration files will be updated:"
 msgstr "Les fichiers de configuration suivants seront mis à jour :"
 
@@ -93,13 +93,13 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "The device IDs will be changed as follows:"
 msgstr "Les identifiants des périphériques seront modifiés comme suit :"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid "Configuration files still contain deprecated device names"
 msgstr ""
 "Les noms des périphériques utilisés dans certains fichiers de configuration "
@@ -107,7 +107,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid ""
 "The following configuration files still use some device names that may "
 "change when using the new kernel:"
@@ -117,13 +117,13 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid "Boot loader configuration check needed"
 msgstr "Vérification indispensable de la configuration du programme d'amorçage"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "The boot loader configuration for this system was not recognized. These "
 "settings in the configuration may need to be updated:"
@@ -133,7 +133,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 " * The root device ID passed as a kernel parameter;\n"
 " * The boot device ID used to install and update the boot loader."
@@ -145,7 +145,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "You should generally identify these devices by UUID or label. However, on "
 "MIPS systems the root device must be identified by name."
@@ -156,13 +156,33 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:8001
 msgid "Boot loader may need to be upgraded"
 msgstr "Le programme d'amorçage peut nécessiter une mise à niveau"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:8001
 msgid "Kernel packages no longer update a default boot loader."
 msgstr ""
 "Les paquets du noyau ne s'occupent plus de la mise à jour d'un programme "
@@ -170,7 +190,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
+#: ../templates:8001
 msgid ""
 "If the boot loader needs to be updated whenever a new kernel is installed, "
 "the boot loader package should install a script in /etc/kernel/postinst.d.  "
@@ -178,7 +198,7 @@
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
 msgstr ""
 "Si le programme d'amorçage doit être mis à jour à chaque fois qu'un nouveau "
-"noyau est installé, le paquet du programme d'amorçage doit installer un script "
-"dans /etc/kernel/postinst.d. Sinon, vous pouvez indiquer la commande de mise à "
-"jour du programme d'amorçage en configurant la variable « postinst_hook » dans "
-"/etc/kernel-img.conf."
+"noyau est installé, le paquet du programme d'amorçage doit installer un "
+"script dans /etc/kernel/postinst.d. Sinon, vous pouvez indiquer la commande "
+"de mise à jour du programme d'amorçage en configurant la variable "
+"« postinst_hook » dans /etc/kernel-img.conf."

Modified: dists/trunk/linux-base/debian/po/it.po
==============================================================================
--- dists/trunk/linux-base/debian/po/it.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/it.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -5,11 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-27\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-01 10:31+0100\n"
+"Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2010-11-09 18:24+0100\n"
 "Last-Translator: Luca Bruno <lucab at debian.org>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,13 +18,13 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid "Update disk device IDs in system configuration?"
 msgstr "Aggiornare gli ID dei dischi nella configurazione di sistema?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "The new Linux kernel version provides different drivers for some PATA (IDE) "
 "controllers. The names of some hard disk, CD-ROM, and tape devices may "
@@ -35,7 +36,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "It is now recommended to identify disk devices in configuration files by "
 "label or UUID (unique identifier) rather than by device name, which will "
@@ -48,7 +49,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "If you choose to not update the system configuration automatically, you must "
 "update device IDs yourself before the next system reboot or the system may "
@@ -62,13 +63,13 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "Apply configuration changes to disk device IDs?"
 msgstr "Applicare le modifiche alla configurazione degli ID dei dischi?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
+#: ../templates:3001
 msgid "These devices will be assigned UUIDs or labels:"
 msgstr "I seguenti dispositivi verranno identificati tramite UUID o etichette:"
 
@@ -76,7 +77,7 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "These configuration files will be updated:"
 msgstr "I seguenti file di configurazione verranno aggiornati:"
 
@@ -84,20 +85,20 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "The device IDs will be changed as follows:"
 msgstr "Gli ID dei dispositivi verranno cambiati come segue:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid "Configuration files still contain deprecated device names"
 msgstr ""
 "I file di configurazione contengono ancora i nomi obsoleti dei dispositivi"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid ""
 "The following configuration files still use some device names that may "
 "change when using the new kernel:"
@@ -107,13 +108,13 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid "Boot loader configuration check needed"
 msgstr "È necessario controllare la configurazione del boot loader"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "The boot loader configuration for this system was not recognized. These "
 "settings in the configuration may need to be updated:"
@@ -124,7 +125,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 " * The root device ID passed as a kernel parameter;\n"
 " * The boot device ID used to install and update the boot loader."
@@ -135,7 +136,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "You should generally identify these devices by UUID or label. However, on "
 "MIPS systems the root device must be identified by name."
@@ -146,13 +147,33 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:8001
 msgid "Boot loader may need to be upgraded"
 msgstr "Potrebbe essere necessario aggiornare il boot loader"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:8001
 msgid "Kernel packages no longer update a default boot loader."
 msgstr ""
 "I pacchetti del kernel non provvedono più all'aggiornamento del boot loader "
@@ -160,7 +181,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
+#: ../templates:8001
 msgid ""
 "If the boot loader needs to be updated whenever a new kernel is installed, "
 "the boot loader package should install a script in /etc/kernel/postinst.d.  "

Modified: dists/trunk/linux-base/debian/po/ja.po
==============================================================================
--- dists/trunk/linux-base/debian/po/ja.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/ja.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -3,58 +3,74 @@
 # This file is distributed under the same license as the linux-2.6 package.
 # Kenshi Muto <kmuto at debian.org>, 2010.
 # Nobuhiro Iwamatsu <iwamatsu at debian.org>, 2010.
-
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-21 10:37+0200\n"
+"Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2010-10-31 06:32+0900\n"
 "Last-Translator: Nobuhiro Iwamatsu <iwamatsu at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "X-Poedit-Language: Japanese\n"
 "X-Poedit-Country: JAPAN\n"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid "Update disk device IDs in system configuration?"
 msgstr "システム設定のディスクデバイス ID を更新しますか?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
-msgid "The new Linux kernel version provides different drivers for some PATA (IDE) controllers. The names of some hard disk, CD-ROM, and tape devices may change."
-msgstr "新しい Linux カーネルバージョンでは、いくつかの PATA (IDE) コントローラについて別のドライバを提供します。ハードディスク、CD-ROM、テープデバイスの名前のいくつかは変更される可能性があります。"
+#: ../templates:2001
+msgid ""
+"The new Linux kernel version provides different drivers for some PATA (IDE) "
+"controllers. The names of some hard disk, CD-ROM, and tape devices may "
+"change."
+msgstr ""
+"新しい Linux カーネルバージョンでは、いくつかの PATA (IDE) コントローラについ"
+"て別のドライバを提供します。ハードディスク、CD-ROM、テープデバイスの名前のい"
+"くつかは変更される可能性があります。"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
-msgid "It is now recommended to identify disk devices in configuration files by label or UUID (unique identifier) rather than by device name, which will work with both old and new kernel versions."
-msgstr "新旧両方のカーネルバージョンで動作させつつ、設定ファイル中でディスクデバイスを識別するために、デバイス名よりもラベルまたは UUID (固有識別子) を使うことが、現在推奨されます。"
+#: ../templates:2001
+msgid ""
+"It is now recommended to identify disk devices in configuration files by "
+"label or UUID (unique identifier) rather than by device name, which will "
+"work with both old and new kernel versions."
+msgstr ""
+"新旧両方のカーネルバージョンで動作させつつ、設定ファイル中でディスクデバイス"
+"を識別するために、デバイス名よりもラベルまたは UUID (固有識別子) を使うこと"
+"が、現在推奨されます。"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
-msgid "If you choose to not update the system configuration automatically, you must update device IDs yourself before the next system reboot or the system may become unbootable."
-msgstr "システムの設定を自動更新することを選ばない場合は、次のシステム再起動の前にあなた自身でデバイス ID を更新する必要があります。さもないと、システムは起動不能になってしまうかもしれません。"
+#: ../templates:2001
+msgid ""
+"If you choose to not update the system configuration automatically, you must "
+"update device IDs yourself before the next system reboot or the system may "
+"become unbootable."
+msgstr ""
+"システムの設定を自動更新することを選ばない場合は、次のシステム再起動の前にあ"
+"なた自身でデバイス ID を更新する必要があります。さもないと、システムは起動不"
+"能になってしまうかもしれません。"
 
 #. Type: boolean
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
-#: ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "Apply configuration changes to disk device IDs?"
 msgstr "ディスクデバイス ID の設定変更を適用しますか?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
+#: ../templates:3001
 msgid "These devices will be assigned UUIDs or labels:"
 msgstr "次のデバイスは UUID またはラベルに割り当てられます:"
 
@@ -62,8 +78,7 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
-#: ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "These configuration files will be updated:"
 msgstr "次の設定ファイルは更新されます:"
 
@@ -71,38 +86,45 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
-#: ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "The device IDs will be changed as follows:"
 msgstr "デバイス ID は次のように変更されます:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid "Configuration files still contain deprecated device names"
 msgstr "設定ファイルはまだ問題のあるデバイス名を含んでいます"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
-msgid "The following configuration files still use some device names that may change when using the new kernel:"
-msgstr "次の設定ファイルは依然として、新しいカーネルの使用時に変更され得るいくつかのデバイス名を使っています:"
+#: ../templates:5001
+msgid ""
+"The following configuration files still use some device names that may "
+"change when using the new kernel:"
+msgstr ""
+"次の設定ファイルは依然として、新しいカーネルの使用時に変更され得るいくつかの"
+"デバイス名を使っています:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid "Boot loader configuration check needed"
 msgstr "ブートローダ設定の確認が必要です"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
-msgid "The boot loader configuration for this system was not recognized. These settings in the configuration may need to be updated:"
-msgstr "このシステムのブートローダ設定を認識できませんでした。設定中の次の定義は、更新する必要があるかもしれません:"
+#: ../templates:6001
+msgid ""
+"The boot loader configuration for this system was not recognized. These "
+"settings in the configuration may need to be updated:"
+msgstr ""
+"このシステムのブートローダ設定を認識できませんでした。設定中の次の定義は、更"
+"新する必要があるかもしれません:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 " * The root device ID passed as a kernel parameter;\n"
 " * The boot device ID used to install and update the boot loader."
@@ -112,25 +134,58 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
-msgid "You should generally identify these devices by UUID or label. However, on MIPS systems the root device must be identified by name."
-msgstr "一般にこれらのデバイスは、UUID またはラベルで識別すべきです。ただし、MIPS システムではルートデバイスは名前で識別しなければなりません。"
+#: ../templates:6001
+msgid ""
+"You should generally identify these devices by UUID or label. However, on "
+"MIPS systems the root device must be identified by name."
+msgstr ""
+"一般にこれらのデバイスは、UUID またはラベルで識別すべきです。ただし、MIPS シ"
+"ステムではルートデバイスは名前で識別しなければなりません。"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:8001
 msgid "Boot loader may need to be upgraded"
 msgstr "ブートローダは、アップグレードする必要があるかもしれません"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:8001
 msgid "Kernel packages no longer update a default boot loader."
-msgstr "カーネルパッケージは、デフォルトブートローダをもはやアップデートしません。"
+msgstr ""
+"カーネルパッケージは、デフォルトブートローダをもはやアップデートしません。"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
-#: ../templates/temp.image.plain/templates:5001
-msgid "If the boot loader needs to be updated whenever a new kernel is installed, the boot loader package should install a script in /etc/kernel/postinst.d.  Alternately, you can specify the command to update the boot loader by setting the 'postinst_hook' variable in /etc/kernel-img.conf."
-msgstr "新しいカーネルがインストールされるときに、いつでもブートローダがアップデートされる必要があるなら、ブートローダパッケージは /etc/kernel/postinst.d にスクリプトをインストールしなければなりません。あるいは、/etc/kernel-img.conf にある 'postinst_hook'  変数を設定することによって、ブートローダをアップデートするコマンドを指定できます。"
+#: ../templates:8001
+msgid ""
+"If the boot loader needs to be updated whenever a new kernel is installed, "
+"the boot loader package should install a script in /etc/kernel/postinst.d.  "
+"Alternately, you can specify the command to update the boot loader by "
+"setting the 'postinst_hook' variable in /etc/kernel-img.conf."
+msgstr ""
+"新しいカーネルがインストールされるときに、いつでもブートローダがアップデート"
+"される必要があるなら、ブートローダパッケージは /etc/kernel/postinst.d にスク"
+"リプトをインストールしなければなりません。あるいは、/etc/kernel-img.conf にあ"
+"る 'postinst_hook'  変数を設定することによって、ブートローダをアップデートす"
+"るコマンドを指定できます。"

Modified: dists/trunk/linux-base/debian/po/nl.po
==============================================================================
--- dists/trunk/linux-base/debian/po/nl.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/nl.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: linux-base 3.2\n"
 "Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
-"POT-Creation-Date: 2011-03-12 08:45+0000\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2011-06-06 11:35+0200\n"
 "Last-Translator: Jeroen Schot <schot at a-eskwadraat.nl>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -145,6 +145,26 @@
 
 #. Type: error
 #. Description
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
+#. Description
 #: ../templates:8001
 msgid "Boot loader may need to be upgraded"
 msgstr "Het opstartprogramma moet mogelijk worden opgewaardeerd"

Modified: dists/trunk/linux-base/debian/po/pl.po
==============================================================================
--- dists/trunk/linux-base/debian/po/pl.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/pl.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
-"POT-Creation-Date: 2011-03-12 08:45+0000\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2012-04-28 22:43+0200\n"
 "Last-Translator: Michał Kułach <michal.kulach at gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish at lists.debian.org>\n"
@@ -60,8 +60,8 @@
 "become unbootable."
 msgstr ""
 "Jeśli opcja automatycznej aktualizacji konfiguracji systemu nie zostanie "
-"wybrana, konieczne będzie ręczne zaktualizowanie identyfikatorów dysków przed "
-"ponownym uruchomieniem systemu, w przeciwnym wypadku, system może nie "
+"wybrana, konieczne będzie ręczne zaktualizowanie identyfikatorów dysków "
+"przed ponownym uruchomieniem systemu, w przeciwnym wypadku, system może nie "
 "uruchomić się ponownie."
 
 #. Type: boolean
@@ -107,8 +107,8 @@
 "The following configuration files still use some device names that may "
 "change when using the new kernel:"
 msgstr ""
-"Następujące pliki konfiguracyjne mogą wciąż używać nazwy urządzeń, które mogą "
-"ulec zmianie po użyciu nowego jądra:"
+"Następujące pliki konfiguracyjne mogą wciąż używać nazwy urządzeń, które "
+"mogą ulec zmianie po użyciu nowego jądra:"
 
 #. Type: error
 #. Description
@@ -151,6 +151,26 @@
 
 #. Type: error
 #. Description
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
+#. Description
 #: ../templates:8001
 msgid "Boot loader may need to be upgraded"
 msgstr "Program rozruchowy może wymagać zaktualizowania"
@@ -170,10 +190,8 @@
 "Alternately, you can specify the command to update the boot loader by "
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
 msgstr ""
-"Jeśli program rozruchowy musi zostać zaktualizowany podczas każdej instalacji "
-"nowego jądra, pakiet programu rozruchowego powinien zawierać skrypt w "
-"/etc/kernel/postinst.d. Innym rozwiązaniem jest podanie polecenia do "
-"aktualizacji programu rozruchowego, przez ustawienie zmiennej "
+"Jeśli program rozruchowy musi zostać zaktualizowany podczas każdej "
+"instalacji nowego jądra, pakiet programu rozruchowego powinien zawierać "
+"skrypt w /etc/kernel/postinst.d. Innym rozwiązaniem jest podanie polecenia "
+"do aktualizacji programu rozruchowego, przez ustawienie zmiennej "
 "\"postinst_hook\" w /etc/kernel-img.conf."
-
-

Modified: dists/trunk/linux-base/debian/po/pt.po
==============================================================================
--- dists/trunk/linux-base/debian/po/pt.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/pt.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: linux-base 3.6\n"
 "Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
-"POT-Creation-Date: 2012-08-31 13:51-0400\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2012-09-01 14:36+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro at netcabo.pt>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -127,7 +127,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 " * The root device ID passed as a kernel parameter;\n"
 " * The boot device ID used to install and update the boot loader."
@@ -192,8 +192,7 @@
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
 msgstr ""
 "Se o gestor de arranque necessitar ser actualizado sempre que um novo kernel "
-"for instalado, o pacote do gestor de arranque deve instalar um script em /etc/"
-"kernel/postinst.d. Em alternativa, você pode especificar o comando para "
+"for instalado, o pacote do gestor de arranque deve instalar um script em /"
+"etc/kernel/postinst.d. Em alternativa, você pode especificar o comando para "
 "actualizar o gestor de arranque ao definir a variável 'postinst_hook' em /"
 "etc/kernel-img.conf."
-

Modified: dists/trunk/linux-base/debian/po/pt_BR.po
==============================================================================
--- dists/trunk/linux-base/debian/po/pt_BR.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/pt_BR.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -6,12 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-09-19 10:42+0200\n"
+"Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2010-10-02 12:29-0300\n"
 "Last-Translator: Flamarion Jorge <jorge.flamarion at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese at lists.debian."
 "org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,13 +21,13 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid "Update disk device IDs in system configuration?"
 msgstr "Atualizar os IDs de dispositivos de disco na configuração do sistema?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "The new Linux kernel version provides different drivers for some PATA (IDE) "
 "controllers. The names of some hard disk, CD-ROM, and tape devices may "
@@ -38,7 +39,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "It is now recommended to identify disk devices in configuration files by "
 "label or UUID (unique identifier) rather than by device name, which will "
@@ -51,7 +52,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "If you choose to not update the system configuration automatically, you must "
 "update device IDs yourself before the next system reboot or the system may "
@@ -66,14 +67,14 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "Apply configuration changes to disk device IDs?"
 msgstr ""
 "Aplicar mudanças nas configurações para identificadores de discos (\"IDs\")?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
+#: ../templates:3001
 msgid "These devices will be assigned UUIDs or labels:"
 msgstr "Estes dispositivos serão associados a UUIDs ou rótulos (\"labels\"):"
 
@@ -81,7 +82,7 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "These configuration files will be updated:"
 msgstr "Estes arquivos de configuração serão atualizados:"
 
@@ -89,20 +90,20 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "The device IDs will be changed as follows:"
 msgstr ""
 "Os identificadores de dispositivo (\"IDs\") serão modificados como segue:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid "Configuration files still contain deprecated device names"
 msgstr "Arquivos de configuração ainda contêm nomes de dispositivos obsoletos"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid ""
 "The following configuration files still use some device names that may "
 "change when using the new kernel:"
@@ -112,7 +113,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid "Boot loader configuration check needed"
 msgstr ""
 "É necessário verificar a configuração do carregador de inicialização (\"boot "
@@ -120,7 +121,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "The boot loader configuration for this system was not recognized. These "
 "settings in the configuration may need to be updated:"
@@ -130,7 +131,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 " * The root device ID passed as a kernel parameter;\n"
 " * The boot device ID used to install and update the boot loader."
@@ -141,7 +142,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "You should generally identify these devices by UUID or label. However, on "
 "MIPS systems the root device must be identified by name."
@@ -152,21 +153,41 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:8001
 msgid "Boot loader may need to be upgraded"
 msgstr ""
 "O carregador de inicialização (\"boot loader\") pode precisar ser atualizado"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:8001
 msgid "Kernel packages no longer update a default boot loader."
 msgstr ""
 "Pacotes do kernel já não atualizam o carregador de inicialização padrão."
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
+#: ../templates:8001
 msgid ""
 "If the boot loader needs to be updated whenever a new kernel is installed, "
 "the boot loader package should install a script in /etc/kernel/postinst.d.  "

Modified: dists/trunk/linux-base/debian/po/ru.po
==============================================================================
--- dists/trunk/linux-base/debian/po/ru.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/ru.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -6,28 +6,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-18\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-07-25 10:32+0200\n"
+"Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2010-08-01 17:11+0400\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
 "X-Generator: Lokalize 1.0\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: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid "Update disk device IDs in system configuration?"
 msgstr "Обновить идентификаторы дисковых устройств в настройках системы?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "The new Linux kernel version provides different drivers for some PATA (IDE) "
 "controllers. The names of some hard disk, CD-ROM, and tape devices may "
@@ -39,7 +39,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "It is now recommended to identify disk devices in configuration files by "
 "label or UUID (unique identifier) rather than by device name, which will "
@@ -51,7 +51,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "If you choose to not update the system configuration automatically, you must "
 "update device IDs yourself before the next system reboot or the system may "
@@ -59,20 +59,19 @@
 msgstr ""
 "Если вы не выберете автоматическое обновление системных настроек, то должны "
 "обновить идентификаторы устройств самостоятельно до следующей перезагрузки, "
-"иначе "
-"система не запустится."
+"иначе система не запустится."
 
 #. Type: boolean
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "Apply configuration changes to disk device IDs?"
 msgstr "Применить изменение настроек для идентификаторов дисковых устройств?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
+#: ../templates:3001
 msgid "These devices will be assigned UUIDs or labels:"
 msgstr "Следующим устройствам будут назначены UUID или метки:"
 
@@ -80,7 +79,7 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "These configuration files will be updated:"
 msgstr "Следующие файлы настройки будут обновлены:"
 
@@ -88,19 +87,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "The device IDs will be changed as follows:"
 msgstr "Идентификаторы устройств будут изменены следующим образом:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid "Configuration files still contain deprecated device names"
 msgstr "Файлы настройки всё ещё содержат устаревшие имена устройств"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid ""
 "The following configuration files still use some device names that may "
 "change when using the new kernel:"
@@ -110,13 +109,13 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid "Boot loader configuration check needed"
 msgstr "Требуется проверка настроек системного загрузчика"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "The boot loader configuration for this system was not recognized. These "
 "settings in the configuration may need to be updated:"
@@ -126,7 +125,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 " * The root device ID passed as a kernel parameter;\n"
 " * The boot device ID used to install and update the boot loader."
@@ -137,7 +136,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "You should generally identify these devices by UUID or label. However, on "
 "MIPS systems the root device must be identified by name."
@@ -147,27 +146,47 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:8001
 msgid "Boot loader may need to be upgraded"
 msgstr "Может потребоваться обновление системного загрузчика"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:8001
 msgid "Kernel packages no longer update a default boot loader."
 msgstr "Пакеты ядра больше не обновляют системный загрузчик по умолчанию"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
+#: ../templates:8001
 msgid ""
 "If the boot loader needs to be updated whenever a new kernel is installed, "
 "the boot loader package should install a script in /etc/kernel/postinst.d.  "
 "Alternately, you can specify the command to update the boot loader by "
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
 msgstr ""
-"Если системный загрузчик требует обновления после установки нового ядра, "
-"то пакет системного загрузчика должен устанавливать сценарий в каталог "
-"/etc/kernel/postinst.d. Или же вы можете задать команду обновления "
-"системного загрузчика, указав её в переменной postinst_hook в файле "
-"/etc/kernel-img.conf."
+"Если системный загрузчик требует обновления после установки нового ядра, то "
+"пакет системного загрузчика должен устанавливать сценарий в каталог /etc/"
+"kernel/postinst.d. Или же вы можете задать команду обновления системного "
+"загрузчика, указав её в переменной postinst_hook в файле /etc/kernel-img."
+"conf."

Modified: dists/trunk/linux-base/debian/po/sv.po
==============================================================================
--- dists/trunk/linux-base/debian/po/sv.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/sv.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -6,27 +6,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-07-25 10:32+0200\n"
+"Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2010-08-07 05:01+0100\n"
 "Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 "X-Poedit-Language: Swedish\n"
 "X-Poedit-Country: Sweden\n"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid "Update disk device IDs in system configuration?"
 msgstr "Uppdatera diskenheters ID i systeminställningar?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "The new Linux kernel version provides different drivers for some PATA (IDE) "
 "controllers. The names of some hard disk, CD-ROM, and tape devices may "
@@ -38,7 +38,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "It is now recommended to identify disk devices in configuration files by "
 "label or UUID (unique identifier) rather than by device name, which will "
@@ -50,7 +50,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "If you choose to not update the system configuration automatically, you must "
 "update device IDs yourself before the next system reboot or the system may "
@@ -64,13 +64,13 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "Apply configuration changes to disk device IDs?"
 msgstr "Genomför förändring av enheternas ID?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
+#: ../templates:3001
 msgid "These devices will be assigned UUIDs or labels:"
 msgstr "Dessa enheter kommer att få UUID eller ettiketter:"
 
@@ -78,7 +78,7 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "These configuration files will be updated:"
 msgstr "Dessa konfigurationsfiler kommer att uppdateras:"
 
@@ -86,19 +86,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "The device IDs will be changed as follows:"
 msgstr "Enhets-ID kommer att anges som följer:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid "Configuration files still contain deprecated device names"
 msgstr "Konfigurationsfiler innehåller fortfarande utfasade enhetsnamn"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid ""
 "The following configuration files still use some device names that may "
 "change when using the new kernel:"
@@ -108,13 +108,13 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid "Boot loader configuration check needed"
 msgstr "Kontroll av konfigurationen i uppstartshanteraren behövs"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "The boot loader configuration for this system was not recognized. These "
 "settings in the configuration may need to be updated:"
@@ -124,7 +124,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 " * The root device ID passed as a kernel parameter;\n"
 " * The boot device ID used to install and update the boot loader."
@@ -135,7 +135,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "You should generally identify these devices by UUID or label. However, on "
 "MIPS systems the root device must be identified by name."
@@ -145,19 +145,39 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:8001
 msgid "Boot loader may need to be upgraded"
 msgstr "Uppstartshanteraren kan behöva uppgraderas"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:8001
 msgid "Kernel packages no longer update a default boot loader."
 msgstr "Kärnpaket uppdaterar inte längre uppstartshanterare."
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
+#: ../templates:8001
 msgid ""
 "If the boot loader needs to be updated whenever a new kernel is installed, "
 "the boot loader package should install a script in /etc/kernel/postinst.d.  "

Modified: dists/trunk/linux-base/debian/po/templates.pot
==============================================================================
--- dists/trunk/linux-base/debian/po/templates.pot	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/templates.pot	Sat Sep  1 14:59:04 2012	(r19363)
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: linux-base\n"
 "Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
-"POT-Creation-Date: 2011-03-12 08:45+0000\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -125,6 +125,26 @@
 msgstr ""
 
 #. Type: error
+#. Description
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
 #. Description
 #: ../templates:8001
 msgid "Boot loader may need to be upgraded"

Modified: dists/trunk/linux-base/debian/po/vi.po
==============================================================================
--- dists/trunk/linux-base/debian/po/vi.po	Sat Sep  1 14:53:52 2012	(r19362)
+++ dists/trunk/linux-base/debian/po/vi.po	Sat Sep  1 14:59:04 2012	(r19363)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-26\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-10-21 10:37+0200\n"
+"Report-Msgid-Bugs-To: linux-base at packages.debian.org\n"
+"POT-Creation-Date: 2012-09-01 15:54+0100\n"
 "PO-Revision-Date: 2010-10-27 15:21+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -19,13 +19,13 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid "Update disk device IDs in system configuration?"
 msgstr "Cập nhật các mã số thiết bị đĩa trong cấu hình hệ thống ?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "The new Linux kernel version provides different drivers for some PATA (IDE) "
 "controllers. The names of some hard disk, CD-ROM, and tape devices may "
@@ -37,7 +37,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "It is now recommended to identify disk devices in configuration files by "
 "label or UUID (unique identifier) rather than by device name, which will "
@@ -49,7 +49,7 @@
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid ""
 "If you choose to not update the system configuration automatically, you must "
 "update device IDs yourself before the next system reboot or the system may "
@@ -63,13 +63,13 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "Apply configuration changes to disk device IDs?"
 msgstr "Áp dụng thay đổi cấu hình cho các mã số thiết bị đĩa ?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
+#: ../templates:3001
 msgid "These devices will be assigned UUIDs or labels:"
 msgstr "UUID hay nhãn sẽ được gán cho những thiết bị này:"
 
@@ -77,7 +77,7 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "These configuration files will be updated:"
 msgstr "Sắp cập nhật những tập tin cấu hình này:"
 
@@ -85,19 +85,19 @@
 #. Description
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../templates:3001 ../templates:4001
 msgid "The device IDs will be changed as follows:"
 msgstr "Các mã số thiết bị sẽ được thay đổi như theo sau :"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid "Configuration files still contain deprecated device names"
 msgstr "Tập tin cấu hình vẫn còn chứa tên thiết bị bị phản đối"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid ""
 "The following configuration files still use some device names that may "
 "change when using the new kernel:"
@@ -107,13 +107,13 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid "Boot loader configuration check needed"
 msgstr "Yêu cầu kiểm tra cấu hình bộ nạp khởi động"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "The boot loader configuration for this system was not recognized. These "
 "settings in the configuration may need to be updated:"
@@ -123,7 +123,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 " * The root device ID passed as a kernel parameter;\n"
 " * The boot device ID used to install and update the boot loader."
@@ -133,7 +133,7 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid ""
 "You should generally identify these devices by UUID or label. However, on "
 "MIPS systems the root device must be identified by name."
@@ -143,22 +143,47 @@
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:7001
+msgid "Failed to update disk device IDs"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid "An error occurred while attempting to update the system configuration:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:7001
+msgid ""
+"You can either correct this error and retry the automatic update, or choose "
+"to update the system configuration yourself."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:8001
 msgid "Boot loader may need to be upgraded"
 msgstr "Có thể là cần phải nâng cấp bộ nạp khởi động"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:8001
 msgid "Kernel packages no longer update a default boot loader."
 msgstr "Gói hạt nhân không còn nâng cấp lại bộ nạp khởi động mặc định."
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
+#: ../templates:8001
 msgid ""
 "If the boot loader needs to be updated whenever a new kernel is installed, "
 "the boot loader package should install a script in /etc/kernel/postinst.d.  "
 "Alternately, you can specify the command to update the boot loader by "
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
-msgstr "Nếu bộ nạp khởi động cần phải được cập nhật khi nào cài đặt một hạt nhân mới thì gói bộ nạp khởi động nên cài đặt một văn lệnh vào « /etc/kernel/postinst.d ». Hoặc bạn có thể ghi rõ câu lệnh cập nhật bộ nạp khởi động bằng cách lập biến « postinst_hook » (hàm móc hậu xử lý) trong tập tin cấu hình « /etc/kernel-img.conf »."
+msgstr ""
+"Nếu bộ nạp khởi động cần phải được cập nhật khi nào cài đặt một hạt nhân mới "
+"thì gói bộ nạp khởi động nên cài đặt một văn lệnh vào « /etc/kernel/postinst."
+"d ». Hoặc bạn có thể ghi rõ câu lệnh cập nhật bộ nạp khởi động bằng cách lập "
+"biến « postinst_hook » (hàm móc hậu xử lý) trong tập tin cấu hình « /etc/"
+"kernel-img.conf »."



More information about the Kernel-svn-changes mailing list