[linux] 01/08: linux-image: Make failure of depmod fatal, rather than asking what to do

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Wed Jan 27 19:54:57 UTC 2016


This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit f71765e064ebf21746a27524ccc587e52c6e7351
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Jan 26 23:18:10 2016 +0000

    linux-image: Make failure of depmod fatal, rather than asking what to do
    
    depmod has been stable for a very long time so there's no reason to
    have a configuration variable and debconf question to handle failure.
    
    While we're at it, fix the decoding of $? to handle the exec failure
    case ($? == -1).
---
 debian/changelog                          |  3 ++
 debian/templates/image.plain.postinst.in  | 65 +++++--------------------------
 debian/templates/image.plain.templates.in | 15 -------
 debian/templates/po/ca.po                 | 54 ++++---------------------
 debian/templates/po/cs.po                 | 51 ++++--------------------
 debian/templates/po/da.po                 | 53 ++++---------------------
 debian/templates/po/de.po                 | 54 ++++---------------------
 debian/templates/po/es.po                 | 55 ++++----------------------
 debian/templates/po/et.po                 | 51 ++++--------------------
 debian/templates/po/fr.po                 | 54 ++++---------------------
 debian/templates/po/it.po                 | 54 ++++---------------------
 debian/templates/po/ja.po                 | 53 ++++---------------------
 debian/templates/po/nl.po                 | 53 ++++---------------------
 debian/templates/po/pl.po                 | 54 ++++---------------------
 debian/templates/po/pt.po                 | 53 ++++---------------------
 debian/templates/po/pt_BR.po              | 54 ++++---------------------
 debian/templates/po/ru.po                 | 52 ++++---------------------
 debian/templates/po/sk.po                 | 51 ++++--------------------
 debian/templates/po/sv.po                 | 52 ++++---------------------
 debian/templates/po/templates.pot         | 45 ++++-----------------
 debian/templates/po/tr.po                 | 53 ++++---------------------
 debian/templates/po/vi.po                 | 51 ++++--------------------
 22 files changed, 146 insertions(+), 934 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 97c115d..8822959 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ linux (4.4-1~exp2) UNRELEASED; urgency=medium
   * [arm64] Enabled support for QCOM platforms, options recommended by Martin
     Michlmayr. (Closes: #812386)
 
+  [ Ben Hutchings ]
+  * linux-image: Make failure of depmod fatal, rather than asking what to do
+
  -- Ian Campbell <ijc at debian.org>  Sat, 23 Jan 2016 08:23:05 +0000
 
 linux (4.4-1~exp1) experimental; urgency=medium
diff --git a/debian/templates/image.plain.postinst.in b/debian/templates/image.plain.postinst.in
index 5551895..a78f6e7 100755
--- a/debian/templates/image.plain.postinst.in
+++ b/debian/templates/image.plain.postinst.in
@@ -21,7 +21,6 @@ my $mkimage           = "";     # command to generate the initrd image
 my $use_hard_links    = ''; # hardlinks do not work across fs boundaries
 my $postinst_hook     = '';          #Normally we do not
 my $minimal_swap      = '';          # Do not swap symlinks
-my $ignore_depmod_err = '';          # normally we do not
 my $package_name      = "linux-image-$version";
 
 #known variables
@@ -55,14 +54,12 @@ if (-r "$CONF_LOC" && -f "$CONF_LOC"  ) {
       $link_in_boot    = "" if /link_in_boot\s*=\s*(no|false|0)\s*$/i;
       $use_hard_links  = '' if /use_hard_links\s*=\s*(no|false|0)\s*$/i;
       $minimal_swap    = '' if /minimal_swap\s*=\s*(no|false|0)\s*$/i;
-      $ignore_depmod_err = '' if /ignore_depmod_err\s*=\s*(no|false|0)\s*$/i;
 
       $do_symlink      = "Yes" if /do_symlinks\s*=\s*(yes|true|1)\s*$/i;
       $no_symlink      = "Yes" if /no_symlinks\s*=\s*(yes|true|1)\s*$/i;
       $link_in_boot    = "Yes" if /link_in_boot\s*=\s*(yes|true|1)\s*$/i;
       $use_hard_links  = "Yes" if /use_hard_links\s*=\s*(yes|true|1)\s*$/i;
       $minimal_swap    = 'Yes' if /minimal_swap\s*=\s*(yes|true|1)\s*$/i;
-      $ignore_depmod_err = 'Yes' if /ignore_depmod_err\s*=\s*(yes|true|1)\s*$/i;
 
       $image_dest      = "$1"  if /image_dest\s*=\s*(\S+)/i;
       $postinst_hook   = "$1"  if /postinst_hook\s*=\s*(\S+)/i;
@@ -470,62 +467,20 @@ sub image_magic {
 ######################################################################
 ######################################################################
 
-sub do_modules {
-  my $ret = system("depmod -a -F $realimageloc/System.map-$version $version");
-  my $exit_value  = $? >> 8;
-  my $signal_num  = $? & 127;
-  my $dumped_core = $? & 128;
-  if ($ret) {
-    my $seen;
-    my $answer;
-    my $question;
-    $question = "${package_name}/postinst/depmod-error-initrd-$version";
-
-    ($ret,$seen) = fset ("$question", 'seen', 'false');
-    die "Error setting debconf flags in $question: $seen" if $ret;
-
-    $ret = subst("$question", 'modules_base', "$modules_base");
-    die "Error setting debconf substitutions in $question: $seen" if $ret;
-
-    $ret = subst("$question", 'SIGNAL', ", and got a signal $signal_num");
-    die "Error setting debconf substitutions in $question: $seen" if $ret;
-
-    if ($dumped_core) {
-      $ret = subst("$question", 'CORE', ", and dumped core");
-      die "Error setting debconf substitutions in $question: $seen" if $ret;
-    }
-    else {
-      $ret = subst("$question", 'CORE', " ");
-      die "Error setting debconf substitutions in $question: $seen" if $ret;
-    }
-
-    ($ret,$seen) = input('medium', "$question");
-    if ($ret && $ret != 30 ) {
-      die "Error setting debconf question $question: $seen";
-    }
-
-    ($ret,$seen) = go ();
-    if ($ret && $ret != 30 ) {
-      die "Error asking debconf question $question: $seen";
-    }
-
-    ($ret,$answer) = get("$question");
-    die "Error retreiving answer for $question: $answer" if $ret;
-
-    if (! $ignore_depmod_err) {
-      if ($answer =~ /^(y|t)/i) {
-        exit(1);
-      }
-      else {
-        print STDERR "Ok, continuing as directed\n";
-      }
-    }
+sub system_failure_message {
+  if ($? < 0) {
+    return "$!";
+  } elsif (POSIX::WIFSIGNALED($?)) {
+    return sprintf('signal %d', POSIX::WTERMSIG($?));
+  } else {
+    return sprintf('exit code %d', POSIX::WEXITSTATUS($?));
   }
 }
 
 # We may not have any modules installed
-if (-d "$modules_base/$version") {
-  &do_modules();
+if (-d "$modules_base/$version" &&
+    system("depmod -a -F $realimageloc/System.map-$version $version")) {
+  die ("depmod failed: " . system_failure_message());
 }
 
 
diff --git a/debian/templates/image.plain.templates.in b/debian/templates/image.plain.templates.in
index e4dde3a..7678f81 100644
--- a/debian/templates/image.plain.templates.in
+++ b/debian/templates/image.plain.templates.in
@@ -7,21 +7,6 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: linux-image- at abiname@@localversion@/postinst/depmod-error-initrd- at abiname@@localversion@
-Type: boolean
-Default: false
-_Description: Abort installation after depmod error?
- The 'depmod' command exited with the exit code ${exit_value}
- (${SIGNAL}${CORE}).
- .
- Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/modules.dep file
- will not be deleted, even though it may be invalid.
- .
- You should abort the installation and fix the
- errors in depmod, or regenerate the initrd image with a known good
- modules.dep file. If you don't abort the installation, there is
- a danger that the system will fail to boot.
-
 Template: linux-image- at abiname@@localversion@/prerm/removing-running-kernel- at abiname@@localversion@
 Type: boolean
 Default: true
diff --git a/debian/templates/po/ca.po b/debian/templates/po/ca.po
index 9d9e300..12c16b3 100644
--- a/debian/templates/po/ca.po
+++ b/debian/templates/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2013-08-15 13:20+0200\n"
 "Last-Translator: Jordi Mallach <jordi at debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -19,52 +19,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "Voleu avortar la instaŀlació degut a un error de depmod?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"L'ordre «depmod» ha sortit amb el codi d'error ${exit_value} "
-"(${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Com aquesta imatge empra un initrd, no es suprimirà el fitxer "
-"${modules_base}/@abiname@@localversion@/modules.dep, tot i que potser és "
-"invàlid."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Hauríeu d'avortar la instaŀlació i corregir els errors de depmod, o "
-"regenerar la imatge initrd amb un fitxer modules.dep que siga correcte amb "
-"certesa. Si no avorteu la instaŀlació, hi ha el perill que l'arrencada del "
-"sistema falle."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Voleu avortar la supressió del nucli?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -74,7 +34,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -88,7 +48,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -98,13 +58,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -115,7 +75,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/cs.po b/debian/templates/po/cs.po
index 26e9606..07d3568 100644
--- a/debian/templates/po/cs.po
+++ b/debian/templates/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux 3.14.12-2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2014-07-17 11:02+0200\n"
 "Last-Translator: Michal Simunek <michal.simunek at gmail.com>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -19,49 +19,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "Přerušit po chybě depmod instalaci?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr "Příkaz 'depmod' skončil s chybou ${exit_value} (${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Vzhledem k tomu, že tento obraz používá initrd, nebude soubor "
-"${modules_base}/@abiname@@localversion@/modules.dep smazán, přesto že může "
-"být neplatný."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Měli byste přerušit instalaci a opravit chyby v depmod, nebo vytvořit obraz "
-"initrd s prověřeným souborem modules.dep. Nepřerušíte-li instalaci, "
-"vystavujete se riziku, že se nepodaří systém zavést."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Přerušit odstraňování jádra?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -70,7 +33,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -83,7 +46,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -93,13 +56,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr "Pro nahrávání initramfs musí být aktualizováno nastavení zavaděče"
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -115,7 +78,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/da.po b/debian/templates/po/da.po
index 74fa86f..7bbf69f 100644
--- a/debian/templates/po/da.po
+++ b/debian/templates/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2014-07-20 05:26+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org> \n"
@@ -19,51 +19,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "Afbryd installation efter depmod-fejl?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"Kommandoen depmod afsluttedes med koden afslutningskoden ${exit_value} "
-"(${SIGNAL} ${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Da dette aftryk bruger initrd, vil filen ${modules_base}/"
-"@abiname@@localversion@/modules.dep ikke blive slettet, selvom den måske er "
-"ugyldig."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Du skal afbryde installationen og rette fejlene i depmod, eller gendanne "
-"initrd-aftrykket med en kendt god fil af typen modules-dep. Hvis du ikke "
-"afbryder installationen, er der fare for at systemet vil fejle ved opstart."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Afbryd kernefjernelse?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -73,7 +34,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -86,7 +47,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -96,7 +57,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 "Konfigurationen for opstartsindlæseren skal opdateres for at indlæse "
@@ -104,7 +65,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -120,7 +81,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/de.po b/debian/templates/po/de.po
index 790af22..49844aa 100644
--- a/debian/templates/po/de.po
+++ b/debian/templates/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux 3.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2014-07-25 23:06+0200\n"
 "Last-Translator: Holger Wansing <hwansing at mailbox.org>\n"
 "Language-Team: debian-l10n-german at lists.debian.org\n"
@@ -20,52 +20,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "Installation nach depmod-Fehler abbrechen?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"Der »depmod«-Befehl wurde beendet: Rückgabewert ${exit_value} "
-"(${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Da dieses Image eine Initrd verwendet, wird die Datei ${modules_base}/"
-"@abiname@@localversion@/modules.dep nicht gelöscht, obwohl sie ungültig sein "
-"könnte."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Sie sollten die Installation abbrechen und die Fehler bezüglich depmod "
-"beheben, oder erstellen Sie das Initrd-Image neu mit einer bekanntermaßen "
-"korrekten modules.dep-Datei. Falls Sie die Installation nicht abbrechen, "
-"besteht die Gefahr, dass das System nicht mehr neu gestartet werden kann."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Entfernen des Kernels abbrechen?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -75,7 +35,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -89,7 +49,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -100,14 +60,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 "Bootloader-Konfiguration muss aktualisiert werden, um initramfs zu laden"
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -124,7 +84,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/es.po b/debian/templates/po/es.po
index f1de88b..7d56cb2 100644
--- a/debian/templates/po/es.po
+++ b/debian/templates/po/es.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32+5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2014-07-24 17:59-0300\n"
 "Last-Translator: Matías Bellone <matiasbellone+debian at gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -44,53 +44,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr ""
-"¿Desea interrumpir la instalación cuando se produzca un fallo de depmod?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"La orden «depmod» finalizó con el código de salida «${exit_value} "
-"(${SIGNAL}${CORE})»."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Debido a que esta imagen usa una imagen de arranque «initrd», no se "
-"eliminará el fichero «${modules_base}/@abiname@@localversion@/modules.dep», "
-"aún cuando no sea válido."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Debería cancelar la instalación y arreglar los errores de depmod, o "
-"regenerar la imagen de arranque «initrd» con un fichero «modules.dep» "
-"fiable. Si no cancela la instalación, existe el peligro de que el sistema no "
-"pueda arrancar."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "¿Desea cancelar la eliminación del núcleo?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -100,7 +59,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -114,7 +73,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -124,7 +83,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 "Se debe actualizar la configuración del gestor de arranque para cargar "
@@ -132,7 +91,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -148,7 +107,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/et.po b/debian/templates/po/et.po
index 75ab82a..753552d 100644
--- a/debian/templates/po/et.po
+++ b/debian/templates/po/et.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux 2.6.32-11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2013-08-15 13:20+0200\n"
 "Last-Translator: mihkel <turakas gmail com>\n"
 "Language-Team: Estonian <et at li.org>\n"
@@ -23,49 +23,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "Katkesta paigaldus peale depmod veateadet?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"'depmod' käsk lõpetas väljumise koodiga ${exit_value} (${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Kuna tõmmis kasutab initrd-d, siis ${modules_base}/@abiname@@localversion@/"
-"modules.dep faili ei kustutata, kuigi ta võib olla vigane."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Sa peaksid paigaldamise katkestama ja parandama depmodi vead või "
-"regenereerima initrd tõmmise heade modules.dep failiga. Kui sa ei katkesta, "
-"siis suure tõenäosusega süsteem enam ei käivitu alglaadimisel."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Katkesta tuuma eemaldamine?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -75,7 +38,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -89,7 +52,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -99,13 +62,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -116,7 +79,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/fr.po b/debian/templates/po/fr.po
index edbe4a2..a53f4ea 100644
--- a/debian/templates/po/fr.po
+++ b/debian/templates/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux 3.14.13-2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2014-07-27 13:57+0200\n"
 "Last-Translator: David Prévot <david at tilapin.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -21,52 +21,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "Abandonner l'installation après l'erreur de depmod ?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"La commande depmod s’est terminée avec le code de retour ${exit_value} "
-"(${SIGNAL} ${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Puisque cette image du noyau utilise initrd, le fichier ${modules_base}/"
-"@abiname@@localversion@/modules.dep ne sera pas effacé, mais il peut ne pas "
-"être valable."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Vous devriez abandonner l’installation et corriger les erreurs de dépendance "
-"entre les modules du noyau (depmod), ou créer une nouvelle image initrd avec "
-"un fichier modules.dep valable. Si vous n’annulez pas l’installation, le "
-"système risque de ne pas redémarrer correctement."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Abandonner la suppression du noyau ?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -76,7 +36,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -90,7 +50,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -100,7 +60,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 "La configuration du chargeur de démarrage doit être mise à jour pour charger "
@@ -108,7 +68,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -125,7 +85,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/it.po b/debian/templates/po/it.po
index 8228658..528099f 100644
--- a/debian/templates/po/it.po
+++ b/debian/templates/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-27\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2013-08-15 13:21+0200\n"
 "Last-Translator: Luca Bruno <lucab at debian.org>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -19,52 +19,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "Interrompere l'installazione a seguito dell'errore di depmod?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"Il comando «depmod» è terminato con codice d'uscita ${exit_value} "
-"(${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Poiché questa immagine usa un initrd, il file ${modules_base}/"
-"@abiname@@localversion@/modules.dep non viene eliminato, anche se potrebbe "
-"risultare non più valido."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Si consiglia di interrompere l'installazione e correggere gli errori di "
-"depmod, o ricreare l'immagine initrd con un file modules.dep valido. Se "
-"l'installazione non viene interrotta, è possibile che il sistema possa "
-"risultare non avviabile."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Interrompere la rimozione del kernel?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -74,7 +34,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -88,7 +48,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -98,13 +58,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -115,7 +75,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/ja.po b/debian/templates/po/ja.po
index 553d2fa..0c20091 100644
--- a/debian/templates/po/ja.po
+++ b/debian/templates/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2014-08-03 17:18+0200\n"
 "Last-Translator: Victory <victory.deb at gmail.com>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -21,51 +21,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "depmod のエラー後にインストールを中止しますか?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"'depmod' コマンドは終了コード ${exit_value} (${SIGNAL}${CORE}) で終了しまし"
-"た。"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"このイメージは initrd を使っているので、${modules_base}/"
-"@abiname@@localversion@/modules.dep ファイルは (たとえ無効なものであったとし"
-"ても) 削除されません。"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"インストールを中止して depmod のエラーを修正するか、問題がないとわかっている "
-"modules.dep ファイルで initrd イメージを再生成すべきです。インストールを中止"
-"しないと、システムの起動に失敗する恐れがあります。"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "カーネルの削除を中止しますか?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -75,7 +36,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -89,7 +50,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -99,13 +60,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr "initramfs をロードするためにはブートローダ設定を更新する必要があります"
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -121,7 +82,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/nl.po b/debian/templates/po/nl.po
index eadb976..dcf3975 100644
--- a/debian/templates/po/nl.po
+++ b/debian/templates/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2012-02-04 12:27+0100\n"
 "Last-Translator: willem kuyn <willemkuyn at gmail.com>\n"
 "Language-Team: Debian-Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -19,51 +19,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "Installatie afbreken na depmod fout?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"De 'depmod' opdracht stopte met foutcode ${exit_value}  (${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Omdat deze afbeelding initrd gebruikt, zal het ${modules_base}/"
-"@abiname@@localversion@/modules.dep bestand niet verwijderd worden, ook al "
-"is het niet correct."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"U zou de installatie moeten afbreken en de fouten in depmod herstellen, of "
-"het initrd-bestand opnieuw moeten genereren met een correct modules.dep "
-"bestand. Als u de installatie niet afbreekt dan bestaat het gevaar dat het "
-"systeem niet zal starten."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Het verwijderen van de kernel afbreken?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -73,7 +34,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -87,7 +48,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -98,13 +59,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -115,7 +76,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/pl.po b/debian/templates/po/pl.po
index b2f2f18..ac33e55 100644
--- a/debian/templates/po/pl.po
+++ b/debian/templates/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2014-07-17 13:34+0200\n"
 "Last-Translator: Łukasz Dulny <bartekchom at poczta.onet.pl>\n"
 "Language-Team: Polish <debian-l10n-polish at lists.debian.org>\n"
@@ -23,52 +23,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "Przerwać instalację po błędzie depmod?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"Polecenie \"depmod\" zakończyło się z kodem wyjścia ${exit_value} "
-"(${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Ponieważ ten obraz używa initrd, plik ${modules_base}/"
-"@abiname@@localversion@/modules.dep nie zostanie usunięty, nawet jeśli może "
-"być nieprawidłowy."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Należy przerwać instalację i naprawić błędy depmod lub wygenerować obraz "
-"initrd ponownie z poprawnym, znanym plikiem modules.dep. Jeśli instalacja "
-"nie zostanie przerwana, istnieje niebezpieczeństwo, że system może się nie "
-"uruchomić."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Przerwać usuwanie jądra?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -78,7 +38,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -92,7 +52,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -102,7 +62,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 "Konfiguracja programu rozruchowego musi być zaktualizowana, aby wczytać "
@@ -110,7 +70,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -126,7 +86,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/pt.po b/debian/templates/po/pt.po
index 8b36b0d..a92b88c 100644
--- a/debian/templates/po/pt.po
+++ b/debian/templates/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux 3.14.12-2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2014-07-17 19:45+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro at gmx.com>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -21,51 +21,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "Abortar a instalação após erro do depmod?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"O comando 'depmod' terminou com o código de erro ${exit_value} "
-"(${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Como esta imagem usa initrd, o ficheiro ${modules_base}/"
-"@abiname@@localversion@/modules.dep não será apagado, apesar de poder ser "
-"inválido."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Você deve abortar a instalação e corrigir os erros do depmod, ou gerar "
-"novamente a imagem initrd com um ficheiro modules.dep conhecido como bom. Se "
-"não abortar a instalação, existe o perigo do sistema falhar no arranque."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Abortar a remoção do kernel?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -75,7 +36,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -89,7 +50,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -99,7 +60,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 "A configuração do gestor de arranque (boot loader) tem de ser actualizada "
@@ -107,7 +68,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -123,7 +84,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/pt_BR.po b/debian/templates/po/pt_BR.po
index 2d49d3f..011ced6 100644
--- a/debian/templates/po/pt_BR.po
+++ b/debian/templates/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux 3.10.3-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2013-08-17 14:29+0200\n"
 "Last-Translator: Fernando Ike de Oliveira (fike) <fike at midstorm.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese at lists.debian."
@@ -23,52 +23,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "Cancelar instalação após erro do depmod?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"O comando 'depmod' terminou com o código de saída ${exit_value} "
-"(${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Uma vez que esta imagem usa o initrd, o arquivo ${modules_base}/"
-"@abiname@@localversion@/modules.dep não será removido, embora possa ser "
-"considerado inválido."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Você deve cancelar a instalação e consertar os erros no depmod, ou regerar a "
-"imagem do initrd com um arquivo modules.dep em bom estado. Se você não "
-"cancelar a instalação, existe um perigo de seu sistema falhar na "
-"inicialização."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Cancelar remoção do kernel?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -78,7 +38,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -92,7 +52,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -102,13 +62,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -119,7 +79,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/ru.po b/debian/templates/po/ru.po
index fccd4fd..fce8913 100644
--- a/debian/templates/po/ru.po
+++ b/debian/templates/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux 3.14.12-2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2014-07-17 19:28+0400\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -22,50 +22,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "Прервать установку после ошибки depmod?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"Команда depmod завершилась с кодом ошибки ${exit_value} (${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Так как этот образ использует initrd, файл ${modules_base}/"
-"@abiname@@localversion@/modules.dep не будет удалён, даже если он может быть "
-"неправильным."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Вы должны прервать установку и исправить ошибки depmod, или пересобрать "
-"образ initrd с работающим файлом modules.dep. Если вы не прервёте установку, "
-"то система больше не сможет загружаться."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Прервать удаление ядра?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -73,7 +35,7 @@ msgstr "Вы пытаетесь удалить запущенную версию
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -87,7 +49,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -97,14 +59,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 "Для загрузки initramfs требуется обновление настроек системного загрузчика"
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -120,7 +82,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/sk.po b/debian/templates/po/sk.po
index 4566ec4..3e44651 100644
--- a/debian/templates/po/sk.po
+++ b/debian/templates/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux 3.14.12-2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2014-07-18 12:28+0200\n"
 "Last-Translator: Slavko <linux at slavino.sk>\n"
 "Language-Team: slovenčina <linux at slavino.sk>\n"
@@ -26,49 +26,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "Prerušiť inštaláciu po chybe depmod?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"Príkaz „depmod” skončil s návratovým kódom ${exit_value} (${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Keďže tento obraz používa initrd, nebude súbor ${modules_base}/"
-"@abiname@@localversion@/modules.dep zmazaný, hoci môže byť neplatný."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Mali by ste prerušiť inštaláciu a opraviť chyby v depmod, alebo znova "
-"vytvoriť obraz initrd s funkčným súborom modules.dep. Ak teraz neprerušíte "
-"inštaláciu, môže sa stať, že sa nepodarí zaviesť systém."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Prerušiť odstraňovanie jadra?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -78,7 +41,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -91,7 +54,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -101,14 +64,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 "Je potrebné aktualizovať nastavenie zavádzača tak, aby načítal initramfs"
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -124,7 +87,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/sv.po b/debian/templates/po/sv.po
index e8eeb42..3f274e4 100644
--- a/debian/templates/po/sv.po
+++ b/debian/templates/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2014-07-18 11:09+0100\n"
 "Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -20,50 +20,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "Avbryt installation efter fel i depmod?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"Kommandot \"depmod\" avslutades med felkod ${exit_value} (${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Eftersom denna avbildning använder initrd kommer inte filen ${modules_base}/"
-"@abiname@@localversion@/modules.dep att raderas, trots att den kan vara "
-"felaktig."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Du bör avbryta installationen och laga felen i depmod eller skapa en ny "
-"initrd-avbildning med en fungerande modules.dep-fil. Om du inte avbryter "
-"installationen kan systemet hamna i ett läge där det inte kan starta."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Avbryt radering av kärnan?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -73,7 +35,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -87,7 +49,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -97,13 +59,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr "Uppstartshanteraren behöver uppdateras för att läsa in initramfs"
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -119,7 +81,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/templates.pot b/debian/templates/po/templates.pot
index a87ec2e..714b143 100644
--- a/debian/templates/po/templates.pot
+++ b/debian/templates/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -20,43 +20,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -64,7 +33,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -74,7 +43,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -82,13 +51,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -99,7 +68,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/tr.po b/debian/templates/po/tr.po
index f9f0aa8..357bb53 100644
--- a/debian/templates/po/tr.po
+++ b/debian/templates/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 3.2.4-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2014-07-19 00:28+0200\n"
 "Last-Translator: Mert Dirik <mertdirik at gmail.com>\n"
 "Language-Team: Debian L10n Turkish <debian-l10n-turkish at lists.debian.org>\n"
@@ -20,51 +20,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "depmod hatasından sonra kurulum iptal edilsin mi?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"'depmod' komutu ${exit_value} (${SIGNAL}${CORE}) çıkış koduyla sonlandı."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Bu görüntü initrd kullandığından ötürü ${modules_base}/"
-"@abiname@@localversion@/modules.dep dosyası, dosya geçersiz olsa da "
-"silinmeyecektir."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Ya kurulumu iptal edip depmod'daki hataları düzeltmeli ya da initrd "
-"görüntüsünü düzgün olduğu bilinen bir modules.dep dosyasıyla yeniden "
-"oluşturmalısınız. Kurulumu iptal etmediğiniz takdirde sisteminizin başlamama "
-"olasılığı vardır."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Çekirdeği kaldırma işlemi iptal edilsin mi?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -74,7 +35,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -88,7 +49,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -98,13 +59,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr "initramfs'i yüklemek için açılış önyükleyicisi güncellenmeli"
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -121,7 +82,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "
diff --git a/debian/templates/po/vi.po b/debian/templates/po/vi.po
index 454b071..76e264c 100644
--- a/debian/templates/po/vi.po
+++ b/debian/templates/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-20 22:37+0200\n"
+"POT-Creation-Date: 2016-01-26 23:13+0000\n"
 "PO-Revision-Date: 2013-08-15 13:21+0200\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -20,49 +20,12 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../image.plain.templates.in:2001
-msgid "Abort installation after depmod error?"
-msgstr "Hủy bỏ tiến trình cài đặt sau khi gặp lỗi depmod ?"
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"Lệnh « depmod » đã thoát với mã thoát ${exit_value} (${SIGNAL}${CORE})."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/@abiname@@localversion@/"
-"modules.dep file will not be deleted, even though it may be invalid."
-msgstr ""
-"Vì ảnh này sử dụng initrd, tập tin ${modules_base}/@abiname@@localversion@/"
-"modules.dep sẽ không bị xoá, dù là nó có thể không thích hợp."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"Bạn nên hủy bỏ tiến trình cài đặt và sửa chữa các lỗi trong depmod, hoặc tạo "
-"lại ảnh initrd với một tập tin « modules.dep » tốt. Không hủy bỏ tiến trình "
-"cài đặt thì hệ thống có thể không khởi động được."
-
-#. Type: boolean
-#. Description
-#: ../image.plain.templates.in:3001
 msgid "Abort kernel removal?"
 msgstr "Hủy bỏ tiến trình gỡ bỏ hạt nhân ?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -72,7 +35,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "This can make the system unbootable as it will remove /boot/vmlinuz-"
 "${running} and all modules under the directory /lib/modules/${running}. This "
@@ -85,7 +48,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.plain.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -95,13 +58,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "This kernel package will build an \"initramfs\" file (/boot/initrd.img-"
 "@abiname@@localversion@) for the system's boot loader to use in addition to "
@@ -112,7 +75,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:4001
+#: ../image.plain.templates.in:3001
 msgid ""
 "The currently running kernel was booted without an initramfs. You should "
 "reconfigure the boot loader to load the initramfs for Linux version "

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git



More information about the Kernel-svn-changes mailing list