[SCM] Debian package checker branch, master, updated. 2.5.10-182-g0a514bf
The following commit has been merged in the master branch:
commit 0a514bfa9dd30253ead77cc414161667b98e02d2
Author: David Prévot <taffit@debian.org>
Date: Tue Aug 28 23:23:45 2012 -0400
c/po-debconf: Add untranslatable-debconf-templates
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/po-debconf b/checks/po-debconf
index e7d2074..7d8aeb0 100644
--- a/checks/po-debconf
+++ b/checks/po-debconf
@@ -44,6 +44,13 @@ for my $file (readdir(DEB)) {
if ($file =~ m/^(.+\.)?templates(\..+)?$/) {
if ($file =~ m/templates\.\w\w(_\w\w)?$/) {
push (@lang_templates, $file);
+ open(PO, '<', "$debfiles/$file")
+ or fail("Can't open debfiles/$file file.");
+ while (<PO>) {
+ tag 'untranslatable-debconf-templates', "$file: $."
+ if (m/^Description: (.+)/i and $1 !~/for internal use/);
+ }
+ close PO;
} else {
open(PO, '<', "$debfiles/$file")
or fail("Can't open debfiles/$file file.");
@@ -51,6 +58,8 @@ for my $file (readdir(DEB)) {
while (<PO>) {
tag 'translated-default-field', "$file: $."
if (m/^_Default(Choice)?: [^\[]*$/);
+ tag 'untranslatable-debconf-templates', "$file: $."
+ if (m/^Description: (.+)/i and $1 !~/for internal use/);
if (/^Template: (\S+)/i) {
my $template = $1;
next if $template =~ m,^shared/packages-(wordlist|ispell)$,;
diff --git a/checks/po-debconf.desc b/checks/po-debconf.desc
index 612bf4e..a59fc31 100644
--- a/checks/po-debconf.desc
+++ b/checks/po-debconf.desc
@@ -16,6 +16,24 @@ Info: This package seems to be using debconf templates, but it does not
that system.
Ref: policy 3.9.1
+Tag: untranslatable-debconf-templates
+Severity: serious
+Certainty: possible
+Info: This package seems to be using debconf templates, but some
+ descriptions are not translatable. You should prepend an underscore
+ before every translatable field, as described in po-debconf(7). This
+ may mean that translators weren't properly warned about new strings.
+ .
+ Translators may be notified of changes using podebconf-report-po, for
+ example:
+ .
+ podebconf-report-po --call --withtranslators --deadline="+10 days" \
+ --languageteam
+ .
+ If the field is not intended for users to see, ensure the first line
+ of the description contains "for internal use".
+Ref: policy 3.9.1
+
Tag: stray-translated-debconf-templates
Severity: normal
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 608ae2c..ca645d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ lintian (2.5.11) UNRELEASED; urgency=low
+ Added:
- dm-upload-allowed-is-obsolete
- field-name-typo-in-dep5-copyright
+ - untranslatable-debconf-templates
+ Removed:
- apparently-truncated-elf-binary
- data.tar.xz-member-without-dpkg-pre-depends
@@ -79,6 +80,10 @@ lintian (2.5.11) UNRELEASED; urgency=low
* checks/md5sums:
+ [NT] Use L::Collect's conffile API instead of accessing the
"conffiles" control file directly.
+ * checks/po-debconf{,.desc}:
+ + [NT] Check for untranslatable templates that should be
+ translatable. Thanks to David Prévot for the report and the
+ patch. (Closes: #686179)
* checks/shared-libs.desc:
+ [NT] Clearify the description of dev-pkg-without-shlib-symlink
to mention that the dev symlink is always expected in /usr.
diff --git a/t/COVERAGE b/t/COVERAGE
index c41f19c..f08e527 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2012-08-14
-Coverage (Tags): 877/961 (91.26%), w. legacy tests: 944/961 (98.23%)
+Last generated 2012-10-01
+Coverage (Tags): 879/963 (91.28%), w. legacy tests: 946/963 (98.23%)
Coverage (Checks): 33/41 (80.49%), w. legacy tests: 36/41 (87.80%)
The following tags are not tested by the test suite:
diff --git a/t/tests/debconf-config-general/debian/debian/po/da.po b/t/tests/debconf-config-general/debian/debian/po/da.po
index e7cceb3..d659394 100644
--- a/t/tests/debconf-config-general/debian/debian/po/da.po
+++ b/t/tests/debconf-config-general/debian/debian/po/da.po
@@ -7,13 +7,13 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-23 23:07+0200\n"
+"POT-Creation-Date: 2012-10-01 22:49+0200\n"
"PO-Revision-Date: 2012-07-23 23:08+0200\n"
"Last-Translator: Niels Thykier <niels@thykier.net>\n"
"Language-Team: Danish\n"
"Language: da\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -22,3 +22,21 @@ msgstr ""
#: ../templates:1001
msgid "Useless note"
msgstr "Ubrugelig note"
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid "This is a note abuse"
+msgstr "Dette er et note misbrug"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "Invoked with unknown debconf priority"
+msgstr "Kaldt med ukendt debconf prioritet"
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Is this use deprecated?"
+msgstr "Er denne brug forældet?"
diff --git a/t/tests/debconf-config-general/debian/debian/po/templates.pot b/t/tests/debconf-config-general/debian/debian/po/templates.pot
index 3edd4a9..2107421 100644
--- a/t/tests/debconf-config-general/debian/debian/po/templates.pot
+++ b/t/tests/debconf-config-general/debian/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-23 23:07+0200\n"
+"POT-Creation-Date: 2012-10-01 22:49+0200\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"
@@ -22,3 +22,21 @@ msgstr ""
#: ../templates:1001
msgid "Useless note"
msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:2001
+msgid "This is a note abuse"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "Invoked with unknown debconf priority"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Is this use deprecated?"
+msgstr ""
diff --git a/t/tests/debconf-config-general/debian/debian/templates b/t/tests/debconf-config-general/debian/debian/templates
index 964320d..5097b3a 100644
--- a/t/tests/debconf-config-general/debian/debian/templates
+++ b/t/tests/debconf-config-general/debian/debian/templates
@@ -4,12 +4,12 @@ _Description: Useless note
Template: debconf/note-abuse
Type: note
-Description: This is a note abuse
+_Description: This is a note abuse
Template: debconf/unknown-priority
Type: error
-Description: Invoked with unknown debconf priority
+_Description: Invoked with unknown debconf priority
Template: debconf/deprecated-default
Type: boolean
-Description: Is this use deprecated?
+_Description: Is this use deprecated?
diff --git a/t/tests/debconf-templates-general/debian/debian/po/da.po b/t/tests/debconf-templates-general/debian/debian/po/da.po
deleted file mode 100644
index 6cadcbe..0000000
--- a/t/tests/debconf-templates-general/debian/debian/po/da.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Danish translations for PACKAGE package.
-# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Niels Thykier <niels@thykier.net>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-25 11:04+0200\n"
-"PO-Revision-Date: 2012-07-23 23:08+0200\n"
-"Last-Translator: Niels Thykier <niels@thykier.net>\n"
-"Language-Team: Danish\n"
-"Language: da\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "Useless note"
-msgstr "Ubrugelig note"
-
-#. Type: select
-#. Choices
-#: ../templates:2001
-msgid "left, right, up, down"
-msgstr "venstre, højre, op, ned"
diff --git a/t/tests/debconf-templates-general/debian/debian/po/en.po b/t/tests/debconf-templates-general/debian/debian/po/en.po
new file mode 100644
index 0000000..84af2a3
--- /dev/null
+++ b/t/tests/debconf-templates-general/debian/debian/po/en.po
@@ -0,0 +1,234 @@
+# English translations for PACKAGE package.
+# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Niels Thykier <niels@thykier.net>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-01 22:54+0200\n"
+"PO-Revision-Date: 2012-10-01 22:54+0200\n"
+"Last-Translator: Niels Thykier <niels@thykier.net>\n"
+"Language-Team: English\n"
+"Language: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Useless note"
+msgstr "Useless note"
+
+#. Type: select
+#. Choices
+#: ../templates:2001
+msgid "left, right, up, down"
+msgstr "left, right, up, down"
+
+#. Type: select
+#. Description
+#: ../templates:2002
+msgid "Pick the odd one out"
+msgstr "Pick the odd one out"
+
+#. Type: text
+#. Description
+#: ../templates:3001
+msgid "Missing template field."
+msgstr "Missing template field."
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Is this a bad template?"
+msgstr "Is this a bad template?"
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Missing type"
+msgstr "Missing type"
+
+#. Type: lintian
+#. Description
+#: ../templates:6001
+msgid "Template with unknown type"
+msgstr "Template with unknown type"
+
+#. Type: boolean
+#. Description
+#: ../templates:7001
+msgid "How do you like the default?"
+msgstr "How do you like the default?"
+
+#. Type: boolean
+#. Description
+#: ../templates:7001
+msgid "On a scale of \"false\" to \"true\"."
+msgstr "On a scale of \"false\" to \"true\"."
+
+#. Type: select
+#. Description
+#: ../templates:8001
+msgid "A boolean type would have been better"
+msgstr "A boolean type would have been better"
+
+#. Type: select
+#. Description
+#: ../templates:9001
+msgid "Preference"
+msgstr "Preference"
+
+#. Type: select
+#. Description
+#: ../templates:10001
+msgid "Missing a Choices field"
+msgstr "Missing a Choices field"
+
+#. Type: error
+#. Description
+#. Type: error
+#. Description
+#: ../templates:12001
+msgid "Duplicate long description"
+msgstr "Duplicate long description"
+
+#. Type: boolean
+#. Description
+#: ../templates:13001
+msgid "Is the field below unknown?"
+msgstr "Is the field below unknown?"
+
+#. Type: string
+#. Description
+#: ../templates:14001
+msgid "What is the name of this package checker:"
+msgstr "What is the name of this package checker:"
+
+#. Type: select
+#. Description
+#: ../templates:15001
+msgid "Select either x or y"
+msgstr "Select either x or y"
+
+#. Type: boolean
+#. Description
+#: ../templates:16001
+msgid "Lintian is the best!"
+msgstr "Lintian is the best!"
+
+#. Type: boolean
+#. Description
+#: ../templates:17001
+msgid "Do you like sakana?"
+msgstr "Do you like sakana?"
+
+#. Type: boolean
+#. Description
+#: ../templates:17001
+msgid "Or do you prefer sake?"
+msgstr "Or do you prefer sake?"
+
+#. Type: note
+#. Description
+#: ../templates:18001
+msgid "Aren't you tired of all these debconf prompts?"
+msgstr "Aren't you tired of all these debconf prompts?"
+
+#. Type: boolean
+#. Description
+#: ../templates:19001
+msgid ""
+"This template has a very long short description, is that what you call an "
+"oxymoron?"
+msgstr ""
+"This template has a very long short description, is that what you call an "
+"oxymoron?"
+
+#. Type: select
+#. Description
+#: ../templates:20001
+msgid "I think Lintian is the best"
+msgstr "I think Lintian is the best"
+
+#. Type: boolean
+#. Description
+#: ../templates:21001
+msgid "Do you like Lintian?"
+msgstr "Do you like Lintian?"
+
+#. Type: boolean
+#. Description
+#: ../templates:21001
+msgid "Pick \"yes\" if you do."
+msgstr "Pick \"yes\" if you do."
+
+#. Type: string
+#. Description
+#: ../templates:22001
+msgid "Name the title of this song:"
+msgstr "Name the title of this song:"
+
+#. Type: string
+#. Description
+#: ../templates:22001
+msgid ""
+"Five green bottles sitting on the wall, Five green bottles sitting on the "
+"wall, And if one green bottle should accidentally fall, There'll be four "
+"green bottles sitting on the wall."
+msgstr ""
+"Five green bottles sitting on the wall, Five green bottles sitting on the "
+"wall, And if one green bottle should accidentally fall, There'll be four "
+"green bottles sitting on the wall."
+
+#. Type: string
+#. Description
+#: ../templates:22001
+msgid ""
+"Four green bottles sitting on the wall, Four green bottles sitting on the "
+"wall, And if one green bottle should accidentally fall, There'll be three "
+"green bottles sitting on the wall."
+msgstr ""
+"Four green bottles sitting on the wall, Four green bottles sitting on the "
+"wall, And if one green bottle should accidentally fall, There'll be three "
+"green bottles sitting on the wall."
+
+#. Type: string
+#. Description
+#: ../templates:22001
+msgid ""
+"Three green bottles sitting on the wall, Three green bottles sitting on the "
+"wall, And if one green bottle should accidentally fall, There'll be two "
+"green bottles sitting on the wall."
+msgstr ""
+"Three green bottles sitting on the wall, Three green bottles sitting on the "
+"wall, And if one green bottle should accidentally fall, There'll be two "
+"green bottles sitting on the wall."
+
+#. Type: string
+#. Description
+#: ../templates:22001
+msgid ""
+"Two green bottles sitting on the wall, Two green bottles sitting on the "
+"wall, And if one green bottle should accidentally fall, There'll be one "
+"green bottle sitting on the wall."
+msgstr ""
+"Two green bottles sitting on the wall, Two green bottles sitting on the "
+"wall, And if one green bottle should accidentally fall, There'll be one "
+"green bottle sitting on the wall."
+
+#. Type: string
+#. Description
+#: ../templates:22001
+msgid ""
+"One green bottle sitting on the wall, One green bottle sitting on the wall, "
+"And if one green bottle should accidentally fall, There'll be no green "
+"bottles sitting on the wall."
+msgstr ""
+"One green bottle sitting on the wall, One green bottle sitting on the wall, "
+"And if one green bottle should accidentally fall, There'll be no green "
+"bottles sitting on the wall."
diff --git a/t/tests/debconf-templates-general/debian/debian/po/templates.pot b/t/tests/debconf-templates-general/debian/debian/po/templates.pot
index 381c779..c9b8af3 100644
--- a/t/tests/debconf-templates-general/debian/debian/po/templates.pot
+++ b/t/tests/debconf-templates-general/debian/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-25 11:04+0200\n"
+"POT-Creation-Date: 2012-10-01 22:54+0200\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"
@@ -28,3 +28,190 @@ msgstr ""
#: ../templates:2001
msgid "left, right, up, down"
msgstr ""
+
+#. Type: select
+#. Description
+#: ../templates:2002
+msgid "Pick the odd one out"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../templates:3001
+msgid "Missing template field."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:4001
+msgid "Is this a bad template?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Missing type"
+msgstr ""
+
+#. Type: lintian
+#. Description
+#: ../templates:6001
+msgid "Template with unknown type"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:7001
+msgid "How do you like the default?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:7001
+msgid "On a scale of \"false\" to \"true\"."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../templates:8001
+msgid "A boolean type would have been better"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../templates:9001
+msgid "Preference"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../templates:10001
+msgid "Missing a Choices field"
+msgstr ""
+
+#. Type: error
+#. Description
+#. Type: error
+#. Description
+#: ../templates:12001
+msgid "Duplicate long description"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:13001
+msgid "Is the field below unknown?"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:14001
+msgid "What is the name of this package checker:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../templates:15001
+msgid "Select either x or y"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:16001
+msgid "Lintian is the best!"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:17001
+msgid "Do you like sakana?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:17001
+msgid "Or do you prefer sake?"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:18001
+msgid "Aren't you tired of all these debconf prompts?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:19001
+msgid ""
+"This template has a very long short description, is that what you call an "
+"oxymoron?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../templates:20001
+msgid "I think Lintian is the best"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:21001
+msgid "Do you like Lintian?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:21001
+msgid "Pick \"yes\" if you do."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:22001
+msgid "Name the title of this song:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:22001
+msgid ""
+"Five green bottles sitting on the wall, Five green bottles sitting on the "
+"wall, And if one green bottle should accidentally fall, There'll be four "
+"green bottles sitting on the wall."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:22001
+msgid ""
+"Four green bottles sitting on the wall, Four green bottles sitting on the "
+"wall, And if one green bottle should accidentally fall, There'll be three "
+"green bottles sitting on the wall."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:22001
+msgid ""
+"Three green bottles sitting on the wall, Three green bottles sitting on the "
+"wall, And if one green bottle should accidentally fall, There'll be two "
+"green bottles sitting on the wall."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:22001
+msgid ""
+"Two green bottles sitting on the wall, Two green bottles sitting on the "
+"wall, And if one green bottle should accidentally fall, There'll be one "
+"green bottle sitting on the wall."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:22001
+msgid ""
+"One green bottle sitting on the wall, One green bottle sitting on the wall, "
+"And if one green bottle should accidentally fall, There'll be no green "
+"bottles sitting on the wall."
+msgstr ""
diff --git a/t/tests/debconf-templates-general/debian/debian/templates b/t/tests/debconf-templates-general/debian/debian/templates
index 1f969c3..787068b 100644
--- a/t/tests/debconf-templates-general/debian/debian/templates
+++ b/t/tests/debconf-templates-general/debian/debian/templates
@@ -5,95 +5,95 @@ _Description: Useless note
Template: debconf/unsplit-choices
Type: select
_Choices: left, right, up, down
-Description: Pick the odd one out
+_Description: Pick the odd one out
Type: text
-Description: Missing template field.
+_Description: Missing template field.
Template: debconf-malformed-template
Type: boolean
-Description: Is this a bad template?
+_Description: Is this a bad template?
Template: debconf/no-type
-Description: Missing type
+_Description: Missing type
Template: debconf/unknown-type
Type: lintian
-Description: Template with unknown type
+_Description: Template with unknown type
Template: debconf/boolean-bogus-default
Type: boolean
Default: lintian
-Description: How do you like the default?
+_Description: How do you like the default?
On a scale of "false" to "true".
Template: debconf/select-boolean-choice
Type: select
Choices: yes, no
-Description: A boolean type would have been better
+_Description: A boolean type would have been better
Template: debconf/select-empty-trans-choices
Type: select
Choices: sakana, sake
Choices-Da:
-Description: Preference
+_Description: Preference
Template: debconf/select-without-choices
Type: select
-Description: Missing a Choices field
+_Description: Missing a Choices field
Template: debconf/no-description
Type: error
Template: debconf/duplicate-long-desc
Type: error
-Description: Duplicate long description
+_Description: Duplicate long description
Duplicate long description
Template: debconf/unknown-field
Type: boolean
-Description: Is the field below unknown?
+_Description: Is the field below unknown?
Unknown-field: yes, it is.
Template: debconf/malformed-prompt
Type: string
-Description: What is the name of this package checker:
+_Description: What is the name of this package checker:
Template: debconf/imperative-select
Type: select
Choices: x,y
-Description: Select either x or y
+_Description: Select either x or y
Template: debconf/malformed-question
Type: boolean
-Description: Lintian is the best!
+_Description: Lintian is the best!
Template: debconf/question-in-extended
Type: boolean
-Description: Do you like sakana?
+_Description: Do you like sakana?
Or do you prefer sake?
Template: debconf/malformed-note-title
Type: note
-Description: Aren't you tired of all these debconf prompts?
+_Description: Aren't you tired of all these debconf prompts?
Template: debconf/too-long-short-desc
Type: boolean
-Description: This template has a very long short description, is that what you call an oxymoron?
+_Description: This template has a very long short description, is that what you call an oxymoron?
Template: debconf/first-person
Type: select
Choices: lintian, no-lintian
-Description: I think Lintian is the best
+_Description: I think Lintian is the best
Template: debconf/assumption
Type: boolean
-Description: Do you like Lintian?
+_Description: Do you like Lintian?
Pick "yes" if you do.
Template: debconf/5-green-bottles-on-the-wall
Type: string
-Description: Name the title of this song:
+_Description: Name the title of this song:
Five green bottles sitting on the wall,
Five green bottles sitting on the wall,
And if one green bottle should accidentally fall,
diff --git a/t/tests/po-debconf-general/debian/debian/templates b/t/tests/po-debconf-general/debian/debian/templates
index b50d343..b626825 100644
--- a/t/tests/po-debconf-general/debian/debian/templates
+++ b/t/tests/po-debconf-general/debian/debian/templates
@@ -1,7 +1,7 @@
Template: po-debconf-general/test
Type: string
_Default: foo
-_Description: This is a string question used for testing:
+Description: This is a string question used for testing:
Template: po-debconf-general/test-2
Type: string
diff --git a/t/tests/po-debconf-general/debian/debian/templates.en_US b/t/tests/po-debconf-general/debian/debian/templates.en_US
index 9a87b2f..617a474 100644
--- a/t/tests/po-debconf-general/debian/debian/templates.en_US
+++ b/t/tests/po-debconf-general/debian/debian/templates.en_US
@@ -1,5 +1,5 @@
Template: po-debconf-general/test
Type: string
Default: foo
-Description: This is an English translation that shouldn't be in this
+_Description: This is an English translation that shouldn't be in this
directory.
diff --git a/t/tests/po-debconf-general/desc b/t/tests/po-debconf-general/desc
index 90375fd..632448e 100644
--- a/t/tests/po-debconf-general/desc
+++ b/t/tests/po-debconf-general/desc
@@ -10,4 +10,5 @@ Test-For:
no-debconf-config
stray-translated-debconf-templates
translated-default-field
+ untranslatable-debconf-templates
unused-debconf-template
diff --git a/t/tests/po-debconf-general/tags b/t/tests/po-debconf-general/tags
index 98c61d2..eaa93dc 100644
--- a/t/tests/po-debconf-general/tags
+++ b/t/tests/po-debconf-general/tags
@@ -1,3 +1,4 @@
+E: po-debconf-general source: untranslatable-debconf-templates templates: 4
E: po-debconf-general: no-debconf-config
I: po-debconf-general source: no-complete-debconf-translation
I: po-debconf-general: unused-debconf-template po-debconf-general/test
diff --git a/t/tests/po-debconf-missing/debian/debian/templates b/t/tests/po-debconf-missing/debian/debian/templates
index 1d685bc..1285e40 100644
--- a/t/tests/po-debconf-missing/debian/debian/templates
+++ b/t/tests/po-debconf-missing/debian/debian/templates
@@ -1,10 +1,10 @@
Template: po-debconf-general/test
Type: string
Default: foo
-Description: This is a string question used for testing:
+_Description: This is a string question used for testing:
Template: po-debconf-general/test-2
Type: string
Default: bar
-Description: This is a second string question:
+_Description: This is a second string question:
This one ensures no 100% translation of the template.
diff --git a/t/tests/po-debconf-no-po-debconf/tags b/t/tests/po-debconf-no-po-debconf/tags
index 5049c34..2788961 100644
--- a/t/tests/po-debconf-no-po-debconf/tags
+++ b/t/tests/po-debconf-no-po-debconf/tags
@@ -1 +1,3 @@
E: po-debconf-no-po-debconf source: not-using-po-debconf
+E: po-debconf-no-po-debconf source: untranslatable-debconf-templates templates: 4
+E: po-debconf-no-po-debconf source: untranslatable-debconf-templates templates: 9
diff --git a/testset/tags.debconf b/testset/tags.debconf
index 4dbf2cb..48c0e8b 100644
--- a/testset/tags.debconf
+++ b/testset/tags.debconf
@@ -1,5 +1,7 @@
E: debconf source: build-depends-on-obsolete-package build-depends: dpatch
E: debconf source: declares-possibly-conflicting-debhelper-compat-versions rules=4 compat=4
+E: debconf source: untranslatable-debconf-templates debconf-test.templates: 47
+E: debconf source: untranslatable-debconf-templates debconf-test.templates: 58
E: debconf-test-noscripts: copyright-contains-dh_make-todo-boilerplate
E: debconf-test-noscripts: no-debconf-config
E: debconf-test-postinst: copyright-contains-dh_make-todo-boilerplate
--
Debian package checker
Reply to: