The patch I sent in this bug report has a glitch. In debian/linux-base.templates, it introduces a blank line after "_Description" in one of the templates. As a consequence, the remaining of this template will not show up...:-(
A fixed patch is attached to this mail. Thanks A LOT to David Prévôt who noticed the error. --
--- linux-2.6.old/debian/linux-base.templates 2010-03-31 07:33:05.952958142 +0200 +++ linux-2.6/debian/linux-base.templates 2010-04-23 22:14:17.708173001 +0200 @@ -1,20 +1,33 @@ +# These templates have been reviewed by the debian-l10n-english +# team +# +# If modifications/additions/rewording are needed, please ask +# debian-l10n-engl...@lists.debian.org for advice. +# +# Even minor modifications require translation updates and such +# changes should be coordinated with translators and reviewers. + Template: linux-base/disk-id-convert-auto Type: boolean Default: true -_Description: Update disk device ids in system configuration? - The new Linux kernel version provides different drivers for some - PATA (IDE) controllers. The names of some hard disk, CD-ROM and - tape devices may change. +_Description: Update disk device IDs in system configuration? + The new Linux kernel version provides different drivers for some PATA + (IDE) controllers. The names of some hard disk, CD-ROM, and tape + devices may change. . - You are recommended to identify disk devices in configuration files + It is now recommended to identify disk devices in configuration files by label or UUID (unique identifier) rather than by device name, - which will work with both old and new kernel versions. Your system - configuration can be updated automatically in most cases. + which will work with both old and new kernel versions. + . + If you choose to not update the system configuration automatically, + you must update device IDs yourself before the next system reboot or + the system may become unbootable. Template: linux-base/disk-id-convert-plan Type: boolean Default: true -_Description: Apply these configuration changes to disk device ids? +#flag:translate!:3,5,7 +_Description: Apply configuration changes to disk device IDs? These devices will be assigned UUIDs or labels: . ${relabel} @@ -23,38 +36,41 @@ . ${files} . - The device ids will be changed as follows: + The device IDs will be changed as follows: . ${id_map} Template: linux-base/disk-id-convert-plan-no-relabel Type: boolean Default: true -_Description: Apply these configuration changes to disk device ids? +#flag:translate!:3,5 +_Description: Apply configuration changes to disk device IDs? These configuration files will be updated: . ${files} . - The device ids will be changed as follows: + The device IDs will be changed as follows: . ${id_map} Template: linux-base/disk-id-manual -Type: note -_Description: Please check these configuration files before rebooting - These configuration files still use some device names that may +Type: error +#flag:translate!:3 +_Description: Configuration files still contain deprecated device names + The following configuration files still use some device names that may change when using the new kernel: . ${unconverted} Template: linux-base/disk-id-manual-boot-loader -Type: note -_Description: Check the boot loader configuration before rebooting - The boot loader configuration for this system was not recognised. These +Type: error +_Description: Boot loader configuration check needed + The boot loader configuration for this system was not recognized. These settings in the configuration may need to be updated: . - * The root device id passed as a kernel parameter - * The boot device id used to install and update the boot loader + * The root device ID passed as a kernel parameter; + * The boot device ID used to install and update the boot loader. . - We recommend that you identify these devices by UUID or label, except that - on MIPS systems this is not supported for the root device. + You should generally identify these devices by UUID or + label. However, on MIPS systems the root device must be identified by + name. --- linux-2.6.old/debian/templates/temp.image.plain/templates 2010-03-31 07:33:05.088958975 +0200 +++ linux-2.6/debian/templates/temp.image.plain/templates 2010-04-15 08:02:54.693449990 +0200 @@ -1,3 +1,12 @@ +# These templates have been reviewed by the debian-l10n-english +# team +# +# If modifications/additions/rewording are needed, please ask +# debian-l10n-engl...@lists.debian.org for advice. +# +# Even minor modifications require translation updates and such +# changes should be coordinated with translators and reviewers. + Template: =ST-image-=V/postinst/depmod-error-initrd-=V Type: boolean Default: false @@ -87,7 +96,8 @@ . ${missing} . - Most firmware files are not included in the Debian system because - no source code is available for them. You may need to reconfigure - the package manager to include the non-free section of the Debian - archive before you can install these firmware files. + Most firmware files are not included in the system because they do + not conform to the Debian Free Software Guidelines. You may need to + reconfigure the package manager to include the contrib and non-free + sections of the package archive before you can install these + firmware files. --- linux-2.6.old/debian/changelog 2010-03-31 07:33:05.944954082 +0200 +++ linux-2.6/debian/changelog 2010-04-19 18:18:27.361612638 +0200 @@ -1,4 +1,4 @@ -linux-2.6 (2.6.32-11) UNRELEASED; urgency=low +linux-2.6 (2.6.32-12) UNRELEASED; urgency=low [ Ben Hutchings ] * [sparc] Provide io{read,write}{16,32}be() (Closes: #574421) @@ -30,7 +30,12 @@ [ Ian Campbell ] * Include Xen hypervisor in reportbug "related to" list. - -- maximilian attems <m...@debian.org> Wed, 17 Mar 2010 18:48:22 +0100 + [ Christian Perrier ] + * Debconf templates and debian/control reviewed by the debian-l10n- + english team as part of the Smith review project. Closes: #578349 + * [Debconf translation updates] + + -- Christian Perrier <bubu...@debian.org> Mon, 19 Apr 2010 18:18:24 +0200 linux-2.6 (2.6.32-10) unstable; urgency=low
signature.asc
Description: Digital signature