From 65d6c09bbd952d1ad5d7d3437bb5f9d24778e984 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 26 Jan 2016 23:34:34 +0000
Subject: [PATCH] Remove residual support for multiple image package types

We only really support the 'plain' type.  Remove all the conditions on
image type and remove 'plain' from all target and file names.
---
 debian/bin/gencontrol.py                      | 26 ++++++------
 debian/config/defines                         |  1 -
 debian/rules.real                             | 42 +++++++++----------
 ...l.image.type-plain.in => control.image.in} |  0
 ....plain.postinst.in => headers.postinst.in} |  0
 .../{image.plain.bug => image.bug}/control    |  0
 .../include-0version                          |  0
 .../include-1cmdline                          |  0
 .../include-1tainted                          |  0
 .../include-dmesg                             |  0
 .../include-model                             |  0
 .../include-modules                           |  0
 .../include-network                           |  0
 .../include-pci                               |  0
 .../include-pstore                            |  0
 .../include-usb                               |  0
 .../{image.plain.bug => image.bug}/presubj    |  0
 .../{image.plain.bug => image.bug}/script     |  0
 ...ge.plain.postinst.in => image.postinst.in} |  0
 ...{image.plain.postrm.in => image.postrm.in} |  0
 ...mage.plain.preinst.in => image.preinst.in} |  0
 .../{image.plain.prerm.in => image.prerm.in}  |  0
 ....plain.templates.in => image.templates.in} |  0
 debian/templates/po/POTFILES.in               |  2 +-
 debian/templates/po/ca.po                     | 16 +++----
 debian/templates/po/cs.po                     | 16 +++----
 debian/templates/po/da.po                     | 16 +++----
 debian/templates/po/de.po                     | 16 +++----
 debian/templates/po/es.po                     | 16 +++----
 debian/templates/po/et.po                     | 16 +++----
 debian/templates/po/fr.po                     | 16 +++----
 debian/templates/po/it.po                     | 16 +++----
 debian/templates/po/ja.po                     | 16 +++----
 debian/templates/po/nl.po                     | 16 +++----
 debian/templates/po/pl.po                     | 16 +++----
 debian/templates/po/pt.po                     | 16 +++----
 debian/templates/po/pt_BR.po                  | 16 +++----
 debian/templates/po/ru.po                     | 16 +++----
 debian/templates/po/sk.po                     | 16 +++----
 debian/templates/po/sv.po                     | 16 +++----
 debian/templates/po/templates.pot             | 16 +++----
 debian/templates/po/tr.po                     | 16 +++----
 debian/templates/po/vi.po                     | 16 +++----
 43 files changed, 186 insertions(+), 189 deletions(-)
 rename debian/templates/{control.image.type-plain.in => control.image.in} (100%)
 rename debian/templates/{headers.plain.postinst.in => headers.postinst.in} (100%)
 rename debian/templates/{image.plain.bug => image.bug}/control (100%)
 rename debian/templates/{image.plain.bug => image.bug}/include-0version (100%)
 rename debian/templates/{image.plain.bug => image.bug}/include-1cmdline (100%)
 rename debian/templates/{image.plain.bug => image.bug}/include-1tainted (100%)
 rename debian/templates/{image.plain.bug => image.bug}/include-dmesg (100%)
 rename debian/templates/{image.plain.bug => image.bug}/include-model (100%)
 rename debian/templates/{image.plain.bug => image.bug}/include-modules (100%)
 rename debian/templates/{image.plain.bug => image.bug}/include-network (100%)
 rename debian/templates/{image.plain.bug => image.bug}/include-pci (100%)
 rename debian/templates/{image.plain.bug => image.bug}/include-pstore (100%)
 rename debian/templates/{image.plain.bug => image.bug}/include-usb (100%)
 rename debian/templates/{image.plain.bug => image.bug}/presubj (100%)
 rename debian/templates/{image.plain.bug => image.bug}/script (100%)
 rename debian/templates/{image.plain.postinst.in => image.postinst.in} (100%)
 rename debian/templates/{image.plain.postrm.in => image.postrm.in} (100%)
 rename debian/templates/{image.plain.preinst.in => image.preinst.in} (100%)
 rename debian/templates/{image.plain.prerm.in => image.prerm.in} (100%)
 rename debian/templates/{image.plain.templates.in => image.templates.in} (100%)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 64e507250..13020ea3b 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -245,7 +245,6 @@ class Gencontrol(Base):
     )
 
     flavour_makeflags_image = (
-        ('type', 'TYPE', False),
         ('install-stem', 'IMAGE_INSTALL_STEM', True),
     )
 
@@ -344,7 +343,7 @@ class Gencontrol(Base):
         packages_dummy = []
         packages_own = []
 
-        image = self.templates["control.image.type-%s" % config_entry_image['type']]
+        image = self.templates["control.image"]
 
         config_entry_xen = self.config.merge('xen', arch, featureset, flavour)
         if config_entry_xen:
@@ -458,18 +457,17 @@ class Gencontrol(Base):
             with codecs.open(target, 'a' if append else 'w',
                              'utf-8') as f:
                 f.write(self.substitute(self.templates[template], vars))
-        if config_entry_image['type'] == 'plain':
-            substitute_file('headers.plain.postinst',
-                            'debian/linux-headers-%s%s.postinst' %
-                            (vars['abiname'], vars['localversion']))
-            for name in ['postinst', 'postrm', 'preinst', 'prerm', 'templates']:
-                substitute_file('image.plain.%s' % name,
-                                'debian/linux-image-%s%s.%s' %
-                                (vars['abiname'], vars['localversion'], name))
-            for path in glob.glob('debian/templates/po/*.po'):
-                substitute_file('po/' + os.path.basename(path),
-                                'debian/po/' + os.path.basename(path),
-                                append=True)
+        substitute_file('headers.postinst',
+                        'debian/linux-headers-%s%s.postinst' %
+                        (vars['abiname'], vars['localversion']))
+        for name in ['postinst', 'postrm', 'preinst', 'prerm', 'templates']:
+            substitute_file('image.%s' % name,
+                            'debian/linux-image-%s%s.%s' %
+                            (vars['abiname'], vars['localversion'], name))
+        for path in glob.glob('debian/templates/po/*.po'):
+            substitute_file('po/' + os.path.basename(path),
+                            'debian/po/' + os.path.basename(path),
+                            append=True)
         if build_debug:
             substitute_file('image-dbg.lintian-override',
                             'debian/linux-image-%s%s-dbg.lintian-overrides' %
diff --git a/debian/config/defines b/debian/config/defines
index 07bb5b0d4..fb8a712be 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -42,7 +42,6 @@ part-long-xen: This kernel also runs on a Xen hypervisor.
 
 [image]
 initramfs-generators: initramfs-tools initramfs-fallback
-type: plain
 
 [relations]
 # compilers
diff --git a/debian/rules.real b/debian/rules.real
index 36a533b8d..d0498bdb9 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -58,7 +58,7 @@ ifneq ($(DO_LIBC),False)
   binary-arch-arch: install-libc-dev_$(ARCH)
 endif
 binary-arch-featureset: install-headers_$(ARCH)_$(FEATURESET)
-binary-arch-flavour: install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
+binary-arch-flavour: install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 ifeq ($(DEBUG),True)
   binary-arch-flavour: install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 endif
@@ -74,7 +74,7 @@ endif
 binary-indep: install-source
 binary-indep: install-support
 
-build-arch: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
+build-arch: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 
 setup-flavour: $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 
@@ -164,10 +164,10 @@ endif
 	+yes "" | $(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' oldconfig >/dev/null
 	@$(stamp)
 
-$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
-$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 
-$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain:
+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR):
 	+$(MAKE_CLEAN) -C '$(DIR)' $(BUILD_TARGET)
 	debian/bin/buildcheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
 	@$(stamp)
@@ -276,7 +276,7 @@ install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): SOURCE_DIR = $(BUILD_DIR)/buil
 install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REF_DIR = $(BUILD_DIR)/source_$(FEATURESET)
 install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_DIR = debian/$(PACKAGE_NAME)
 install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR = $(PACKAGE_DIR)/$(BASE_DIR)
-install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 	dh_testdir
 	dh_testroot
 	dh_prep
@@ -350,22 +350,22 @@ install-support:
 	dh_link $(PACKAGE_ROOT) /usr/src/$(PACKAGE_NAME)
 	+$(MAKE_SELF) install-base
 
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): PACKAGE_NAME = linux-image-$(REAL_VERSION)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): PACKAGE_DIR = debian/$(PACKAGE_NAME)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): INSTALL_DIR = $(PACKAGE_DIR)/boot
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): DIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME = linux-image-$(REAL_VERSION)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_DIR = debian/$(PACKAGE_NAME)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR): INSTALL_DIR = $(PACKAGE_DIR)/boot
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain:
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR):
 	dh_testdir
 	dh_testroot
 	dh_prep
 	dh_installdirs 'boot'
 	install -m644 '$(DIR)/$(IMAGE_FILE)' $(INSTALL_DIR)/$(IMAGE_INSTALL_STEM)-$(REAL_VERSION)
 	+$(MAKE_SELF) \
-	  install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_dt \
+	  install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_dt \
 	  DIR='$(DIR)' PACKAGE_DIR='$(PACKAGE_DIR)' REAL_VERSION='$(REAL_VERSION)'
 	+$(MAKE_CLEAN) -C $(DIR) modules_install DEPMOD='$(CURDIR)/debian/bin/no-depmod' INSTALL_MOD_PATH='$(CURDIR)'/$(PACKAGE_DIR) INSTALL_MOD_STRIP=1
 ifeq ($(DEBUG),True)
@@ -381,15 +381,15 @@ endif
 	rm $(PACKAGE_DIR)/lib/firmware -rf
 	dh_installdebconf
 	+$(MAKE_SELF) \
-	  install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug \
+	  install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_bug \
 	  PACKAGE_DIR='$(PACKAGE_DIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)'
 	+$(MAKE_SELF) install-base GENCONTROL_ARGS='-Vkernel:Recommends='"$$( \
 		if grep -q '^CONFIG_SMP=y' $(DIR)/.config; then \
 			printf irqbalance,; \
 		fi)"
 
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_dt: DT_INSTALL_DIR = $(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_dt:
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_dt: DT_INSTALL_DIR = $(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_dt:
 ifneq ($(filter arm64 armel armhf,$(ARCH)),)
 	+$(MAKE_CLEAN) -C $(DIR) dtbs
 	+$(MAKE_CLEAN) -C $(DIR) dtbs_install INSTALL_DTBS_PATH=$(CURDIR)/$(DT_INSTALL_DIR)
@@ -401,9 +401,9 @@ ifneq ($(filter powerpc powerpcspe ppc64,$(ARCH)),)
 	  WRAPPER_BINDIR='$(CURDIR)/$(DT_INSTALL_DIR)'
 endif
 
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug:
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_bug:
 	dh_installdirs usr/share/bug/$(PACKAGE_NAME)
-	dh_install debian/templates/image.plain.bug/* usr/share/bug/$(PACKAGE_NAME)
+	dh_install debian/templates/image.bug/* usr/share/bug/$(PACKAGE_NAME)
 	chmod 755 $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/script
 	printf "RELEASE='$(REAL_VERSION)'\nDISTRIBUTOR='$(DISTRIBUTOR)'\nSOURCEVERSION='$(SOURCEVERSION)'\n" > $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/info
 
@@ -413,7 +413,7 @@ install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_DIR = debian/$(PACKA
 install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DEBUG_DIR = $(PACKAGE_DIR)/usr/lib/debug
 install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
+install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 	dh_testdir
 	dh_testroot
 	dh_prep
diff --git a/debian/templates/control.image.type-plain.in b/debian/templates/control.image.in
similarity index 100%
rename from debian/templates/control.image.type-plain.in
rename to debian/templates/control.image.in
diff --git a/debian/templates/headers.plain.postinst.in b/debian/templates/headers.postinst.in
similarity index 100%
rename from debian/templates/headers.plain.postinst.in
rename to debian/templates/headers.postinst.in
diff --git a/debian/templates/image.plain.bug/control b/debian/templates/image.bug/control
similarity index 100%
rename from debian/templates/image.plain.bug/control
rename to debian/templates/image.bug/control
diff --git a/debian/templates/image.plain.bug/include-0version b/debian/templates/image.bug/include-0version
similarity index 100%
rename from debian/templates/image.plain.bug/include-0version
rename to debian/templates/image.bug/include-0version
diff --git a/debian/templates/image.plain.bug/include-1cmdline b/debian/templates/image.bug/include-1cmdline
similarity index 100%
rename from debian/templates/image.plain.bug/include-1cmdline
rename to debian/templates/image.bug/include-1cmdline
diff --git a/debian/templates/image.plain.bug/include-1tainted b/debian/templates/image.bug/include-1tainted
similarity index 100%
rename from debian/templates/image.plain.bug/include-1tainted
rename to debian/templates/image.bug/include-1tainted
diff --git a/debian/templates/image.plain.bug/include-dmesg b/debian/templates/image.bug/include-dmesg
similarity index 100%
rename from debian/templates/image.plain.bug/include-dmesg
rename to debian/templates/image.bug/include-dmesg
diff --git a/debian/templates/image.plain.bug/include-model b/debian/templates/image.bug/include-model
similarity index 100%
rename from debian/templates/image.plain.bug/include-model
rename to debian/templates/image.bug/include-model
diff --git a/debian/templates/image.plain.bug/include-modules b/debian/templates/image.bug/include-modules
similarity index 100%
rename from debian/templates/image.plain.bug/include-modules
rename to debian/templates/image.bug/include-modules
diff --git a/debian/templates/image.plain.bug/include-network b/debian/templates/image.bug/include-network
similarity index 100%
rename from debian/templates/image.plain.bug/include-network
rename to debian/templates/image.bug/include-network
diff --git a/debian/templates/image.plain.bug/include-pci b/debian/templates/image.bug/include-pci
similarity index 100%
rename from debian/templates/image.plain.bug/include-pci
rename to debian/templates/image.bug/include-pci
diff --git a/debian/templates/image.plain.bug/include-pstore b/debian/templates/image.bug/include-pstore
similarity index 100%
rename from debian/templates/image.plain.bug/include-pstore
rename to debian/templates/image.bug/include-pstore
diff --git a/debian/templates/image.plain.bug/include-usb b/debian/templates/image.bug/include-usb
similarity index 100%
rename from debian/templates/image.plain.bug/include-usb
rename to debian/templates/image.bug/include-usb
diff --git a/debian/templates/image.plain.bug/presubj b/debian/templates/image.bug/presubj
similarity index 100%
rename from debian/templates/image.plain.bug/presubj
rename to debian/templates/image.bug/presubj
diff --git a/debian/templates/image.plain.bug/script b/debian/templates/image.bug/script
similarity index 100%
rename from debian/templates/image.plain.bug/script
rename to debian/templates/image.bug/script
diff --git a/debian/templates/image.plain.postinst.in b/debian/templates/image.postinst.in
similarity index 100%
rename from debian/templates/image.plain.postinst.in
rename to debian/templates/image.postinst.in
diff --git a/debian/templates/image.plain.postrm.in b/debian/templates/image.postrm.in
similarity index 100%
rename from debian/templates/image.plain.postrm.in
rename to debian/templates/image.postrm.in
diff --git a/debian/templates/image.plain.preinst.in b/debian/templates/image.preinst.in
similarity index 100%
rename from debian/templates/image.plain.preinst.in
rename to debian/templates/image.preinst.in
diff --git a/debian/templates/image.plain.prerm.in b/debian/templates/image.prerm.in
similarity index 100%
rename from debian/templates/image.plain.prerm.in
rename to debian/templates/image.prerm.in
diff --git a/debian/templates/image.plain.templates.in b/debian/templates/image.templates.in
similarity index 100%
rename from debian/templates/image.plain.templates.in
rename to debian/templates/image.templates.in
diff --git a/debian/templates/po/POTFILES.in b/debian/templates/po/POTFILES.in
index 7c102fe72..7f1fe0f07 100644
--- a/debian/templates/po/POTFILES.in
+++ b/debian/templates/po/POTFILES.in
@@ -1 +1 @@
-[type: gettext/rfc822deb] image.plain.templates.in
+[type: gettext/rfc822deb] image.templates.in
diff --git a/debian/templates/po/ca.po b/debian/templates/po/ca.po
index 12c16b3d0..22183132f 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2013-08-15 13:20+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "Voleu avortar la supressió del nucli?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -34,7 +34,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -48,7 +48,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -58,13 +58,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -75,7 +75,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 07d3568d8..735facde4 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2014-07-17 11: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
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "Přerušit odstraňování jádra?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -33,7 +33,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -46,7 +46,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -56,13 +56,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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:3001
+#: ../image.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 "
@@ -78,7 +78,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 7bbf69f09..aeffdcd5f 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2014-07-20 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
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "Afbryd kernefjernelse?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -34,7 +34,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -47,7 +47,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -57,7 +57,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 "Konfigurationen for opstartsindlæseren skal opdateres for at indlæse "
@@ -65,7 +65,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -81,7 +81,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 49844aaf3..b264f118f 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2014-07-25 23:06+0200\n"
 "Last-Translator: Holger Wansing <hwansing@mailbox.org>\n"
 "Language-Team: debian-l10n-german@lists.debian.org\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "Entfernen des Kernels abbrechen?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -35,7 +35,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -49,7 +49,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -60,14 +60,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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:3001
+#: ../image.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 "
@@ -84,7 +84,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 7d56cb2f0..ef17f34cf 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2014-07-24 17:59-0300\n"
 "Last-Translator: Matías Bellone <matiasbellone+debian@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -43,13 +43,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "¿Desea cancelar la eliminación del núcleo?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -59,7 +59,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -73,7 +73,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -83,7 +83,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -91,7 +91,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -107,7 +107,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 753552d83..c1439d9d0 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2013-08-15 13:20+0200\n"
 "Last-Translator: mihkel <turakas gmail com>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -22,13 +22,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "Katkesta tuuma eemaldamine?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -38,7 +38,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -52,7 +52,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -62,13 +62,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -79,7 +79,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 a53f4eaf6..a5613bac2 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2014-07-27 13:57+0200\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "Abandonner la suppression du noyau ?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -36,7 +36,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -50,7 +50,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -60,7 +60,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -85,7 +85,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 528099f18..8fa79cce6 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2013-08-15 13:21+0200\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "Interrompere la rimozione del kernel?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -34,7 +34,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -48,7 +48,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -58,13 +58,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -75,7 +75,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 0c2009154..9bdf2d8ed 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2014-08-03 17:18+0200\n"
 "Last-Translator: Victory <victory.deb@gmail.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "カーネルの削除を中止しますか?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -36,7 +36,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -50,7 +50,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -60,13 +60,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr "initramfs をロードするためにはブートローダ設定を更新する必要があります"
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -82,7 +82,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 dcf397567..585f01303 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2012-02-04 12:27+0100\n"
 "Last-Translator: willem kuyn <willemkuyn@gmail.com>\n"
 "Language-Team: Debian-Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "Het verwijderen van de kernel afbreken?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -34,7 +34,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -48,7 +48,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -59,13 +59,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -76,7 +76,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 ac33e550f..b0819c065 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2014-07-17 13:34+0200\n"
 "Last-Translator: Łukasz Dulny <bartekchom@poczta.onet.pl>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -22,13 +22,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "Przerwać usuwanie jądra?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -38,7 +38,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -52,7 +52,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -62,7 +62,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 "Konfiguracja programu rozruchowego musi być zaktualizowana, aby wczytać "
@@ -70,7 +70,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -86,7 +86,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 a92b88cf9..e4d89b0ba 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2014-07-17 19:45+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "Abortar a remoção do kernel?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -36,7 +36,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -50,7 +50,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -60,7 +60,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -84,7 +84,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 011ced6c4..a57433745 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2013-08-17 14:29+0200\n"
 "Last-Translator: Fernando Ike de Oliveira (fike) <fike@midstorm.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -22,13 +22,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "Cancelar remoção do kernel?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -38,7 +38,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -52,7 +52,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -62,13 +62,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -79,7 +79,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 fce891309..c11e5bc1c 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2014-07-17 19:28+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "Прервать удаление ядра?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -35,7 +35,7 @@ msgstr "Вы пытаетесь удалить запущенную версию
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -49,7 +49,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -59,14 +59,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 "Для загрузки initramfs требуется обновление настроек системного загрузчика"
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -82,7 +82,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 3e446517a..aa50b0102 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2014-07-18 12:28+0200\n"
 "Last-Translator: Slavko <linux@slavino.sk>\n"
 "Language-Team: slovenčina <linux@slavino.sk>\n"
@@ -25,13 +25,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "Prerušiť odstraňovanie jadra?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -41,7 +41,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -54,7 +54,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -64,14 +64,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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:3001
+#: ../image.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 "
@@ -87,7 +87,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 3f274e476..39005b22e 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2014-07-18 11:09+0100\n"
 "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "Avbryt radering av kärnan?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -35,7 +35,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -49,7 +49,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -59,13 +59,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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:3001
+#: ../image.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 "
@@ -81,7 +81,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 714b143a1..2a14c2a2e 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\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"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -33,7 +33,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -43,7 +43,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -51,13 +51,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 357bb53d4..cfd025863 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2014-07-19 00:28+0200\n"
 "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
 "Language-Team: Debian L10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid "Abort kernel removal?"
 msgstr "Çekirdeği kaldırma işlemi iptal edilsin mi?"
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -35,7 +35,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -49,7 +49,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -59,13 +59,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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:3001
+#: ../image.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 "
@@ -82,7 +82,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 76e264cf2..2a53c97d8 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: 2016-01-26 23:13+0000\n"
+"POT-Creation-Date: 2016-01-26 23:32+0000\n"
 "PO-Revision-Date: 2013-08-15 13:21+0200\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
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 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:2001
+#: ../image.templates.in:2001
 msgid ""
 "You are running a kernel (version ${running}) and attempting to remove the "
 "same version."
@@ -35,7 +35,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.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 "
@@ -48,7 +48,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../image.plain.templates.in:2001
+#: ../image.templates.in:2001
 msgid ""
 "It is highly recommended to abort the kernel removal unless you are prepared "
 "to fix the system after removal."
@@ -58,13 +58,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.templates.in:3001
 msgid "Boot loader configuration must be updated to load initramfs"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "
@@ -75,7 +75,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../image.plain.templates.in:3001
+#: ../image.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 "