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

Bug#686211: Please allow translation of all debconf templates



Hi,

Le 30/08/2012 02:18, Ben Hutchings a écrit :
> On Wed, 2012-08-29 at 16:42 -0400, David Prévot wrote:
>> Package: linux-base
>> Version: 3.5

> I added this error message after that initial review (in linux-2.6
> version 2.6.32-16 vs 2.6.32-13).  I don't know why I didn't properly
> mark it as translatable.

I just sent a call for translation update, translation should be ready
within a week, I'll give you a notice then (we really don't want to
lower the status of the 8 language that should be 100% translated in
Wheezy for example), in order to upload a fixed package for Wheezy. I
prepared the commits (attached) and volunteer to update translations
directly in the repository if that's OK with you (just asked to join the
Alioth project).

Regards

David

From f69da2975e74df648241f36addd91436cb467889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Pr=C3=A9vot?= <taffit@debian.org>
Date: Fri, 31 Aug 2012 13:49:55 -0400
Subject: [PATCH 1/3] Add missing prepending underscore in templates (Closes:
 #686211)

---
 debian/changelog |    4 ++++
 debian/templates |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 81a02f1..9c96acc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 linux-base (3.6) UNRELEASED; urgency=low
 
+  [ Ben Hutchings ]
   * Add Polish debconf template translation (Closes: #670775)
 
+  [ David Prévot ]
+  * Add missing prepending underscore in templates (Closes: #686211)
+
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 01 May 2012 01:54:46 +0100
 
 linux-base (3.5) unstable; urgency=low
diff --git a/debian/templates b/debian/templates
index 7fb5024..f3c26cc 100644
--- a/debian/templates
+++ b/debian/templates
@@ -77,8 +77,8 @@ _Description: Boot loader configuration check needed
 
 Template: linux-base/disk-id-update-failed
 Type: error
-# Not yet translated
-Description: Failed to update disk device IDs
+#flag:translate!:3
+_Description: Failed to update disk device IDs
  An error occurred while attempting to update the system configuration:
  .
  ${output}
-- 
1.7.10.4

From 6e06d9bac3d1df8fe40f45b06c3528ec54d3891b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Pr=C3=A9vot?= <taffit@debian.org>
Date: Fri, 31 Aug 2012 13:52:58 -0400
Subject: [PATCH 2/3] Update POT and PO files (debconf-updatepo)

---
 debian/po/ca.po         |   98 ++++++++++++++++++++++++----------
 debian/po/cs.po         |   64 ++++++++++++++--------
 debian/po/da.po         |   66 +++++++++++++++--------
 debian/po/de.po         |   70 +++++++++++++++---------
 debian/po/es.po         |   73 ++++++++++++++++---------
 debian/po/et.po         |   58 +++++++++++++-------
 debian/po/fr.po         |   66 +++++++++++++++--------
 debian/po/it.po         |   59 ++++++++++++++-------
 debian/po/ja.po         |  135 +++++++++++++++++++++++++++++++++--------------
 debian/po/nl.po         |   22 +++++++-
 debian/po/pl.po         |   40 ++++++++++----
 debian/po/pt.po         |   66 +++++++++++++++--------
 debian/po/pt_BR.po      |   59 ++++++++++++++-------
 debian/po/ru.po         |   77 +++++++++++++++++----------
 debian/po/sk.po         |   22 +++++++-
 debian/po/sv.po         |   60 ++++++++++++++-------
 debian/po/templates.pot |   24 ++++++++-
 debian/po/vi.po         |   65 ++++++++++++++++-------
 18 files changed, 773 insertions(+), 351 deletions(-)

diff --git a/debian/po/ca.po b/debian/po/ca.po
index cedcdd9..0dc048e 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-24\n"
-"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-16 15:55+0100\n"
+"Report-Msgid-Bugs-To: linux-base@packages.debian.org\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2010-10-25 00:24+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -18,48 +18,59 @@ msgstr ""
 
 #. 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 @@ msgstr "S'assignaran UUID o etiquetes a aquests dispositius:"
 #. 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 @@ msgstr "S'actualitzaran aquests fitxers de configuració:"
 #. 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."
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 5df403e..e4356b6 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-18\n"
-"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-25 10:32+0200\n"
+"Report-Msgid-Bugs-To: linux-base@packages.debian.org\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2010-07-26 18:02+0200\n"
 "Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 #. 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 @@ msgstr "TÄ?mto zaÅ?ízením bude pÅ?iÅ?azeno UUID Ä?i popisek:"
 #. 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 @@ msgstr "Tyto konfiguraÄ?ní soubory budou aktualizovány:"
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -132,7 +132,7 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgid ""
 "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."
diff --git a/debian/po/da.po b/debian/po/da.po
index 5cda175..b71b9bc 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6\n"
-"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-10-01 10:30+0200\n"
+"Report-Msgid-Bugs-To: linux-base@packages.debian.org\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2010-10-07 05:26+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 #. 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 @@ msgstr "Disse enheder vil få tildelt UUID'er eller etiketter:"
 #. 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 @@ msgstr "Disse konfigurationsfiler vil blive opdateret:"
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -133,7 +133,7 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgid ""
 "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."
diff --git a/debian/po/de.po b/debian/po/de.po
index 62611f2..8b46371 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-11\n"
-"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-08-07 10:32+0200\n"
+"Report-Msgid-Bugs-To: linux-base@packages.debian.org\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2010-08-08 14:22+0200\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 #. 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 @@ msgstr "Diese Geräte werden über UUIDs oder Kennungen identifiziert:"
 #. 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 @@ msgstr "Diese Konfigurationsdateien werden aktualisiert:"
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -136,7 +136,7 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgid ""
 "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."
diff --git a/debian/po/es.po b/debian/po/es.po
index 2b4b626..3a9c68d 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -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@packages.debian.org\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2011-03-12 08:16+0000\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@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 @@ msgstr ""
 
 #. 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 @@ 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 "
@@ -67,7 +67,7 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr "Se van a asignar etiquetas o UUID a los siguientes dispositivos:"
 #. 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 @@ msgstr "Se van a actualizar los siguientes ficheros de configuración:"
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -170,7 +170,7 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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»."
diff --git a/debian/po/et.po b/debian/po/et.po
index d764c75..c5e91ba 100644
--- a/debian/po/et.po
+++ b/debian/po/et.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-11\n"
-"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-16 15:55+0100\n"
+"Report-Msgid-Bugs-To: linux-base@packages.debian.org\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2010-04-24 14:20+0300\n"
 "Last-Translator: mihkel <turakas gmail com>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -22,13 +22,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 #. 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 @@ msgstr "Nendele seadmetele määratakse UUID-d või sildid:"
 #. 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 @@ msgstr "Need konfiguratsioonifailid uuendatakse:"
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -136,7 +136,7 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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.  "
diff --git a/debian/po/fr.po b/debian/po/fr.po
index b222110..3b2fc8a 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-11\n"
-"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-25 10:32+0200\n"
+"Report-Msgid-Bugs-To: linux-base@packages.debian.org\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2010-07-26 12:24-0400\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #. 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 @@ 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 "
@@ -40,7 +40,7 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 #. 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 @@ msgstr ""
 #. 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 @@ msgstr "Les fichiers de configuration suivants seront mis à jour :"
 #. 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 @@ 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:"
@@ -117,13 +117,13 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -145,7 +145,7 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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.  "
@@ -178,7 +198,7 @@ msgid ""
 "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."
diff --git a/debian/po/it.po b/debian/po/it.po
index 3989ed0..05b8a31 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -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@packages.debian.org\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2010-11-09 18:24+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian <tp@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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 #. 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 @@ msgstr "I seguenti dispositivi verranno identificati tramite UUID o etichette:"
 #. 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 @@ msgstr "I seguenti file di configurazione verranno aggiornati:"
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -135,7 +136,7 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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.  "
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 876d175..167c4b8 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -3,58 +3,74 @@
 # This file is distributed under the same license as the linux-2.6 package.
 # Kenshi Muto <kmuto@debian.org>, 2010.
 # Nobuhiro Iwamatsu <iwamatsu@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@packages.debian.org\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2010-10-31 06:32+0900\n"
 "Last-Translator: Nobuhiro Iwamatsu <iwamatsu@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@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 @@ msgstr "次ã?®ã??ã??ã?¤ã?¹ã?¯ UUID ã?¾ã??ã?¯ã?©ã??ã?«ã?«å?²ã??å½?ã?¦ã??ã??ã?¾ã??
 #. 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 @@ msgstr "次ã?®è¨­å®?ã??ã?¡ã?¤ã?«ã?¯æ?´æ?°ã??ã??ã?¾ã??:"
 #. 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 @@ msgstr ""
 
 #. 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'  å¤?æ?°ã??設å®?ã??ã??ã??ã?¨ã?«ã??ã?£ã?¦ã??ã??ã?¼ã??ã?­ã?¼ã??ã??ã?¢ã??ã??ã??ã?¼ã??ã??"
+"ã??ã?³ã??ã?³ã??ã??æ??å®?ã?§ã??ã?¾ã??ã??"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 5a0ad9a..8cffc36 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux-base 3.2\n"
 "Report-Msgid-Bugs-To: linux-base@packages.debian.org\n"
-"POT-Creation-Date: 2011-03-12 08:45+0000\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2011-06-06 11:35+0200\n"
 "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -145,6 +145,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"
 msgstr "Het opstartprogramma moet mogelijk worden opgewaardeerd"
diff --git a/debian/po/pl.po b/debian/po/pl.po
index df18674..7a5d40a 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: linux-base@packages.debian.org\n"
-"POT-Creation-Date: 2011-03-12 08:45+0000\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2012-04-28 22:43+0200\n"
 "Last-Translator: MichaÅ? KuÅ?ach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -60,8 +60,8 @@ msgid ""
 "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 @@ msgid ""
 "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 @@ 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"
 msgstr "Program rozruchowy może wymagaÄ? zaktualizowania"
@@ -170,10 +190,8 @@ msgid ""
 "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."
-
-
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 97cd5c2..9cf0aca 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-18\n"
-"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-25 10:32+0200\n"
+"Report-Msgid-Bugs-To: linux-base@packages.debian.org\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2010-07-27 10:33+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -20,14 +20,14 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:2001
+#: ../templates:2001
 msgid "Update disk device IDs in system configuration?"
 msgstr ""
 "Actualizar os IDs dos 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 "
@@ -39,7 +39,7 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 "
@@ -65,14 +65,14 @@ msgstr ""
 #. 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 estas alterações de configuração aos IDs de dispositivos de discos?"
 
 #. Type: boolean
 #. Description
-#: ../linux-base.templates:3001
+#: ../templates:3001
 msgid "These devices will be assigned UUIDs or labels:"
 msgstr "A estes dispositivos serão atribuídos UUIDs ou etiquetas:"
 
@@ -80,7 +80,7 @@ msgstr "A estes dispositivos serão atribuídos UUIDs ou etiquetas:"
 #. 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 ficheiros de configuração irão ser actualizados:"
 
@@ -88,20 +88,20 @@ msgstr "Estes ficheiros de configuração irão ser actualizados:"
 #. 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 IDs de dispositivos irão ser alterados de acordo com o seguinte:"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:5001
+#: ../templates:5001
 msgid "Configuration files still contain deprecated device names"
 msgstr ""
 "Os ficheiros de configuração ainda contêm nomes obsoletos de dispositivos"
 
 #. 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:"
@@ -111,13 +111,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:6001
+#: ../templates:6001
 msgid "Boot loader configuration check needed"
 msgstr "Necessária verificação da configuração do 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:"
@@ -127,7 +127,7 @@ 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."
@@ -138,7 +138,7 @@ msgstr ""
 
 #. 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."
@@ -149,20 +149,40 @@ msgstr ""
 
 #. 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 gestor de arranque pode precisar de ser actualizado"
 
 #. Type: error
 #. Description
-#: ../linux-base.templates:8001
+#: ../templates:8001
 msgid "Kernel packages no longer update a default boot loader."
 msgstr ""
 "Os pacotes do kernel já não actualizam um gestor de arranque predefinido."
 
 #. 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.  "
@@ -170,7 +190,7 @@ msgid ""
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
 msgstr ""
 "Se o gestor de arranque precisa de ser actualizado sempre que um novo kernel "
-"é 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."
+"é 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."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index ec9da53..b3c4e1f 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -6,12 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6\n"
-"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-09-19 10:42+0200\n"
+"Report-Msgid-Bugs-To: linux-base@packages.debian.org\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2010-10-02 12:29-0300\n"
 "Last-Translator: Flamarion Jorge <jorge.flamarion@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 #. 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 @@ msgstr "Estes dispositivos serão associados a UUIDs ou rótulos (\"labels\"):"
 #. 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 @@ msgstr "Estes arquivos de configuração serão atualizados:"
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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:"
@@ -130,7 +131,7 @@ 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."
@@ -141,7 +142,7 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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.  "
diff --git a/debian/po/ru.po b/debian/po/ru.po
index ae1cb88..93882f9 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -6,28 +6,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-18\n"
-"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-25 10:32+0200\n"
+"Report-Msgid-Bugs-To: linux-base@packages.debian.org\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2010-08-01 17:11+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgid ""
 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 @@ msgstr "СледÑ?Ñ?Ñ?им Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?вам бÑ?дÑ?Ñ? назнаÑ?енÑ?
 #. 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 @@ msgstr "СледÑ?Ñ?Ñ?ие Ñ?айлÑ? наÑ?Ñ?Ñ?ойки бÑ?дÑ?Ñ? обновл
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -137,7 +136,7 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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."
diff --git a/debian/po/sk.po b/debian/po/sk.po
index f462c34..906dab8 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux-base 3.2\n"
 "Report-Msgid-Bugs-To: linux-base@packages.debian.org\n"
-"POT-Creation-Date: 2011-03-12 08:45+0000\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2011-04-10 13:15+0200\n"
 "Last-Translator: Slavko <linux@slavino.sk>\n"
 "Language-Team: Slovak <nomail>\n"
@@ -146,6 +146,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"
 msgstr "ZavádzaÄ? asi treba aktualizovaÅ¥"
diff --git a/debian/po/sv.po b/debian/po/sv.po
index d22186d..e31c324 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -6,27 +6,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6\n"
-"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-25 10:32+0200\n"
+"Report-Msgid-Bugs-To: linux-base@packages.debian.org\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2010-08-07 05:01+0100\n"
 "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 #. 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 @@ msgstr "Dessa enheter kommer att få UUID eller ettiketter:"
 #. 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 @@ msgstr "Dessa konfigurationsfiler kommer att uppdateras:"
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -135,7 +135,7 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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.  "
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index d84bf85..bdbdc62 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -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@packages.debian.org\n"
-"POT-Creation-Date: 2011-03-12 08:45+0000\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -126,6 +126,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"
 msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 784234b..5a209b9 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-26\n"
-"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-10-21 10:37+0200\n"
+"Report-Msgid-Bugs-To: linux-base@packages.debian.org\n"
+"POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2010-10-27 15:21+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 #. 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 @@ msgstr "UUID hay nhãn sẽ Ä?ược gán cho những thiết bá»? này:"
 #. 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 @@ msgstr "Sắp cập nhật những tập tin cấu hình này:"
 #. 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 @@ msgstr ""
 
 #. 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 @@ 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."
@@ -133,7 +133,7 @@ msgstr ""
 
 #. 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 @@ msgstr ""
 
 #. 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 »."
-- 
1.7.10.4

From 5deb5bfaf55caf603d9b1b8676bef190765e8f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Pr=C3=A9vot?= <taffit@debian.org>
Date: Fri, 31 Aug 2012 13:57:50 -0400
Subject: [PATCH 3/3] Fix some PO headers (makes podebconf-report-po more
 effective)

---
 debian/po/sk.po |    2 +-
 debian/po/vi.po |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/po/sk.po b/debian/po/sk.po
index 906dab8..6d73c0e 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2011-04-10 13:15+0200\n"
 "Last-Translator: Slavko <linux@slavino.sk>\n"
-"Language-Team: Slovak <nomail>\n"
+"Language-Team: Slovak <debian-l10n-slovak@lists.debian.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 5a209b9..35d39b4 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2012-08-31 13:51-0400\n"
 "PO-Revision-Date: 2010-10-27 15:21+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>, Vietnamese <debian-l10n-vietnamese@lists.debian.org>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-- 
1.7.10.4

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: