[kernel] r19467 - in dists/trunk/firmware-nonfree/debian: . po templates

[Ben Hutchings]

Author: benh
Date: Mon Oct 29 04:18:24 2012
New Revision: 19467

Log:
Revert incomplete addition of debconf template translation

It's no good translating the templates unless we also perform
build-time substitutions in the translations.  Also gencontrol.py
has no idea how to deal with comments or '_Description' headers
at present.

Deleted:
   dists/trunk/firmware-nonfree/debian/po/
Modified:
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/debian/templates/templates.license.in

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Mon Oct 29 03:46:21 2012	(r19466)
+++ dists/trunk/firmware-nonfree/debian/changelog	Mon Oct 29 04:18:24 2012	(r19467)
@@ -1,16 +1,7 @@
 firmware-nonfree (0.37) UNRELEASED; urgency=low
 
-  [ Ben Hutchings ]
   * debian/README.source: Document the oddities of this source package
 
-  [ Christian Perrier ]
-  * Debconf templates and debian/control reviewed by the debian-l10n-
-    english team as part of the Smith review project (Closes: #685579)
-  * Add debconf template translations:
-    - Russian (Yuri Kozlov) (Closes: #686681)
-    - Slovak (Slavko) (Closes: #686678)
-    - Polish (Michał Kułach) (Closes: #686601)
-
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 24 Jun 2012 22:56:53 +0100
 
 firmware-nonfree (0.36) unstable; urgency=low

Modified: dists/trunk/firmware-nonfree/debian/templates/templates.license.in
==============================================================================
--- dists/trunk/firmware-nonfree/debian/templates/templates.license.in	Mon Oct 29 03:46:21 2012	(r19466)
+++ dists/trunk/firmware-nonfree/debian/templates/templates.license.in	Mon Oct 29 04:18:24 2012	(r19467)
@@ -1,24 +1,15 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
 Template: firmware- at package@/license/accepted
 Type: boolean
 Default: false
-_Description: Do you agree to the "@license-title@"?
+Description: Do you agree to the "@license-title@"?
  In order to install this package, you must agree to the following terms,
  the "@license-title@".
  If you do not agree, the installation will be canceled.
 
 Template: firmware- at package@/license/error
 Type: error
-_Description: Declined @license-title@
- If you do not agree to the "@license-title@"
+Description: Declined @license-title@
+ If you do not agree to the "@license-title@" 
  license terms you cannot install this software.
  .
  The installation of this package has been canceled.