Regenerate POT files and merge into po files

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@7037 313b444b-1b9f-4f58-a734-7bb04f332e8d

diff --git a/po4a/fr/best-pkging-practices.po b/po4a/fr/best-pkging-practices.po
index eb5b4700edb036c0a8bbcf138fa0832421eb39fd..14fde5964b1b241a5cd80c52a9579c44d182e6bd 100644 (file)
--- a/po4a/fr/best-pkging-practices.po
+++ b/po4a/fr/best-pkging-practices.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: best-pkging-practices\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: best-pkging-practices\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2009-09-12 17:19+0300\n"
+"POT-Creation-Date: 2010-01-04 00:20+0100\n"

 "PO-Revision-Date: 2009-06-01 14:35+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "PO-Revision-Date: 2009-06-01 14:35+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"


@@ -237,21 +237,31 @@ msgstr ""
 "<filename>.diff.gz</filename>) et supprimer ceux qui correspondent à des "
 "correctifs appliqués par le mainteneur amont."
 
 "<filename>.diff.gz</filename>) et supprimer ceux qui correspondent à des "
 "correctifs appliqués par le mainteneur amont."
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #: best-pkging-practices.dbk:99
 #. type: Content of: <chapter><section><section><para>
 #: best-pkging-practices.dbk:99

+msgid ""
+"Fortunately, with the source format “3.0 (quilt)” it is now possible to keep "
+"patches separate without having to modify <filename>debian/rules</filename> "
+"to setup a patch system. Patches are stored in <filename>debian/patches/</"
+"filename> and when the source package is unpacked patches listed in "
+"<filename>debian/patches/series</filename> are automatically applied.  As "
+"the name implies, patches can be managed with <command>quilt</command>."
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:107

 #, fuzzy
 msgid ""
 #, fuzzy
 msgid ""

-"Unfortunately, the packaging system as such currently doesn't provide for "
-"separating the patches into several files.  Nevertheless, there are ways to "
-"separate patches: the patch files are shipped within the Debian patch file "
-"(<filename>.diff.gz</filename>), usually within the <filename>debian/</"
-"filename> directory.  The only difference is that they aren't applied "
-"immediately by dpkg-source, but by the <literal>build</literal> rule of "
-"<filename>debian/rules</filename>, through a dependency on the "
-"<literal>patch</literal> rule.  Conversely, they are reverted in the "
-"<literal>clean</literal> rule, through a dependency on the <literal>unpatch</"
-"literal> rule."
+"When using the older source “1.0”, it's also possible to separate patches "
+"but a dedicated patch system must be used: the patch files are shipped "
+"within the Debian patch file (<filename>.diff.gz</filename>), usually within "
+"the <filename>debian/</filename> directory. The only difference is that they "
+"aren't applied immediately by <command>dpkg-source</command>, but by the "
+"<literal>build</literal> rule of <filename>debian/rules</filename>, through "
+"a dependency on the <literal>patch</literal> rule.  Conversely, they are "
+"reverted in the <literal>clean</literal> rule, through a dependency on the "
+"<literal>unpatch</literal> rule."

 msgstr ""
 "Malheureusement, le système de gestion des paquets ne permet pas "
 "actuellement, tel quel, de séparer les correctif en plusieurs fichiers. "
 msgstr ""
 "Malheureusement, le système de gestion des paquets ne permet pas "
 "actuellement, tel quel, de séparer les correctif en plusieurs fichiers. "


@@ -265,7 +275,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:113
+#: best-pkging-practices.dbk:119

 #, fuzzy
 msgid ""
 "<command>quilt</command> is the recommended tool for this.  It does all of "
 #, fuzzy
 msgid ""
 "<command>quilt</command> is the recommended tool for this.  It does all of "


@@ -280,7 +290,7 @@ msgstr ""
 "systemitem> pour un exemple d'utilisation."
 
 #. type: Content of: <chapter><section><section><para>
 "systemitem> pour un exemple d'utilisation."
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:119
+#: best-pkging-practices.dbk:125

 msgid ""
 "There are other tools to manage patches, like <command>dpatch</command>, and "
 "the patch system integrated with <systemitem role=\"package\">cdbs</"
 msgid ""
 "There are other tools to manage patches, like <command>dpatch</command>, and "
 "the patch system integrated with <systemitem role=\"package\">cdbs</"


@@ -289,13 +299,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:126
+#: best-pkging-practices.dbk:132

 msgid "Multiple binary packages"
 msgstr "Paquets binaires multiples"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Multiple binary packages"
 msgstr "Paquets binaires multiples"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:128
+#: best-pkging-practices.dbk:134

 msgid ""
 "A single source package will often build several binary packages, either to "
 "provide several flavors of the same software (e.g., the <systemitem role="
 msgid ""
 "A single source package will often build several binary packages, either to "
 "provide several flavors of the same software (e.g., the <systemitem role="


@@ -312,7 +322,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:135
+#: best-pkging-practices.dbk:141

 msgid ""
 "The second case can be easily managed in <filename>debian/rules</filename>.  "
 "You just need to move the appropriate files from the build directory into "
 msgid ""
 "The second case can be easily managed in <filename>debian/rules</filename>.  "
 "You just need to move the appropriate files from the build directory into "


@@ -333,7 +343,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:144
+#: best-pkging-practices.dbk:150

 msgid ""
 "The first case is a bit more difficult since it involves multiple recompiles "
 "of the same software but with different configuration options.  The "
 msgid ""
 "The first case is a bit more difficult since it involves multiple recompiles "
 "of the same software but with different configuration options.  The "


@@ -349,13 +359,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: best-pkging-practices.dbk:156
+#: best-pkging-practices.dbk:162

 msgid "Best practices for <filename>debian/control</filename>"
 msgstr "Meilleures pratiques pour <filename>debian/control</filename>"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Best practices for <filename>debian/control</filename>"
 msgstr "Meilleures pratiques pour <filename>debian/control</filename>"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:158
+#: best-pkging-practices.dbk:164

 msgid ""
 "The following practices are relevant to the <filename>debian/control</"
 "filename> file.  They supplement the <ulink url=\"&url-debian-policy;ch-"
 msgid ""
 "The following practices are relevant to the <filename>debian/control</"
 "filename> file.  They supplement the <ulink url=\"&url-debian-policy;ch-"


@@ -368,7 +378,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:164
+#: best-pkging-practices.dbk:170

 msgid ""
 "The description of the package, as defined by the corresponding field in the "
 "<filename>control</filename> file, contains both the package synopsis and "
 msgid ""
 "The description of the package, as defined by the corresponding field in the "
 "<filename>control</filename> file, contains both the package synopsis and "


@@ -387,13 +397,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:173
+#: best-pkging-practices.dbk:179

 msgid "General guidelines for package descriptions"
 msgstr "Conseils généraux pour les descriptions de paquets"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "General guidelines for package descriptions"
 msgstr "Conseils généraux pour les descriptions de paquets"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:175
+#: best-pkging-practices.dbk:181

 msgid ""
 "The package description should be written for the average likely user, the "
 "average person who will use and benefit from the package.  For instance, "
 msgid ""
 "The package description should be written for the average likely user, the "
 "average person who will use and benefit from the package.  For instance, "


@@ -410,7 +420,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:182
+#: best-pkging-practices.dbk:188

 msgid ""
 "Our review of package descriptions lead us to conclude that most package "
 "descriptions are technical, that is, are not written to make sense for non-"
 msgid ""
 "Our review of package descriptions lead us to conclude that most package "
 "descriptions are technical, that is, are not written to make sense for non-"


@@ -424,7 +434,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:188
+#: best-pkging-practices.dbk:194

 msgid ""
 "How do you write for non-technical users? Avoid jargon.  Avoid referring to "
 "other applications or frameworks that the user might not be familiar with — "
 msgid ""
 "How do you write for non-technical users? Avoid jargon.  Avoid referring to "
 "other applications or frameworks that the user might not be familiar with — "


@@ -443,7 +453,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:195
+#: best-pkging-practices.dbk:201

 msgid ""
 "Be objective.  Package descriptions are not the place for advocating your "
 "package, no matter how much you love it.  Remember that the reader may not "
 msgid ""
 "Be objective.  Package descriptions are not the place for advocating your "
 "package, no matter how much you love it.  Remember that the reader may not "


@@ -455,7 +465,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:200
+#: best-pkging-practices.dbk:206

 msgid ""
 "References to the names of any other software packages, protocol names, "
 "standards, or specifications should use their canonical forms, if one "
 msgid ""
 "References to the names of any other software packages, protocol names, "
 "standards, or specifications should use their canonical forms, if one "


@@ -472,7 +482,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:207
+#: best-pkging-practices.dbk:213

 msgid ""
 "If you are having problems writing your description, you may wish to send it "
 "along to &email-debian-l10n-english; and request feedback."
 msgid ""
 "If you are having problems writing your description, you may wish to send it "
 "along to &email-debian-l10n-english; and request feedback."


@@ -483,13 +493,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:213
+#: best-pkging-practices.dbk:219

 msgid "The package synopsis, or short description"
 msgstr "Le résumé, ou description courte, d'un paquet"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The package synopsis, or short description"
 msgstr "Le résumé, ou description courte, d'un paquet"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:215
+#: best-pkging-practices.dbk:221

 #, fuzzy
 msgid ""
 "Policy says the synopsis line (the short description) must be concise, not "
 #, fuzzy
 msgid ""
 "Policy says the synopsis line (the short description) must be concise, not "


@@ -499,7 +509,7 @@ msgstr ""
 "pas répéter le nom du paquet (cela est imposé par la Charte)."
 
 #. type: Content of: <chapter><section><section><para>
 "pas répéter le nom du paquet (cela est imposé par la Charte)."
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:219
+#: best-pkging-practices.dbk:225

 msgid ""
 "The synopsis functions as a phrase describing the package, not a complete "
 "sentence, so sentential punctuation is inappropriate: it does not need extra "
 msgid ""
 "The synopsis functions as a phrase describing the package, not a complete "
 "sentence, so sentential punctuation is inappropriate: it does not need extra "


@@ -509,7 +519,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:225
+#: best-pkging-practices.dbk:231

 #, no-wrap
 msgid ""
 "Package: libeg0\n"
 #, no-wrap
 msgid ""
 "Package: libeg0\n"


@@ -517,7 +527,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:229
+#: best-pkging-practices.dbk:235

 msgid ""
 "Technically this is a noun phrase minus articles, as opposed to a verb "
 "phrase.  A good heuristic is that it should be possible to substitute the "
 msgid ""
 "Technically this is a noun phrase minus articles, as opposed to a verb "
 "phrase.  A good heuristic is that it should be possible to substitute the "


@@ -526,7 +536,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:234
+#: best-pkging-practices.dbk:240

 #, fuzzy
 msgid ""
 "The package <replaceable>name</replaceable> provides {a,an,the,some} "
 #, fuzzy
 msgid ""
 "The package <replaceable>name</replaceable> provides {a,an,the,some} "


@@ -537,7 +547,7 @@ msgstr ""
 "replaceable>.\n"
 
 #. type: Content of: <chapter><section><section><para>
 "replaceable>.\n"
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:238
+#: best-pkging-practices.dbk:244

 msgid ""
 "Sets of related packages may use an alternative scheme that divides the "
 "synopsis into two parts, the first a description of the whole suite and the "
 msgid ""
 "Sets of related packages may use an alternative scheme that divides the "
 "synopsis into two parts, the first a description of the whole suite and the "


@@ -545,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:243
+#: best-pkging-practices.dbk:249

 #, no-wrap
 msgid ""
 "Package: eg-tools\n"
 #, no-wrap
 msgid ""
 "Package: eg-tools\n"


@@ -556,7 +566,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:250
+#: best-pkging-practices.dbk:256

 msgid ""
 "These synopses follow a modified formula. Where a package "
 "\"<replaceable>name</replaceable>\" has a synopsis \"<replaceable>suite</"
 msgid ""
 "These synopses follow a modified formula. Where a package "
 "\"<replaceable>name</replaceable>\" has a synopsis \"<replaceable>suite</"


@@ -567,7 +577,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:257
+#: best-pkging-practices.dbk:263

 #, fuzzy
 msgid ""
 "The package <replaceable>name</replaceable> provides {a,an,the} "
 #, fuzzy
 msgid ""
 "The package <replaceable>name</replaceable> provides {a,an,the} "


@@ -579,13 +589,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:263
+#: best-pkging-practices.dbk:269

 msgid "The long description"
 msgstr "La description longue"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The long description"
 msgstr "La description longue"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:265
+#: best-pkging-practices.dbk:271

 msgid ""
 "The long description is the primary information available to the user about "
 "a package before they install it.  It should provide all the information "
 msgid ""
 "The long description is the primary information available to the user about "
 "a package before they install it.  It should provide all the information "


@@ -600,13 +610,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:271
+#: best-pkging-practices.dbk:277

 msgid "The long description should consist of full and complete sentences."
 msgstr "La description longue est constituée de phrases complètes."
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The long description should consist of full and complete sentences."
 msgstr "La description longue est constituée de phrases complètes."
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:274
+#: best-pkging-practices.dbk:280

 msgid ""
 "The first paragraph of the long description should answer the following "
 "questions: what does the package do? what task does it help the user "
 msgid ""
 "The first paragraph of the long description should answer the following "
 "questions: what does the package do? what task does it help the user "


@@ -621,7 +631,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:280
+#: best-pkging-practices.dbk:286

 msgid ""
 "The following paragraphs should answer the following questions: Why do I as "
 "a user need this package? What other features does the package have? What "
 msgid ""
 "The following paragraphs should answer the following questions: Why do I as "
 "a user need this package? What other features does the package have? What "


@@ -640,7 +650,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:288
+#: best-pkging-practices.dbk:294

 msgid ""
 "Be careful to avoid spelling and grammar mistakes.  Ensure that you spell-"
 "check it.  Both <command>ispell</command> and <command>aspell</command> have "
 msgid ""
 "Be careful to avoid spelling and grammar mistakes.  Ensure that you spell-"
 "check it.  Both <command>ispell</command> and <command>aspell</command> have "


@@ -653,7 +663,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:293
+#: best-pkging-practices.dbk:299

 #, fuzzy, no-wrap
 msgid "ispell -d american -g debian/control\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "ispell -d american -g debian/control\n"
 msgstr ""


@@ -662,7 +672,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:296
+#: best-pkging-practices.dbk:302

 #, fuzzy, no-wrap
 msgid "aspell -d en -D -c debian/control\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "aspell -d en -D -c debian/control\n"
 msgstr ""


@@ -671,7 +681,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:299
+#: best-pkging-practices.dbk:305

 msgid ""
 "Users usually expect these questions to be answered in the package "
 "description:"
 msgid ""
 "Users usually expect these questions to be answered in the package "
 "description:"


@@ -681,7 +691,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:304
+#: best-pkging-practices.dbk:310

 msgid ""
 "What does the package do? If it is an add-on to another package, then the "
 "short description of the package we are an add-on to should be put in here."
 msgid ""
 "What does the package do? If it is an add-on to another package, then the "
 "short description of the package we are an add-on to should be put in here."


@@ -691,7 +701,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:310
+#: best-pkging-practices.dbk:316

 msgid ""
 "Why should I want this package? This is related to the above, but not the "
 "same (this is a mail user agent; this is cool, fast, interfaces with PGP and "
 msgid ""
 "Why should I want this package? This is related to the above, but not the "
 "same (this is a mail user agent; this is cool, fast, interfaces with PGP and "


@@ -704,7 +714,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:317
+#: best-pkging-practices.dbk:323

 msgid ""
 "If this package should not be installed directly, but is pulled in by "
 "another package, this should be mentioned."
 msgid ""
 "If this package should not be installed directly, but is pulled in by "
 "another package, this should be mentioned."


@@ -714,7 +724,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:323
+#: best-pkging-practices.dbk:329

 msgid ""
 "If the package is <literal>experimental</literal>, or there are other "
 "reasons it should not be used, if there are other packages that should be "
 msgid ""
 "If the package is <literal>experimental</literal>, or there are other "
 "reasons it should not be used, if there are other packages that should be "


@@ -726,7 +736,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:330
+#: best-pkging-practices.dbk:336

 msgid ""
 "How is this package different from the competition? Is it a better "
 "implementation? more features? different features? Why should I choose this "
 msgid ""
 "How is this package different from the competition? Is it a better "
 "implementation? more features? different features? Why should I choose this "


@@ -738,13 +748,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:343
+#: best-pkging-practices.dbk:349

 msgid "Upstream home page"
 msgstr "Page d'accueil amont"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Upstream home page"
 msgstr "Page d'accueil amont"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:345
+#: best-pkging-practices.dbk:351

 msgid ""
 "We recommend that you add the URL for the package's home page in the "
 "<literal>Homepage</literal> field of the <literal>Source</literal> section "
 msgid ""
 "We recommend that you add the URL for the package's home page in the "
 "<literal>Homepage</literal> field of the <literal>Source</literal> section "


@@ -759,13 +769,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:353
+#: best-pkging-practices.dbk:359

 msgid "Version Control System location"
 msgstr "Emplacement du système de gestion de versions"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Version Control System location"
 msgstr "Emplacement du système de gestion de versions"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:355
+#: best-pkging-practices.dbk:361

 msgid ""
 "There are additional fields for the location of the Version Control System "
 "in <filename>debian/control</filename>."
 msgid ""
 "There are additional fields for the location of the Version Control System "
 "in <filename>debian/control</filename>."


@@ -775,13 +785,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:359
+#: best-pkging-practices.dbk:365

 msgid "Vcs-Browser"
 msgstr "Vcs-Browser"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Vcs-Browser"
 msgstr "Vcs-Browser"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:361
+#: best-pkging-practices.dbk:367

 msgid ""
 "Value of this field should be a <literal>http://</literal> URL pointing to a "
 "web-browsable copy of the Version Control System repository used to maintain "
 msgid ""
 "Value of this field should be a <literal>http://</literal> URL pointing to a "
 "web-browsable copy of the Version Control System repository used to maintain "


@@ -793,7 +803,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:366
+#: best-pkging-practices.dbk:372

 msgid ""
 "The information is meant to be useful for the final user, willing to browse "
 "the latest work done on the package (e.g.  when looking for the patch fixing "
 msgid ""
 "The information is meant to be useful for the final user, willing to browse "
 "the latest work done on the package (e.g.  when looking for the patch fixing "


@@ -806,13 +816,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:373
+#: best-pkging-practices.dbk:379

 msgid "Vcs-*"
 msgstr "Vcs-*"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Vcs-*"
 msgstr "Vcs-*"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:375
+#: best-pkging-practices.dbk:381

 msgid ""
 "Value of this field should be a string identifying unequivocally the "
 "location of the Version Control System repository used to maintain the given "
 msgid ""
 "Value of this field should be a string identifying unequivocally the "
 "location of the Version Control System repository used to maintain the given "


@@ -838,7 +848,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:386
+#: best-pkging-practices.dbk:392

 msgid ""
 "The information is meant to be useful for a user knowledgeable in the given "
 "Version Control System and willing to build the current version of a package "
 msgid ""
 "The information is meant to be useful for a user knowledgeable in the given "
 "Version Control System and willing to build the current version of a package "


@@ -863,7 +873,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:397
+#: best-pkging-practices.dbk:403

 msgid ""
 "In the following example, an instance of the field for a Subversion "
 "repository of the <systemitem role=\"package\">vim</systemitem> package is "
 msgid ""
 "In the following example, an instance of the field for a Subversion "
 "repository of the <systemitem role=\"package\">vim</systemitem> package is "


@@ -881,7 +891,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><screen>
 #. type: Content of: <chapter><section><section><section><screen>
 
 # type: Content of: <chapter><section><section><section><screen>
 #. type: Content of: <chapter><section><section><section><screen>

-#: best-pkging-practices.dbk:406
+#: best-pkging-practices.dbk:412

 #, fuzzy, no-wrap
 msgid ""
 "  Source: vim\n"
 #, fuzzy, no-wrap
 msgid ""
 "  Source: vim\n"


@@ -903,13 +913,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: best-pkging-practices.dbk:421
+#: best-pkging-practices.dbk:427

 msgid "Best practices for <filename>debian/changelog</filename>"
 msgstr "Meilleures pratiques pour <filename>debian/changelog</filename>"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Best practices for <filename>debian/changelog</filename>"
 msgstr "Meilleures pratiques pour <filename>debian/changelog</filename>"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:423
+#: best-pkging-practices.dbk:429

 msgid ""
 "The following practices supplement the <ulink url=\"&url-debian-policy;ch-"
 "docs.html#s-changelogs\">Policy on changelog files</ulink>."
 msgid ""
 "The following practices supplement the <ulink url=\"&url-debian-policy;ch-"
 "docs.html#s-changelogs\">Policy on changelog files</ulink>."


@@ -920,13 +930,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:428
+#: best-pkging-practices.dbk:434

 msgid "Writing useful changelog entries"
 msgstr "Écrire des entrées de journalisation utiles"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Writing useful changelog entries"
 msgstr "Écrire des entrées de journalisation utiles"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:430
+#: best-pkging-practices.dbk:436

 msgid ""
 "The changelog entry for a package revision documents changes in that "
 "revision, and only them.  Concentrate on describing significant and user-"
 msgid ""
 "The changelog entry for a package revision documents changes in that "
 "revision, and only them.  Concentrate on describing significant and user-"


@@ -939,7 +949,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:435
+#: best-pkging-practices.dbk:441

 msgid ""
 "Focus on <emphasis>what</emphasis> was changed — who, how and when are "
 "usually less important.  Having said that, remember to politely attribute "
 msgid ""
 "Focus on <emphasis>what</emphasis> was changed — who, how and when are "
 "usually less important.  Having said that, remember to politely attribute "


@@ -954,7 +964,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:441
+#: best-pkging-practices.dbk:447

 msgid ""
 "There's no need to elaborate the trivial and obvious changes.  You can also "
 "aggregate several changes in one entry.  On the other hand, don't be overly "
 msgid ""
 "There's no need to elaborate the trivial and obvious changes.  You can also "
 "aggregate several changes in one entry.  On the other hand, don't be overly "


@@ -972,7 +982,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:448
+#: best-pkging-practices.dbk:454

 msgid ""
 "Use common English so that the majority of readers can comprehend it.  Avoid "
 "abbreviations, tech-speak and jargon when explaining changes that close "
 msgid ""
 "Use common English so that the majority of readers can comprehend it.  Avoid "
 "abbreviations, tech-speak and jargon when explaining changes that close "


@@ -988,7 +998,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:454
+#: best-pkging-practices.dbk:460

 msgid ""
 "It is sometimes desirable to prefix changelog entries with the names of the "
 "files that were changed.  However, there's no need to explicitly list each "
 msgid ""
 "It is sometimes desirable to prefix changelog entries with the names of the "
 "files that were changed.  However, there's no need to explicitly list each "


@@ -1002,7 +1012,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:460
+#: best-pkging-practices.dbk:466

 msgid ""
 "When referring to bugs, don't assume anything.  Say what the problem was, "
 "how it was fixed, and append the closes: #nnnnn string.  See <xref linkend="
 msgid ""
 "When referring to bugs, don't assume anything.  Say what the problem was, "
 "how it was fixed, and append the closes: #nnnnn string.  See <xref linkend="


@@ -1015,13 +1025,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:467
+#: best-pkging-practices.dbk:473

 msgid "Common misconceptions about changelog entries"
 msgstr "Erreur communes pour les entrées de journaux de modifications"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Common misconceptions about changelog entries"
 msgstr "Erreur communes pour les entrées de journaux de modifications"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:469
+#: best-pkging-practices.dbk:475

 msgid ""
 "The changelog entries should <emphasis role=\"strong\">not</emphasis> "
 "document generic packaging issues (Hey, if you're looking for foo.conf, it's "
 msgid ""
 "The changelog entries should <emphasis role=\"strong\">not</emphasis> "
 "document generic packaging issues (Hey, if you're looking for foo.conf, it's "


@@ -1040,7 +1050,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:477
+#: best-pkging-practices.dbk:483

 msgid ""
 "The only bugs closed with a changelog entry should be those that are "
 "actually fixed in the same package revision.  Closing unrelated bugs in the "
 msgid ""
 "The only bugs closed with a changelog entry should be those that are "
 "actually fixed in the same package revision.  Closing unrelated bugs in the "


@@ -1054,7 +1064,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:482
+#: best-pkging-practices.dbk:488

 msgid ""
 "The changelog entries should <emphasis role=\"strong\">not</emphasis> be "
 "used for random discussion with bug reporters (I don't see segfaults when "
 msgid ""
 "The changelog entries should <emphasis role=\"strong\">not</emphasis> be "
 "used for random discussion with bug reporters (I don't see segfaults when "


@@ -1082,7 +1092,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:493
+#: best-pkging-practices.dbk:499

 msgid ""
 "It is an old tradition to acknowledge bugs fixed in non-maintainer uploads "
 "in the first changelog entry of the proper maintainer upload.  As we have "
 msgid ""
 "It is an old tradition to acknowledge bugs fixed in non-maintainer uploads "
 "in the first changelog entry of the proper maintainer upload.  As we have "


@@ -1099,13 +1109,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:501
+#: best-pkging-practices.dbk:507

 msgid "Common errors in changelog entries"
 msgstr "Erreurs usuelles dans les entrées du journal des modifications"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Common errors in changelog entries"
 msgstr "Erreurs usuelles dans les entrées du journal des modifications"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:503
+#: best-pkging-practices.dbk:509

 msgid ""
 "The following examples demonstrate some common errors or examples of bad "
 "style in changelog entries."
 msgid ""
 "The following examples demonstrate some common errors or examples of bad "
 "style in changelog entries."


@@ -1116,7 +1126,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:507
+#: best-pkging-practices.dbk:513

 #, fuzzy, no-wrap
 msgid "  * Fixed all outstanding bugs.\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "  * Fixed all outstanding bugs.\n"
 msgstr ""


@@ -1125,13 +1135,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:510
+#: best-pkging-practices.dbk:516

 msgid "This doesn't tell readers anything too useful, obviously."
 msgstr "Cela ne donne évidemment aucune indication au lecteur."
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 msgid "This doesn't tell readers anything too useful, obviously."
 msgstr "Cela ne donne évidemment aucune indication au lecteur."
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:513
+#: best-pkging-practices.dbk:519

 #, fuzzy, no-wrap
 msgid "  * Applied patch from Jane Random.\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "  * Applied patch from Jane Random.\n"
 msgstr ""


@@ -1140,13 +1150,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:516
+#: best-pkging-practices.dbk:522

 msgid "What was the patch about?"
 msgstr "Que faisait ce correctif ?"
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 msgid "What was the patch about?"
 msgstr "Que faisait ce correctif ?"
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:519
+#: best-pkging-practices.dbk:525

 #, fuzzy, no-wrap
 msgid "  * Late night install target overhaul.\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "  * Late night install target overhaul.\n"
 msgstr ""


@@ -1155,7 +1165,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:522
+#: best-pkging-practices.dbk:528

 msgid ""
 "Overhaul which accomplished what? Is the mention of late night supposed to "
 "remind us that we shouldn't trust that code?"
 msgid ""
 "Overhaul which accomplished what? Is the mention of late night supposed to "
 "remind us that we shouldn't trust that code?"


@@ -1166,7 +1176,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:526
+#: best-pkging-practices.dbk:532

 #, fuzzy, no-wrap
 msgid "  * Fix vsync FU w/ ancient CRTs.\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "  * Fix vsync FU w/ ancient CRTs.\n"
 msgstr ""


@@ -1175,7 +1185,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:529
+#: best-pkging-practices.dbk:535

 msgid ""
 "Too many acronyms, and it's not overly clear what the, uh, fsckup (oops, a "
 "curse word!) was actually about, or how it was fixed."
 msgid ""
 "Too many acronyms, and it's not overly clear what the, uh, fsckup (oops, a "
 "curse word!) was actually about, or how it was fixed."


@@ -1186,7 +1196,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:533
+#: best-pkging-practices.dbk:539

 #, fuzzy, no-wrap
 msgid "  * This is not a bug, closes: #nnnnnn.\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "  * This is not a bug, closes: #nnnnnn.\n"
 msgstr ""


@@ -1195,7 +1205,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:536
+#: best-pkging-practices.dbk:542

 msgid ""
 "First of all, there's absolutely no need to upload the package to convey "
 "this information; instead, use the bug tracking system.  Secondly, there's "
 msgid ""
 "First of all, there's absolutely no need to upload the package to convey "
 "this information; instead, use the bug tracking system.  Secondly, there's "


@@ -1208,7 +1218,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:541
+#: best-pkging-practices.dbk:547

 #, fuzzy, no-wrap
 msgid "  * Has been fixed for ages, but I forgot to close; closes: #54321.\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "  * Has been fixed for ages, but I forgot to close; closes: #54321.\n"
 msgstr ""


@@ -1217,7 +1227,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:544
+#: best-pkging-practices.dbk:550

 msgid ""
 "If for some reason you didn't mention the bug number in a previous changelog "
 "entry, there's no problem, just close the bug normally in the BTS.  There's "
 msgid ""
 "If for some reason you didn't mention the bug number in a previous changelog "
 "entry, there's no problem, just close the bug normally in the BTS.  There's "


@@ -1237,7 +1247,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:551
+#: best-pkging-practices.dbk:557

 #, fuzzy, no-wrap
 msgid "  * Closes: #12345, #12346, #15432\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "  * Closes: #12345, #12346, #15432\n"
 msgstr ""


@@ -1246,7 +1256,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:554
+#: best-pkging-practices.dbk:560

 msgid ""
 "Where's the description? If you can't think of a descriptive message, start "
 "by inserting the title of each different bug."
 msgid ""
 "Where's the description? If you can't think of a descriptive message, start "
 "by inserting the title of each different bug."


@@ -1256,13 +1266,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:560
+#: best-pkging-practices.dbk:566

 msgid "Supplementing changelogs with NEWS.Debian files"
 msgstr "Compléter les journaux de modifications avec des fichiers NEWS.Debian"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Supplementing changelogs with NEWS.Debian files"
 msgstr "Compléter les journaux de modifications avec des fichiers NEWS.Debian"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:562
+#: best-pkging-practices.dbk:568

 msgid ""
 "Important news about changes in a package can also be put in <filename> NEWS."
 "Debian</filename> files.  The news will be displayed by tools like apt-"
 msgid ""
 "Important news about changes in a package can also be put in <filename> NEWS."
 "Debian</filename> files.  The news will be displayed by tools like apt-"


@@ -1286,7 +1296,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:573
+#: best-pkging-practices.dbk:579

 msgid ""
 "The file format is the same as a debian changelog file, but leave off the "
 "asterisks and describe each news item with a full paragraph when necessary "
 msgid ""
 "The file format is the same as a debian changelog file, but leave off the "
 "asterisks and describe each news item with a full paragraph when necessary "


@@ -1307,7 +1317,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:582
+#: best-pkging-practices.dbk:588

 #, fuzzy, no-wrap
 msgid ""
 "cron (3.0pl1-74) unstable; urgency=low\n"
 #, fuzzy, no-wrap
 msgid ""
 "cron (3.0pl1-74) unstable; urgency=low\n"


@@ -1331,7 +1341,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:592
+#: best-pkging-practices.dbk:598

 msgid ""
 "The <filename>NEWS.Debian</filename> file is installed as <filename> /usr/"
 "share/doc/<replaceable>package</replaceable>/NEWS.Debian.gz</filename>.  It "
 msgid ""
 "The <filename>NEWS.Debian</filename> file is installed as <filename> /usr/"
 "share/doc/<replaceable>package</replaceable>/NEWS.Debian.gz</filename>.  It "


@@ -1348,7 +1358,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:599
+#: best-pkging-practices.dbk:605

 msgid ""
 "Unlike changelog files, you need not update <filename>NEWS.Debian</filename> "
 "files with every release.  Only update them if you have something "
 msgid ""
 "Unlike changelog files, you need not update <filename>NEWS.Debian</filename> "
 "files with every release.  Only update them if you have something "


@@ -1365,13 +1375,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: best-pkging-practices.dbk:621
+#: best-pkging-practices.dbk:627

 msgid "Best practices for maintainer scripts"
 msgstr "Meilleures pratiques pour les scripts du responsable"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Best practices for maintainer scripts"
 msgstr "Meilleures pratiques pour les scripts du responsable"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:623
+#: best-pkging-practices.dbk:629

 msgid ""
 "Maintainer scripts include the files <filename>debian/postinst</filename>, "
 "<filename>debian/preinst</filename>, <filename>debian/prerm</filename> and "
 msgid ""
 "Maintainer scripts include the files <filename>debian/postinst</filename>, "
 "<filename>debian/preinst</filename>, <filename>debian/prerm</filename> and "


@@ -1390,7 +1400,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:631
+#: best-pkging-practices.dbk:637

 msgid ""
 "Maintainer scripts must be idempotent.  That means that you need to make "
 "sure nothing bad will happen if the script is called twice where it would "
 msgid ""
 "Maintainer scripts must be idempotent.  That means that you need to make "
 "sure nothing bad will happen if the script is called twice where it would "


@@ -1402,7 +1412,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:636
+#: best-pkging-practices.dbk:642

 msgid ""
 "Standard input and output may be redirected (e.g.  into pipes) for logging "
 "purposes, so don't rely on them being a tty."
 msgid ""
 "Standard input and output may be redirected (e.g.  into pipes) for logging "
 "purposes, so don't rely on them being a tty."


@@ -1413,7 +1423,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:640
+#: best-pkging-practices.dbk:646

 msgid ""
 "All prompting or interactive configuration should be kept to a minimum.  "
 "When it is necessary, you should use the <systemitem role=\"package"
 msgid ""
 "All prompting or interactive configuration should be kept to a minimum.  "
 "When it is necessary, you should use the <systemitem role=\"package"


@@ -1429,7 +1439,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:647
+#: best-pkging-practices.dbk:653

 msgid ""
 "Keep the maintainer scripts as simple as possible.  We suggest you use pure "
 "POSIX shell scripts.  Remember, if you do need any bash features, the "
 msgid ""
 "Keep the maintainer scripts as simple as possible.  We suggest you use pure "
 "POSIX shell scripts.  Remember, if you do need any bash features, the "


@@ -1446,7 +1456,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:654
+#: best-pkging-practices.dbk:660

 msgid ""
 "If you change your maintainer scripts, be sure to test package removal, "
 "double installation, and purging.  Be sure that a purged package is "
 msgid ""
 "If you change your maintainer scripts, be sure to test package removal, "
 "double installation, and purging.  Be sure that a purged package is "


@@ -1461,7 +1471,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:660
+#: best-pkging-practices.dbk:666

 msgid ""
 "If you need to check for the existence of a command, you should use "
 "something like"
 msgid ""
 "If you need to check for the existence of a command, you should use "
 "something like"


@@ -1471,14 +1481,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><programlisting>
 #. type: Content of: <chapter><section><programlisting>
 
 # type: Content of: <chapter><section><programlisting>
 #. type: Content of: <chapter><section><programlisting>

-#: best-pkging-practices.dbk:663
+#: best-pkging-practices.dbk:669

 #, no-wrap
 msgid "if [ -x /usr/sbin/install-docs ]; then ..."
 msgstr "if [ -x /usr/sbin/install-docs ]; then ..."
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 #, no-wrap
 msgid "if [ -x /usr/sbin/install-docs ]; then ..."
 msgstr "if [ -x /usr/sbin/install-docs ]; then ..."
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:665
+#: best-pkging-practices.dbk:671

 msgid ""
 "If you don't wish to hard-code the path of a command in your maintainer "
 "script, the following POSIX-compliant shell function may help:"
 msgid ""
 "If you don't wish to hard-code the path of a command in your maintainer "
 "script, the following POSIX-compliant shell function may help:"


@@ -1488,7 +1498,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:670
+#: best-pkging-practices.dbk:676

 msgid ""
 "You can use this function to search <literal>$PATH</literal> for a command "
 "name, passed as an argument.  It returns true (zero) if the command was "
 msgid ""
 "You can use this function to search <literal>$PATH</literal> for a command "
 "name, passed as an argument.  It returns true (zero) if the command was "


@@ -1505,7 +1515,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:677
+#: best-pkging-practices.dbk:683

 msgid ""
 "While <command>which</command> is an acceptable alternative, since it is "
 "from the required <systemitem role=\"package\">debianutils</systemitem> "
 msgid ""
 "While <command>which</command> is an acceptable alternative, since it is "
 "from the required <systemitem role=\"package\">debianutils</systemitem> "


@@ -1524,7 +1534,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: best-pkging-practices.dbk:687
+#: best-pkging-practices.dbk:693

 msgid ""
 "Configuration management with <systemitem role=\"package\">debconf</"
 "systemitem>"
 msgid ""
 "Configuration management with <systemitem role=\"package\">debconf</"
 "systemitem>"


@@ -1534,7 +1544,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:689
+#: best-pkging-practices.dbk:695

 msgid ""
 "<systemitem role=\"package\">Debconf</systemitem> is a configuration "
 "management system which can be used by all the various packaging scripts "
 msgid ""
 "<systemitem role=\"package\">Debconf</systemitem> is a configuration "
 "management system which can be used by all the various packaging scripts "


@@ -1553,7 +1563,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:697
+#: best-pkging-practices.dbk:703

 msgid ""
 "Debconf is a great tool but it is often poorly used.  Many common mistakes "
 "are listed in the <citerefentry> <refentrytitle>debconf-devel</"
 msgid ""
 "Debconf is a great tool but it is often poorly used.  Many common mistakes "
 "are listed in the <citerefentry> <refentrytitle>debconf-devel</"


@@ -1571,7 +1581,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:704
+#: best-pkging-practices.dbk:710

 msgid ""
 "These guidelines include some writing style and typography recommendations, "
 "general considerations about debconf usage as well as more specific "
 msgid ""
 "These guidelines include some writing style and typography recommendations, "
 "general considerations about debconf usage as well as more specific "


@@ -1586,13 +1596,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:710
+#: best-pkging-practices.dbk:716

 msgid "Do not abuse debconf"
 msgstr "N'abusez pas de <systemitem role=\"package\">debconf</systemitem>"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Do not abuse debconf"
 msgstr "N'abusez pas de <systemitem role=\"package\">debconf</systemitem>"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:712
+#: best-pkging-practices.dbk:718

 msgid ""
 "Since debconf appeared in Debian, it has been widely abused and several "
 "criticisms received by the Debian distribution come from debconf abuse with "
 msgid ""
 "Since debconf appeared in Debian, it has been widely abused and several "
 "criticisms received by the Debian distribution come from debconf abuse with "


@@ -1608,7 +1618,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:718
+#: best-pkging-practices.dbk:724

 msgid ""
 "Keep usage notes to what they belong: the NEWS.Debian, or README.Debian "
 "file.  Only use notes for important notes which may directly affect the "
 msgid ""
 "Keep usage notes to what they belong: the NEWS.Debian, or README.Debian "
 "file.  Only use notes for important notes which may directly affect the "


@@ -1624,7 +1634,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:724
+#: best-pkging-practices.dbk:730

 msgid ""
 "Carefully choose the questions priorities in maintainer scripts.  See "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> <manvolnum>7</"
 msgid ""
 "Carefully choose the questions priorities in maintainer scripts.  See "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> <manvolnum>7</"


@@ -1639,19 +1649,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:732
+#: best-pkging-practices.dbk:738

 msgid "General recommendations for authors and translators"
 msgstr "Recommandations générales pour les auteurs et les traducteurs"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 msgid "General recommendations for authors and translators"
 msgstr "Recommandations générales pour les auteurs et les traducteurs"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:734
+#: best-pkging-practices.dbk:740

 msgid "Write correct English"
 msgstr "Écrivez en anglais correct"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Write correct English"
 msgstr "Écrivez en anglais correct"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:736
+#: best-pkging-practices.dbk:742

 msgid ""
 "Most Debian package maintainers are not native English speakers.  So, "
 "writing properly phrased templates may not be easy for them."
 msgid ""
 "Most Debian package maintainers are not native English speakers.  So, "
 "writing properly phrased templates may not be easy for them."


@@ -1662,7 +1672,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:740
+#: best-pkging-practices.dbk:746

 msgid ""
 "Please use (and abuse) &email-debian-l10n-english; mailing list.  Have your "
 "templates proofread."
 msgid ""
 "Please use (and abuse) &email-debian-l10n-english; mailing list.  Have your "
 "templates proofread."


@@ -1672,7 +1682,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:744
+#: best-pkging-practices.dbk:750

 msgid ""
 "Badly written templates give a poor image of your package, of your work...or "
 "even of Debian itself."
 msgid ""
 "Badly written templates give a poor image of your package, of your work...or "
 "even of Debian itself."


@@ -1682,7 +1692,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:748
+#: best-pkging-practices.dbk:754

 msgid ""
 "Avoid technical jargon as much as possible.  If some terms sound common to "
 "you, they may be impossible to understand for others.  If you cannot avoid "
 msgid ""
 "Avoid technical jargon as much as possible.  If some terms sound common to "
 "you, they may be impossible to understand for others.  If you cannot avoid "


@@ -1696,13 +1706,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:756
+#: best-pkging-practices.dbk:762

 msgid "Be kind to translators"
 msgstr "Pensez aux traducteurs"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Be kind to translators"
 msgstr "Pensez aux traducteurs"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:758
+#: best-pkging-practices.dbk:764

 msgid ""
 "Debconf templates may be translated.  Debconf, along with its sister package "
 "<command>po-debconf</command> offers a simple framework for getting "
 msgid ""
 "Debconf templates may be translated.  Debconf, along with its sister package "
 "<command>po-debconf</command> offers a simple framework for getting "


@@ -1716,7 +1726,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:763
+#: best-pkging-practices.dbk:769

 msgid ""
 "Please use gettext-based templates.  Install <systemitem role=\"package\">po-"
 "debconf</systemitem> on your development system and read its documentation "
 msgid ""
 "Please use gettext-based templates.  Install <systemitem role=\"package\">po-"
 "debconf</systemitem> on your development system and read its documentation "


@@ -1729,7 +1739,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:768
+#: best-pkging-practices.dbk:774

 #, fuzzy
 msgid ""
 "Avoid changing templates too often.  Changing templates text induces more "
 #, fuzzy
 msgid ""
 "Avoid changing templates too often.  Changing templates text induces more "


@@ -1751,7 +1761,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:776
+#: best-pkging-practices.dbk:782

 #, fuzzy
 msgid ""
 "If you plan to do changes to your original templates, please use the "
 #, fuzzy
 msgid ""
 "If you plan to do changes to your original templates, please use the "


@@ -1775,20 +1785,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:788
+#: best-pkging-practices.dbk:794

 msgid "A recommended use of that utility is:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><programlisting>
 #. type: Content of: <chapter><section><section><section><programlisting>
 msgid "A recommended use of that utility is:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><programlisting>
 #. type: Content of: <chapter><section><section><section><programlisting>

-#: best-pkging-practices.dbk:790
+#: best-pkging-practices.dbk:796

 #, no-wrap
 msgid "cd debian/po &amp;&amp; podebconf-report-po --languageteam --withtranslators --call --deadline=\"+10 days\""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 #, no-wrap
 msgid "cd debian/po &amp;&amp; podebconf-report-po --languageteam --withtranslators --call --deadline=\"+10 days\""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:792
+#: best-pkging-practices.dbk:798

 msgid ""
 "This command will first synchronize the PO and POT files in debian/po with "
 "the templates files listed in <filename>debian/po/POTFILES.in</filename>.  "
 msgid ""
 "This command will first synchronize the PO and POT files in debian/po with "
 "the templates files listed in <filename>debian/po/POTFILES.in</filename>.  "


@@ -1801,7 +1811,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:801
+#: best-pkging-practices.dbk:807

 msgid ""
 "Giving a deadline to translators is always appreciated, so that they can "
 "organize their work. Please remember that some translation teams have a "
 msgid ""
 "Giving a deadline to translators is always appreciated, so that they can "
 "organize their work. Please remember that some translation teams have a "


@@ -1812,7 +1822,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:808
+#: best-pkging-practices.dbk:814

 msgid ""
 "If in doubt, you may also contact the translation team for a given language "
 "(debian-l10n-xxxxx@&lists-host;), or the &email-debian-i18n; mailing list."
 msgid ""
 "If in doubt, you may also contact the translation team for a given language "
 "(debian-l10n-xxxxx@&lists-host;), or the &email-debian-i18n; mailing list."


@@ -1823,7 +1833,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:815
+#: best-pkging-practices.dbk:821

 msgid "Unfuzzy complete translations when correcting typos and spelling"
 msgstr ""
 "Correction (« unfuzzy ») des traductions complètes lors des corrections de "
 msgid "Unfuzzy complete translations when correcting typos and spelling"
 msgstr ""
 "Correction (« unfuzzy ») des traductions complètes lors des corrections de "


@@ -1831,7 +1841,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:817
+#: best-pkging-practices.dbk:823

 #, fuzzy
 msgid ""
 "When the text of a debconf template is corrected and you are <emphasis role="
 #, fuzzy
 msgid ""
 "When the text of a debconf template is corrected and you are <emphasis role="


@@ -1846,7 +1856,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:823
+#: best-pkging-practices.dbk:829

 msgid ""
 "If you don't do so, the whole template will not be translated as long as a "
 "translator will send you an update."
 msgid ""
 "If you don't do so, the whole template will not be translated as long as a "
 "translator will send you an update."


@@ -1856,7 +1866,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:827
+#: best-pkging-practices.dbk:833

 msgid ""
 "To <emphasis>unfuzzy</emphasis> translations, you can use two methods. The "
 "first method does <emphasis>preventive</emphasis> search and replace actions "
 msgid ""
 "To <emphasis>unfuzzy</emphasis> translations, you can use two methods. The "
 "first method does <emphasis>preventive</emphasis> search and replace actions "


@@ -1866,13 +1876,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:833
+#: best-pkging-practices.dbk:839

 msgid "<emphasis>Preventive unfuzzy</emphasis> method:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgid "<emphasis>Preventive unfuzzy</emphasis> method:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:838
+#: best-pkging-practices.dbk:844

 #, fuzzy
 msgid ""
 "Try finding a complete translation file <emphasis role=\"strong\"> before</"
 #, fuzzy
 msgid ""
 "Try finding a complete translation file <emphasis role=\"strong\"> before</"


@@ -1883,7 +1893,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>

-#: best-pkging-practices.dbk:841 best-pkging-practices.dbk:911
+#: best-pkging-practices.dbk:847 best-pkging-practices.dbk:917

 #, no-wrap
 msgid ""
 "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null\n"
 #, no-wrap
 msgid ""
 "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null\n"


@@ -1894,7 +1904,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:844
+#: best-pkging-practices.dbk:850

 msgid ""
 "The file only showing <emphasis>translated</emphasis> items will be used as "
 "the reference file. If there is none (which should not happen if you take "
 msgid ""
 "The file only showing <emphasis>translated</emphasis> items will be used as "
 "the reference file. If there is none (which should not happen if you take "


@@ -1904,7 +1914,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:852
+#: best-pkging-practices.dbk:858

 msgid ""
 "Identify the needed change. In this example, let's assume the change is "
 "about fixing a typo in the word <literal>typo</literal> which was "
 msgid ""
 "Identify the needed change. In this example, let's assume the change is "
 "about fixing a typo in the word <literal>typo</literal> which was "


@@ -1914,7 +1924,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:860
+#: best-pkging-practices.dbk:866

 msgid ""
 "Check that this change is only applied to the place where you really intend "
 "to make it and <emphasis role=\"strong\">not</emphasis> in any other place "
 msgid ""
 "Check that this change is only applied to the place where you really intend "
 "to make it and <emphasis role=\"strong\">not</emphasis> in any other place "


@@ -1924,7 +1934,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:868
+#: best-pkging-practices.dbk:874

 msgid ""
 "Modify all PO files by using <command>sed</command>. The use of that command "
 "is recommended over any text editor to guarantee that the files encoding "
 msgid ""
 "Modify all PO files by using <command>sed</command>. The use of that command "
 "is recommended over any text editor to guarantee that the files encoding "


@@ -1932,7 +1942,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>

-#: best-pkging-practices.dbk:873
+#: best-pkging-practices.dbk:879

 #, no-wrap
 msgid ""
 "cd debian/po\n"
 #, no-wrap
 msgid ""
 "cd debian/po\n"


@@ -1941,40 +1951,40 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:879
+#: best-pkging-practices.dbk:885

 msgid "Change the debconf template file to fix the typo."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgid "Change the debconf template file to fix the typo."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:884
+#: best-pkging-practices.dbk:890

 #, fuzzy
 msgid "Run <command>debconf-updatepo</command>"
 msgstr "exécutez la commande <command>debconf-updatepo</command> à nouveau"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #, fuzzy
 msgid "Run <command>debconf-updatepo</command>"
 msgstr "exécutez la commande <command>debconf-updatepo</command> à nouveau"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:889
+#: best-pkging-practices.dbk:895

 msgid ""
 "Check the <filename>foo.po</filename> reference file. Its statistics should "
 "not be changed:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 msgid ""
 "Check the <filename>foo.po</filename> reference file. Its statistics should "
 "not be changed:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>

-#: best-pkging-practices.dbk:893
+#: best-pkging-practices.dbk:899

 #, no-wrap
 msgid "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 #, no-wrap
 msgid "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:902
+#: best-pkging-practices.dbk:908

 msgid "Gettext utilities method:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgid "Gettext utilities method:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:907
+#: best-pkging-practices.dbk:913

 msgid ""
 "Put all incomplete PO files out of the way.  You can check the completeness "
 "by using (needs the <systemitem role=\"package\">gettext</systemitem> "
 msgid ""
 "Put all incomplete PO files out of the way.  You can check the completeness "
 "by using (needs the <systemitem role=\"package\">gettext</systemitem> "


@@ -1986,7 +1996,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:916
+#: best-pkging-practices.dbk:922

 msgid ""
 "move all files which report either fuzzy strings to a temporary place.  "
 "Files which report no fuzzy strings (only translated and untranslated) will "
 msgid ""
 "move all files which report either fuzzy strings to a temporary place.  "
 "Files which report no fuzzy strings (only translated and untranslated) will "


@@ -1999,7 +2009,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:923
+#: best-pkging-practices.dbk:929

 msgid ""
 "now <emphasis role=\"strong\">and now only</emphasis>, modify the template "
 "for the typos and check again that translation are not impacted (typos, "
 msgid ""
 "now <emphasis role=\"strong\">and now only</emphasis>, modify the template "
 "for the typos and check again that translation are not impacted (typos, "


@@ -2013,7 +2023,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:930
+#: best-pkging-practices.dbk:936

 msgid ""
 "run <command>debconf-updatepo</command>.  This will fuzzy all strings you "
 "modified in translations.  You can see this by running the above again"
 msgid ""
 "run <command>debconf-updatepo</command>.  This will fuzzy all strings you "
 "modified in translations.  You can see this by running the above again"


@@ -2024,20 +2034,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:936
+#: best-pkging-practices.dbk:942

 msgid "use the following command:"
 msgstr "utilisez la commande suivante :"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 msgid "use the following command:"
 msgstr "utilisez la commande suivante :"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>

-#: best-pkging-practices.dbk:938
+#: best-pkging-practices.dbk:944

 #, no-wrap
 msgid "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
 msgstr "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #, no-wrap
 msgid "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
 msgstr "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:942
+#: best-pkging-practices.dbk:948

 msgid ""
 "move back to debian/po the files which showed fuzzy strings in the first step"
 msgstr ""
 msgid ""
 "move back to debian/po the files which showed fuzzy strings in the first step"
 msgstr ""


@@ -2046,19 +2056,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:947
+#: best-pkging-practices.dbk:953

 msgid "run <command>debconf-updatepo</command> again"
 msgstr "exécutez la commande <command>debconf-updatepo</command> à nouveau"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 msgid "run <command>debconf-updatepo</command> again"
 msgstr "exécutez la commande <command>debconf-updatepo</command> à nouveau"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:954
+#: best-pkging-practices.dbk:960

 msgid "Do not make assumptions about interfaces"
 msgstr "Ne faites pas de suppositions sur les interfaces utilisateurs"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Do not make assumptions about interfaces"
 msgstr "Ne faites pas de suppositions sur les interfaces utilisateurs"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:956
+#: best-pkging-practices.dbk:962

 #, fuzzy
 msgid ""
 "Templates text should not make reference to widgets belonging to some "
 #, fuzzy
 msgid ""
 "Templates text should not make reference to widgets belonging to some "


@@ -2073,7 +2083,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:961
+#: best-pkging-practices.dbk:967

 msgid ""
 "String templates should also avoid mentioning the default values in their "
 "description.  First, because this is redundant with the values seen by the "
 msgid ""
 "String templates should also avoid mentioning the default values in their "
 "description.  First, because this is redundant with the values seen by the "


@@ -2088,7 +2098,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:967
+#: best-pkging-practices.dbk:973

 msgid ""
 "More generally speaking, try to avoid referring to user actions.  Just give "
 "facts."
 msgid ""
 "More generally speaking, try to avoid referring to user actions.  Just give "
 "facts."


@@ -2098,13 +2108,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:973
+#: best-pkging-practices.dbk:979

 msgid "Do not use first person"
 msgstr "N'utilisez pas la première personne"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Do not use first person"
 msgstr "N'utilisez pas la première personne"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:975
+#: best-pkging-practices.dbk:981

 #, fuzzy
 msgid ""
 "You should avoid the use of first person (<emphasis>I will do this...</"
 #, fuzzy
 msgid ""
 "You should avoid the use of first person (<emphasis>I will do this...</"


@@ -2127,13 +2137,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:985
+#: best-pkging-practices.dbk:991

 msgid "Be gender neutral"
 msgstr "Restez neutre en genre"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Be gender neutral"
 msgstr "Restez neutre en genre"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:987
+#: best-pkging-practices.dbk:993

 msgid ""
 "The world is made of men and women.  Please use gender-neutral constructions "
 "in your writing."
 msgid ""
 "The world is made of men and women.  Please use gender-neutral constructions "
 "in your writing."


@@ -2143,13 +2153,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:995
+#: best-pkging-practices.dbk:1001

 msgid "Templates fields definition"
 msgstr "Définition de champs des modèles (« templates »)"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Templates fields definition"
 msgstr "Définition de champs des modèles (« templates »)"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:997
+#: best-pkging-practices.dbk:1003

 msgid ""
 "This part gives some information which is mostly taken from the "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> <manvolnum>7</"
 msgid ""
 "This part gives some information which is mostly taken from the "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> <manvolnum>7</"


@@ -2161,19 +2171,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1002
+#: best-pkging-practices.dbk:1008

 msgid "Type"
 msgstr "Type"
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 msgid "Type"
 msgstr "Type"
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1004
+#: best-pkging-practices.dbk:1010

 msgid "string:"
 msgstr "string:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "string:"
 msgstr "string:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1006
+#: best-pkging-practices.dbk:1012

 msgid ""
 "Results in a free-form input field that the user can type any string into."
 msgstr ""
 msgid ""
 "Results in a free-form input field that the user can type any string into."
 msgstr ""


@@ -2182,13 +2192,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1011
+#: best-pkging-practices.dbk:1017

 msgid "password:"
 msgstr "password:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "password:"
 msgstr "password:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1013
+#: best-pkging-practices.dbk:1019

 msgid ""
 "Prompts the user for a password.  Use this with caution; be aware that the "
 "password the user enters will be written to debconf's database.  You should "
 msgid ""
 "Prompts the user for a password.  Use this with caution; be aware that the "
 "password the user enters will be written to debconf's database.  You should "


@@ -2200,13 +2210,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1020
+#: best-pkging-practices.dbk:1026

 msgid "boolean:"
 msgstr "boolean:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "boolean:"
 msgstr "boolean:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1022
+#: best-pkging-practices.dbk:1028

 msgid ""
 "A true/false choice.  Remember: true/false, <emphasis role=\"strong\">not "
 "yes/no</emphasis>..."
 msgid ""
 "A true/false choice.  Remember: true/false, <emphasis role=\"strong\">not "
 "yes/no</emphasis>..."


@@ -2216,13 +2226,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1028
+#: best-pkging-practices.dbk:1034

 msgid "select:"
 msgstr "select:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "select:"
 msgstr "select:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1030
+#: best-pkging-practices.dbk:1036

 #, fuzzy
 msgid ""
 "A choice between one of a number of values.  The choices must be specified "
 #, fuzzy
 msgid ""
 "A choice between one of a number of values.  The choices must be specified "


@@ -2235,7 +2245,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1035
+#: best-pkging-practices.dbk:1041

 msgid ""
 "If choices are translatable strings, the 'Choices' field may be marked as "
 "translatable by using <literal>__Choices</literal>. The double underscore "
 msgid ""
 "If choices are translatable strings, the 'Choices' field may be marked as "
 "translatable by using <literal>__Choices</literal>. The double underscore "


@@ -2244,7 +2254,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1040
+#: best-pkging-practices.dbk:1046

 msgid ""
 "The <command>po-debconf</command> system also offers interesting "
 "possibilities to only mark <emphasis role=\"strong\">some</emphasis> choices "
 msgid ""
 "The <command>po-debconf</command> system also offers interesting "
 "possibilities to only mark <emphasis role=\"strong\">some</emphasis> choices "


@@ -2252,7 +2262,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><programlisting>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><programlisting>

-#: best-pkging-practices.dbk:1045
+#: best-pkging-practices.dbk:1051

 #, no-wrap
 msgid ""
 "Template: foo/bar\n"
 #, no-wrap
 msgid ""
 "Template: foo/bar\n"


@@ -2265,7 +2275,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1053
+#: best-pkging-practices.dbk:1059

 msgid ""
 "In that example, only the 'Other' string is translatable while others are "
 "acronyms that should not be translated. The above allows only 'Other' to be "
 msgid ""
 "In that example, only the 'Other' string is translatable while others are "
 "acronyms that should not be translated. The above allows only 'Other' to be "


@@ -2274,7 +2284,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1058
+#: best-pkging-practices.dbk:1064

 #, fuzzy
 msgid ""
 "The debconf templates flag system offers many such possibilities. The "
 #, fuzzy
 msgid ""
 "The debconf templates flag system offers many such possibilities. The "


@@ -2287,13 +2297,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1066
+#: best-pkging-practices.dbk:1072

 msgid "multiselect:"
 msgstr "multiselect:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "multiselect:"
 msgstr "multiselect:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1068
+#: best-pkging-practices.dbk:1074

 msgid ""
 "Like the select data type, except the user can choose any number of items "
 "from the choices list (or chose none of them)."
 msgid ""
 "Like the select data type, except the user can choose any number of items "
 "from the choices list (or chose none of them)."


@@ -2303,13 +2313,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1074
+#: best-pkging-practices.dbk:1080

 msgid "note:"
 msgstr "note:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "note:"
 msgstr "note:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1076
+#: best-pkging-practices.dbk:1082

 msgid ""
 "Rather than being a question per se, this datatype indicates a note that can "
 "be displayed to the user.  It should be used only for important notes that "
 msgid ""
 "Rather than being a question per se, this datatype indicates a note that can "
 "be displayed to the user.  It should be used only for important notes that "


@@ -2326,25 +2336,25 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1085
+#: best-pkging-practices.dbk:1091

 msgid "text:"
 msgstr "text:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "text:"
 msgstr "text:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1087
+#: best-pkging-practices.dbk:1093

 msgid "This type is now considered obsolete: don't use it."
 msgstr "ce type de données est obsolète. Il ne faut pas l'utiliser."
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 msgid "This type is now considered obsolete: don't use it."
 msgstr "ce type de données est obsolète. Il ne faut pas l'utiliser."
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1092
+#: best-pkging-practices.dbk:1098

 msgid "error:"
 msgstr "error:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "error:"
 msgstr "error:"
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1094
+#: best-pkging-practices.dbk:1100

 msgid ""
 "This type is designed to handle error messages.  It is mostly similar to the "
 "note type.  Frontends may present it differently (for instance, the dialog "
 msgid ""
 "This type is designed to handle error messages.  It is mostly similar to the "
 "note type.  Frontends may present it differently (for instance, the dialog "


@@ -2357,7 +2367,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1099
+#: best-pkging-practices.dbk:1105

 msgid ""
 "It is recommended to use this type for any message that needs user attention "
 "for a correction of any kind."
 msgid ""
 "It is recommended to use this type for any message that needs user attention "
 "for a correction of any kind."


@@ -2368,13 +2378,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1107
+#: best-pkging-practices.dbk:1113

 msgid "Description: short and extended description"
 msgstr "Description: description courte et étendue"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Description: short and extended description"
 msgstr "Description: description courte et étendue"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1109
+#: best-pkging-practices.dbk:1115

 msgid ""
 "Template descriptions have two parts: short and extended.  The short "
 "description is in the Description: line of the template."
 msgid ""
 "Template descriptions have two parts: short and extended.  The short "
 "description is in the Description: line of the template."


@@ -2385,7 +2395,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1113
+#: best-pkging-practices.dbk:1119

 msgid ""
 "The short description should be kept short (50 characters or so) so that it "
 "may be accomodated by most debconf interfaces.  Keeping it short also helps "
 msgid ""
 "The short description should be kept short (50 characters or so) so that it "
 "may be accomodated by most debconf interfaces.  Keeping it short also helps "


@@ -2399,7 +2409,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1119
+#: best-pkging-practices.dbk:1125

 msgid ""
 "The short description should be able to stand on its own.  Some interfaces "
 "do not show the long description by default, or only if the user explicitely "
 msgid ""
 "The short description should be able to stand on its own.  Some interfaces "
 "do not show the long description by default, or only if the user explicitely "


@@ -2413,7 +2423,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1125
+#: best-pkging-practices.dbk:1131

 msgid ""
 "The short description does not necessarily have to be a full sentence.  This "
 "is part of the keep it short and efficient recommendation."
 msgid ""
 "The short description does not necessarily have to be a full sentence.  This "
 "is part of the keep it short and efficient recommendation."


@@ -2423,7 +2433,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1129
+#: best-pkging-practices.dbk:1135

 msgid ""
 "The extended description should not repeat the short description word for "
 "word.  If you can't think up a long description, then first, think some "
 msgid ""
 "The extended description should not repeat the short description word for "
 "word.  If you can't think up a long description, then first, think some "


@@ -2439,7 +2449,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1136
+#: best-pkging-practices.dbk:1142

 msgid ""
 "The extended description should use complete sentences.  Paragraphs should "
 "be kept short for improved readability.  Do not mix two ideas in the same "
 msgid ""
 "The extended description should use complete sentences.  Paragraphs should "
 "be kept short for improved readability.  Do not mix two ideas in the same "


@@ -2451,7 +2461,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1141
+#: best-pkging-practices.dbk:1147

 msgid ""
 "Don't be too verbose.  User tend to ignore too long screens.  20 lines are "
 "by experience a border you shouldn't cross, because that means that in the "
 msgid ""
 "Don't be too verbose.  User tend to ignore too long screens.  20 lines are "
 "by experience a border you shouldn't cross, because that means that in the "


@@ -2466,7 +2476,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1147
+#: best-pkging-practices.dbk:1153

 msgid ""
 "The extended description should <emphasis role=\"strong\">never</emphasis> "
 "include a question."
 msgid ""
 "The extended description should <emphasis role=\"strong\">never</emphasis> "
 "include a question."


@@ -2476,7 +2486,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1151
+#: best-pkging-practices.dbk:1157

 msgid ""
 "For specific rules depending on templates type (string, boolean, etc.), "
 "please read below."
 msgid ""
 "For specific rules depending on templates type (string, boolean, etc.), "
 "please read below."


@@ -2486,13 +2496,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1157
+#: best-pkging-practices.dbk:1163

 msgid "Choices"
 msgstr "Choices"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Choices"
 msgstr "Choices"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1159
+#: best-pkging-practices.dbk:1165

 msgid ""
 "This field should be used for Select and Multiselect types.  It contains the "
 "possible choices which will be presented to users.  These choices should be "
 msgid ""
 "This field should be used for Select and Multiselect types.  It contains the "
 "possible choices which will be presented to users.  These choices should be "


@@ -2504,13 +2514,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1166
+#: best-pkging-practices.dbk:1172

 msgid "Default"
 msgstr "Default"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Default"
 msgstr "Default"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1168
+#: best-pkging-practices.dbk:1174

 msgid ""
 "This field is optional.  It contains the default answer for string, select "
 "and multiselect templates.  For multiselect templates, it may contain a "
 msgid ""
 "This field is optional.  It contains the default answer for string, select "
 "and multiselect templates.  For multiselect templates, it may contain a "


@@ -2522,19 +2532,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1177
+#: best-pkging-practices.dbk:1183

 msgid "Templates fields specific style guide"
 msgstr "Guide de style spécifique à certains modèles"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 msgid "Templates fields specific style guide"
 msgstr "Guide de style spécifique à certains modèles"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1179
+#: best-pkging-practices.dbk:1185

 msgid "Type field"
 msgstr "Champ type"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Type field"
 msgstr "Champ type"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1181
+#: best-pkging-practices.dbk:1187

 msgid ""
 "No specific indication except: use the appropriate type by referring to the "
 "previous section."
 msgid ""
 "No specific indication except: use the appropriate type by referring to the "
 "previous section."


@@ -2544,13 +2554,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1187
+#: best-pkging-practices.dbk:1193

 msgid "Description field"
 msgstr "Champ Description"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Description field"
 msgstr "Champ Description"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1189
+#: best-pkging-practices.dbk:1195

 msgid ""
 "Below are specific instructions for properly writing the Description (short "
 "and extended) depending on the template type."
 msgid ""
 "Below are specific instructions for properly writing the Description (short "
 "and extended) depending on the template type."


@@ -2560,13 +2570,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1193
+#: best-pkging-practices.dbk:1199

 msgid "String/password templates"
 msgstr "Modèles string et password"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 msgid "String/password templates"
 msgstr "Modèles string et password"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1197
+#: best-pkging-practices.dbk:1203

 msgid ""
 "The short description is a prompt and <emphasis role=\"strong\">not</"
 "emphasis> a title.  Avoid question style prompts (IP Address?) in favour of "
 msgid ""
 "The short description is a prompt and <emphasis role=\"strong\">not</"
 "emphasis> a title.  Avoid question style prompts (IP Address?) in favour of "


@@ -2579,7 +2589,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1204
+#: best-pkging-practices.dbk:1210

 msgid ""
 "The extended description is a complement to the short description.  In the "
 "extended part, explain what is being asked, rather than ask the same "
 msgid ""
 "The extended description is a complement to the short description.  In the "
 "extended part, explain what is being asked, rather than ask the same "


@@ -2592,13 +2602,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1214
+#: best-pkging-practices.dbk:1220

 msgid "Boolean templates"
 msgstr "Modèles « boolean »"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 msgid "Boolean templates"
 msgstr "Modèles « boolean »"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1218
+#: best-pkging-practices.dbk:1224

 msgid ""
 "The short description should be phrased in the form of a question which "
 "should be kept short and should generally end with a question mark.  Terse "
 msgid ""
 "The short description should be phrased in the form of a question which "
 "should be kept short and should generally end with a question mark.  Terse "


@@ -2612,7 +2622,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1226
+#: best-pkging-practices.dbk:1232

 msgid ""
 "Again, please avoid referring to specific interface widgets.  A common "
 "mistake for such templates is if you answer Yes-type constructions."
 msgid ""
 "Again, please avoid referring to specific interface widgets.  A common "
 "mistake for such templates is if you answer Yes-type constructions."


@@ -2623,13 +2633,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1234
+#: best-pkging-practices.dbk:1240

 msgid "Select/Multiselect"
 msgstr "Select/Multiselect"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 msgid "Select/Multiselect"
 msgstr "Select/Multiselect"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1238
+#: best-pkging-practices.dbk:1244

 msgid ""
 "The short description is a prompt and <emphasis role=\"strong\">not</"
 "emphasis> a title.  Do <emphasis role=\"strong\">not</emphasis> use useless "
 msgid ""
 "The short description is a prompt and <emphasis role=\"strong\">not</"
 "emphasis> a title.  Do <emphasis role=\"strong\">not</emphasis> use useless "


@@ -2644,7 +2654,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1246
+#: best-pkging-practices.dbk:1252

 msgid ""
 "The extended description will complete the short description.  It may refer "
 "to the available choices.  It may also mention that the user may choose more "
 msgid ""
 "The extended description will complete the short description.  It may refer "
 "to the available choices.  It may also mention that the user may choose more "


@@ -2659,19 +2669,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1256
+#: best-pkging-practices.dbk:1262

 msgid "Notes"
 msgstr "Notes"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 msgid "Notes"
 msgstr "Notes"
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1260
+#: best-pkging-practices.dbk:1266

 msgid "The short description should be considered to be a *title*."
 msgstr "La description courte doit être considérée comme un *titre*."
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 msgid "The short description should be considered to be a *title*."
 msgstr "La description courte doit être considérée comme un *titre*."
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1265
+#: best-pkging-practices.dbk:1271

 msgid ""
 "The extended description is what will be displayed as a more detailed "
 "explanation of the note.  Phrases, no terse writing style."
 msgid ""
 "The extended description is what will be displayed as a more detailed "
 "explanation of the note.  Phrases, no terse writing style."


@@ -2681,7 +2691,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1271
+#: best-pkging-practices.dbk:1277

 msgid ""
 "<emphasis role=\"strong\">Do not abuse debconf.</emphasis> Notes are the "
 "most common way to abuse debconf.  As written in debconf-devel manual page: "
 msgid ""
 "<emphasis role=\"strong\">Do not abuse debconf.</emphasis> Notes are the "
 "most common way to abuse debconf.  As written in debconf-devel manual page: "


@@ -2702,13 +2712,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1286
+#: best-pkging-practices.dbk:1292

 msgid "Choices field"
 msgstr "Champ Choices"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Choices field"
 msgstr "Champ Choices"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1288
+#: best-pkging-practices.dbk:1294

 msgid ""
 "If the Choices are likely to change often, please consider using the "
 "__Choices trick.  This will split each individual choice into a single "
 msgid ""
 "If the Choices are likely to change often, please consider using the "
 "__Choices trick.  This will split each individual choice into a single "


@@ -2721,13 +2731,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1295 best-pkging-practices.dbk:1333
+#: best-pkging-practices.dbk:1301 best-pkging-practices.dbk:1339

 msgid "Default field"
 msgstr "Champ Default"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Default field"
 msgstr "Champ Default"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1297
+#: best-pkging-practices.dbk:1303

 msgid ""
 "If the default value, for a select template, is likely to vary depending on "
 "the user language (for instance, if the choice is a language choice), please "
 msgid ""
 "If the default value, for a select template, is likely to vary depending on "
 "the user language (for instance, if the choice is a language choice), please "


@@ -2739,7 +2749,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1302
+#: best-pkging-practices.dbk:1308

 #, fuzzy
 msgid ""
 "This special field allow translators to put the most appropriate choice "
 #, fuzzy
 msgid ""
 "This special field allow translators to put the most appropriate choice "


@@ -2754,13 +2764,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1308
+#: best-pkging-practices.dbk:1314

 msgid "Example, taken from the geneweb package templates:"
 msgstr "Exemple, pris dans le paquet geneweb :"
 
 # type: Content of: <chapter><section><section><section><screen>
 #. type: Content of: <chapter><section><section><section><screen>
 msgid "Example, taken from the geneweb package templates:"
 msgstr "Exemple, pris dans le paquet geneweb :"
 
 # type: Content of: <chapter><section><section><section><screen>
 #. type: Content of: <chapter><section><section><section><screen>

-#: best-pkging-practices.dbk:1311
+#: best-pkging-practices.dbk:1317

 #, fuzzy, no-wrap
 msgid ""
 "Template: geneweb/lang\n"
 #, fuzzy, no-wrap
 msgid ""
 "Template: geneweb/lang\n"


@@ -2786,7 +2796,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1322
+#: best-pkging-practices.dbk:1328

 msgid ""
 "Note the use of brackets which allow internal comments in debconf fields.  "
 "Also note the use of comments which will show up in files the translators "
 msgid ""
 "Note the use of brackets which allow internal comments in debconf fields.  "
 "Also note the use of comments which will show up in files the translators "


@@ -2798,7 +2808,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1327
+#: best-pkging-practices.dbk:1333

 msgid ""
 "The comments are needed as the DefaultChoice trick is a bit confusing: the "
 "translators may put their own choice"
 msgid ""
 "The comments are needed as the DefaultChoice trick is a bit confusing: the "
 "translators may put their own choice"


@@ -2809,7 +2819,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1335
+#: best-pkging-practices.dbk:1341

 msgid ""
 "Do NOT use empty default field.  If you don't want to use default values, do "
 "not use Default at all."
 msgid ""
 "Do NOT use empty default field.  If you don't want to use default values, do "
 "not use Default at all."


@@ -2819,7 +2829,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1339
+#: best-pkging-practices.dbk:1345

 msgid ""
 "If you use po-debconf (and you <emphasis role=\"strong\">should</emphasis>, "
 "see 2.2), consider making this field translatable, if you think it may be "
 msgid ""
 "If you use po-debconf (and you <emphasis role=\"strong\">should</emphasis>, "
 "see 2.2), consider making this field translatable, if you think it may be "


@@ -2830,7 +2840,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1344
+#: best-pkging-practices.dbk:1350

 msgid ""
 "If the default value may vary depending on language/country (for instance "
 "the default value for a language choice), consider using the special "
 msgid ""
 "If the default value may vary depending on language/country (for instance "
 "the default value for a language choice), consider using the special "


@@ -2845,19 +2855,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: best-pkging-practices.dbk:1356
+#: best-pkging-practices.dbk:1362

 msgid "Internationalization"
 msgstr "Internationalisation"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgid "Internationalization"
 msgstr "Internationalisation"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1358
+#: best-pkging-practices.dbk:1364

 msgid "Handling debconf translations"
 msgstr "Gestion des traductions debconf"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Handling debconf translations"
 msgstr "Gestion des traductions debconf"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1360
+#: best-pkging-practices.dbk:1366

 msgid ""
 "Like porters, translators have a difficult task.  They work on many packages "
 "and must collaborate with many different maintainers.  Moreover, most of the "
 msgid ""
 "Like porters, translators have a difficult task.  They work on many packages "
 "and must collaborate with many different maintainers.  Moreover, most of the "


@@ -2872,7 +2882,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1366
+#: best-pkging-practices.dbk:1372

 msgid ""
 "The goal of <systemitem role=\"package\">debconf</systemitem> was to make "
 "packages configuration easier for maintainers and for users.  Originally, "
 msgid ""
 "The goal of <systemitem role=\"package\">debconf</systemitem> was to make "
 "packages configuration easier for maintainers and for users.  Originally, "


@@ -2895,7 +2905,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1376
+#: best-pkging-practices.dbk:1382

 msgid ""
 "Using <systemitem role=\"package\">po-debconf</systemitem>, the translation "
 "is stored in <filename>po</filename> files (drawing from <command>gettext</"
 msgid ""
 "Using <systemitem role=\"package\">po-debconf</systemitem>, the translation "
 "is stored in <filename>po</filename> files (drawing from <command>gettext</"


@@ -2925,13 +2935,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1392
+#: best-pkging-practices.dbk:1398

 msgid "Internationalized documentation"
 msgstr "Documentation internatonalisée"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Internationalized documentation"
 msgstr "Documentation internatonalisée"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1394
+#: best-pkging-practices.dbk:1400

 msgid ""
 "Internationalizing documentation is crucial for users, but a lot of labor.  "
 "There's no way to eliminate all that work, but you can make things easier "
 msgid ""
 "Internationalizing documentation is crucial for users, but a lot of labor.  "
 "There's no way to eliminate all that work, but you can make things easier "


@@ -2944,7 +2954,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1399
+#: best-pkging-practices.dbk:1405

 msgid ""
 "If you maintain documentation of any size, its easier for translators if "
 "they have access to a source control system.  That lets translators see the "
 msgid ""
 "If you maintain documentation of any size, its easier for translators if "
 "they have access to a source control system.  That lets translators see the "


@@ -2975,7 +2985,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1413
+#: best-pkging-practices.dbk:1419

 msgid ""
 "If you maintain XML or SGML documentation, we suggest that you isolate any "
 "language-independent information and define those as entities in a separate "
 msgid ""
 "If you maintain XML or SGML documentation, we suggest that you isolate any "
 "language-independent information and define those as entities in a separate "


@@ -2990,20 +3000,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: best-pkging-practices.dbk:1423
+#: best-pkging-practices.dbk:1429

 msgid "Common packaging situations"
 msgstr "Situation usuelle de gestion de paquets"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgid "Common packaging situations"
 msgstr "Situation usuelle de gestion de paquets"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1434
+#: best-pkging-practices.dbk:1440

 msgid "Packages using <command>autoconf</command>/<command>automake</command>"
 msgstr ""
 "Paquets qui utilisent <command>autoconf</command>/<command>automake</command>"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Packages using <command>autoconf</command>/<command>automake</command>"
 msgstr ""
 "Paquets qui utilisent <command>autoconf</command>/<command>automake</command>"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1436
+#: best-pkging-practices.dbk:1442

 msgid ""
 "Keeping <command>autoconf</command>'s <filename>config.sub</filename> and "
 "<filename>config.guess</filename> files up to date is critical for porters, "
 msgid ""
 "Keeping <command>autoconf</command>'s <filename>config.sub</filename> and "
 "<filename>config.guess</filename> files up to date is critical for porters, "


@@ -3025,13 +3035,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1448
+#: best-pkging-practices.dbk:1454

 msgid "Libraries"
 msgstr "Bibliothèques"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Libraries"
 msgstr "Bibliothèques"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1450
+#: best-pkging-practices.dbk:1456

 msgid ""
 "Libraries are always difficult to package for various reasons.  The policy "
 "imposes many constraints to ease their maintenance and to make sure upgrades "
 msgid ""
 "Libraries are always difficult to package for various reasons.  The policy "
 "imposes many constraints to ease their maintenance and to make sure upgrades "


@@ -3047,7 +3057,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1456
+#: best-pkging-practices.dbk:1462

 msgid ""
 "Good practices for library packaging have been grouped in <ulink url=\"&url-"
 "libpkg-guide;\">the library packaging guide</ulink>."
 msgid ""
 "Good practices for library packaging have been grouped in <ulink url=\"&url-"
 "libpkg-guide;\">the library packaging guide</ulink>."


@@ -3058,13 +3068,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1463
+#: best-pkging-practices.dbk:1469

 msgid "Documentation"
 msgstr "Documentation"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Documentation"
 msgstr "Documentation"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1465
+#: best-pkging-practices.dbk:1471

 msgid ""
 "Be sure to follow the <ulink url=\"&url-debian-policy;ch-docs.html\">Policy "
 "on documentation</ulink>."
 msgid ""
 "Be sure to follow the <ulink url=\"&url-debian-policy;ch-docs.html\">Policy "
 "on documentation</ulink>."


@@ -3074,7 +3084,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1470
+#: best-pkging-practices.dbk:1476

 msgid ""
 "If your package contains documentation built from XML or SGML, we recommend "
 "you not ship the XML or SGML source in the binary package(s).  If users want "
 msgid ""
 "If your package contains documentation built from XML or SGML, we recommend "
 "you not ship the XML or SGML source in the binary package(s).  If users want "


@@ -3087,7 +3097,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1475
+#: best-pkging-practices.dbk:1481

 msgid ""
 "Policy specifies that documentation should be shipped in HTML format.  We "
 "also recommend shipping documentation in PDF and plain text format if "
 msgid ""
 "Policy specifies that documentation should be shipped in HTML format.  We "
 "also recommend shipping documentation in PDF and plain text format if "


@@ -3103,7 +3113,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1482
+#: best-pkging-practices.dbk:1488

 msgid ""
 "Major shipped manuals should register themselves with <systemitem role="
 "\"package\">doc-base</systemitem> on installation.  See the <systemitem role="
 msgid ""
 "Major shipped manuals should register themselves with <systemitem role="
 "\"package\">doc-base</systemitem> on installation.  See the <systemitem role="


@@ -3114,15 +3124,35 @@ msgstr ""
 "installation. Veuillez consulter la documentation du paquet <systemitem role="
 "\"package\">doc-base</systemitem> pour plus d'informations."
 
 "installation. Veuillez consulter la documentation du paquet <systemitem role="
 "\"package\">doc-base</systemitem> pour plus d'informations."
 

+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1494
+msgid ""
+"Debian policy (section 12.1) directs that manual pages should accompany "
+"every program, utility, and function, and suggests them for other objects "
+"like configuration files. If the work you are packaging does not have such "
+"manual pages, consider writing them for inclusion in your package, and "
+"submitting them upstream."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1501
+msgid ""
+"The manpages do not need to be written directly in the troff format.  "
+"Popular source formats are Docbook, POD and reST, which can be converted "
+"using <command>xsltproc</command>, <command>pod2man</command> and "
+"<command>rst2man</command> respectively. To a lesser extent, the <command> "
+"help2man</command>program can also be used to write a stub."
+msgstr ""
+

 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1490
+#: best-pkging-practices.dbk:1510

 msgid "Specific types of packages"
 msgstr "Type particuliers de paquets"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Specific types of packages"
 msgstr "Type particuliers de paquets"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1492
+#: best-pkging-practices.dbk:1512

 msgid ""
 "Several specific types of packages have special sub-policies and "
 "corresponding packaging rules and practices:"
 msgid ""
 "Several specific types of packages have special sub-policies and "
 "corresponding packaging rules and practices:"


@@ -3132,7 +3162,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1498
+#: best-pkging-practices.dbk:1518

 msgid ""
 "Perl related packages have a <ulink url=\"&url-perl-policy;\">Perl policy</"
 "ulink>, some examples of packages following that policy are <systemitem role="
 msgid ""
 "Perl related packages have a <ulink url=\"&url-perl-policy;\">Perl policy</"
 "ulink>, some examples of packages following that policy are <systemitem role="


@@ -3147,7 +3177,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1507
+#: best-pkging-practices.dbk:1527

 msgid ""
 "Python related packages have their python policy; see &file-python-policy; "
 "in the <systemitem role=\"package\">python</systemitem> package."
 msgid ""
 "Python related packages have their python policy; see &file-python-policy; "
 "in the <systemitem role=\"package\">python</systemitem> package."


@@ -3158,7 +3188,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1514
+#: best-pkging-practices.dbk:1534

 msgid ""
 "Emacs related packages have the <ulink url=\"&url-emacs-policy;\">emacs "
 "policy</ulink>."
 msgid ""
 "Emacs related packages have the <ulink url=\"&url-emacs-policy;\">emacs "
 "policy</ulink>."


@@ -3168,7 +3198,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1521
+#: best-pkging-practices.dbk:1541

 msgid ""
 "Java related packages have their <ulink url=\"&url-java-policy;\">java "
 "policy</ulink>."
 msgid ""
 "Java related packages have their <ulink url=\"&url-java-policy;\">java "
 "policy</ulink>."


@@ -3178,7 +3208,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1528
+#: best-pkging-practices.dbk:1548

 msgid ""
 "Ocaml related packages have their own policy, found in &file-ocaml-policy; "
 "from the <systemitem role=\"package\">ocaml</systemitem> package.  A good "
 msgid ""
 "Ocaml related packages have their own policy, found in &file-ocaml-policy; "
 "from the <systemitem role=\"package\">ocaml</systemitem> package.  A good "


@@ -3192,7 +3222,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1536
+#: best-pkging-practices.dbk:1556

 msgid ""
 "Packages providing XML or SGML DTDs should conform to the recommendations "
 "found in the <systemitem role=\"package\">sgml-base-doc</systemitem> package."
 msgid ""
 "Packages providing XML or SGML DTDs should conform to the recommendations "
 "found in the <systemitem role=\"package\">sgml-base-doc</systemitem> package."


@@ -3203,7 +3233,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1542
+#: best-pkging-practices.dbk:1562

 msgid ""
 "Lisp packages should register themselves with <systemitem role=\"package"
 "\">common-lisp-controller</systemitem>, about which see &file-lisp-"
 msgid ""
 "Lisp packages should register themselves with <systemitem role=\"package"
 "\">common-lisp-controller</systemitem>, about which see &file-lisp-"


@@ -3215,13 +3245,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1572
+#: best-pkging-practices.dbk:1592

 msgid "Architecture-independent data"
 msgstr "Données indépendantes de l'architecture"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Architecture-independent data"
 msgstr "Données indépendantes de l'architecture"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1574
+#: best-pkging-practices.dbk:1594

 msgid ""
 "It is not uncommon to have a large amount of architecture-independent data "
 "packaged with a program.  For example, audio files, a collection of icons, "
 msgid ""
 "It is not uncommon to have a large amount of architecture-independent data "
 "packaged with a program.  For example, audio files, a collection of icons, "


@@ -3238,7 +3268,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1581
+#: best-pkging-practices.dbk:1601

 msgid ""
 "However, if the size of the data is considerable, consider splitting it out "
 "into a separate, architecture-independent package (_all.deb).  By doing "
 msgid ""
 "However, if the size of the data is considerable, consider splitting it out "
 "into a separate, architecture-independent package (_all.deb).  By doing "


@@ -3261,14 +3291,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1593
+#: best-pkging-practices.dbk:1613

 msgid "Needing a certain locale during build"
 msgstr ""
 "Nécessitant des paramètres régionaux spécifiques lors de la construction"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Needing a certain locale during build"
 msgstr ""
 "Nécessitant des paramètres régionaux spécifiques lors de la construction"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1595
+#: best-pkging-practices.dbk:1615

 msgid ""
 "If you need a certain locale during build, you can create a temporary file "
 "via this trick:"
 msgid ""
 "If you need a certain locale during build, you can create a temporary file "
 "via this trick:"


@@ -3279,7 +3309,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1599
+#: best-pkging-practices.dbk:1619

 msgid ""
 "If you set <varname>LOCPATH</varname> to the equivalent of <filename>/usr/"
 "lib/locale</filename>, and <varname>LC_ALL</varname> to the name of the "
 msgid ""
 "If you set <varname>LOCPATH</varname> to the equivalent of <filename>/usr/"
 "lib/locale</filename>, and <varname>LC_ALL</varname> to the name of the "


@@ -3294,7 +3324,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:1604
+#: best-pkging-practices.dbk:1624

 #, fuzzy, no-wrap
 msgid ""
 "LOCALE_PATH=debian/tmpdir/usr/lib/locale\n"
 #, fuzzy, no-wrap
 msgid ""
 "LOCALE_PATH=debian/tmpdir/usr/lib/locale\n"


@@ -3320,13 +3350,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1617
+#: best-pkging-practices.dbk:1637

 msgid "Make transition packages deborphan compliant"
 msgstr "Rendre les paquets de transition conformes à deborphan"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Make transition packages deborphan compliant"
 msgstr "Rendre les paquets de transition conformes à deborphan"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1619
+#: best-pkging-practices.dbk:1639

 msgid ""
 "Deborphan is a program for helping users to detect which packages can safely "
 "be removed from the system, i.e.  the ones that have no packages depending "
 msgid ""
 "Deborphan is a program for helping users to detect which packages can safely "
 "be removed from the system, i.e.  the ones that have no packages depending "


@@ -3343,7 +3373,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1626
+#: best-pkging-practices.dbk:1646

 msgid ""
 "For example, with <literal>--guess-dummy</literal>, <command>deborphan</"
 "command> tries to search all transitional packages which were needed for "
 msgid ""
 "For example, with <literal>--guess-dummy</literal>, <command>deborphan</"
 "command> tries to search all transitional packages which were needed for "


@@ -3358,7 +3388,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1633
+#: best-pkging-practices.dbk:1653

 msgid ""
 "So, when you are creating such a package, please make sure to add this text "
 "to your short description.  If you are looking for examples, just run: "
 msgid ""
 "So, when you are creating such a package, please make sure to add this text "
 "to your short description.  If you are looking for examples, just run: "


@@ -3372,14 +3402,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1641
+#: best-pkging-practices.dbk:1661

 msgid "Best practices for <filename>orig.tar.gz</filename> files"
 msgstr ""
 "Les meilleures pratiques pour les fichiers <filename>orig.tar.gz</filename>"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Best practices for <filename>orig.tar.gz</filename> files"
 msgstr ""
 "Les meilleures pratiques pour les fichiers <filename>orig.tar.gz</filename>"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1643
+#: best-pkging-practices.dbk:1663

 msgid ""
 "There are two kinds of original source tarballs: Pristine source and "
 "repackaged upstream source."
 msgid ""
 "There are two kinds of original source tarballs: Pristine source and "
 "repackaged upstream source."


@@ -3389,13 +3419,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1647
+#: best-pkging-practices.dbk:1667

 msgid "Pristine source"
 msgstr "Sources originelles (« pristine »)"
 
 # type: Content of: <chapter><section><section><section><para><footnote><para>
 #. type: Content of: <chapter><section><section><section><para><footnote><para>
 msgid "Pristine source"
 msgstr "Sources originelles (« pristine »)"
 
 # type: Content of: <chapter><section><section><section><para><footnote><para>
 #. type: Content of: <chapter><section><section><section><para><footnote><para>

-#: best-pkging-practices.dbk:1651
+#: best-pkging-practices.dbk:1671

 #, fuzzy
 msgid ""
 "We cannot prevent upstream authors from changing the tarball they distribute "
 #, fuzzy
 msgid ""
 "We cannot prevent upstream authors from changing the tarball they distribute "


@@ -3406,9 +3436,9 @@ msgid ""
 "emphasis> distribute.  If a difference arises later (say, if upstream "
 "notices that he wasn't using maximal compression in his original "
 "distribution and then re-<command>gzip</command>s it), that's just too bad.  "
 "emphasis> distribute.  If a difference arises later (say, if upstream "
 "notices that he wasn't using maximal compression in his original "
 "distribution and then re-<command>gzip</command>s it), that's just too bad.  "

-"Since there is no good way to upload a new <literal>.orig.tar.gz</literal> "
-"for the same version, there is not even any point in treating this situation "
-"as a bug."
+"Since there is no good way to upload a new <literal>.orig.tar.{gz,bz2}</"
+"literal> for the same version, there is not even any point in treating this "
+"situation as a bug."

 msgstr ""
 "Il est impossible d'empêcher les auteurs amont de modifier l'archive qu'ils "
 "distribuent sans également incrémenter le numéro de version. Il est donc "
 msgstr ""
 "Il est impossible d'empêcher les auteurs amont de modifier l'archive qu'ils "
 "distribuent sans également incrémenter le numéro de version. Il est donc "


@@ -3425,17 +3455,17 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1649
+#: best-pkging-practices.dbk:1669

 #, fuzzy
 msgid ""
 "The defining characteristic of a pristine source tarball is that the "
 #, fuzzy
 msgid ""
 "The defining characteristic of a pristine source tarball is that the "

-"<literal>.orig.tar.gz</literal> file is byte-for-byte identical to a tarball "
-"officially distributed by the upstream author.  <placeholder type=\"footnote"
-"\" id=\"0\"/> This makes it possible to use checksums to easily verify that "
-"all changes between Debian's version and upstream's are contained in the "
-"Debian diff.  Also, if the original source is huge, upstream authors and "
-"others who already have the upstream tarball can save download time if they "
-"want to inspect your packaging in detail."
+"<literal>.orig.tar.{gz,bz2}</literal> file is byte-for-byte identical to a "
+"tarball officially distributed by the upstream author.  <placeholder type="
+"\"footnote\" id=\"0\"/> This makes it possible to use checksums to easily "
+"verify that all changes between Debian's version and upstream's are "
+"contained in the Debian diff.  Also, if the original source is huge, "
+"upstream authors and others who already have the upstream tarball can save "
+"download time if they want to inspect your packaging in detail."

 msgstr ""
 "</footnote> Cela permet d'utiliser des sommes de contrôle pour vérifier que "
 "toutes les modifications effectuées entre la version Debian et la version "
 msgstr ""
 "</footnote> Cela permet d'utiliser des sommes de contrôle pour vérifier que "
 "toutes les modifications effectuées entre la version Debian et la version "


@@ -3446,7 +3476,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1669
+#: best-pkging-practices.dbk:1689

 msgid ""
 "There is no universally accepted guidelines that upstream authors follow "
 "regarding to the directory structure inside their tarball, but <command>dpkg-"
 msgid ""
 "There is no universally accepted guidelines that upstream authors follow "
 "regarding to the directory structure inside their tarball, but <command>dpkg-"


@@ -3461,13 +3491,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1677
+#: best-pkging-practices.dbk:1697

 msgid "It unpacks the tarball in an empty temporary directory by doing"
 msgstr "Elle extrait l'archive dans un répertoire temporaire :"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
 msgid "It unpacks the tarball in an empty temporary directory by doing"
 msgstr "Elle extrait l'archive dans un répertoire temporaire :"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>

-#: best-pkging-practices.dbk:1680
+#: best-pkging-practices.dbk:1700

 #, fuzzy, no-wrap
 msgid "zcat path/to/&lt;packagename&gt;_&lt;upstream-version&gt;.orig.tar.gz | tar xf -\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "zcat path/to/&lt;packagename&gt;_&lt;upstream-version&gt;.orig.tar.gz | tar xf -\n"
 msgstr ""


@@ -3476,7 +3506,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1685
+#: best-pkging-practices.dbk:1705

 msgid ""
 "If, after this, the temporary directory contains nothing but one directory "
 "and no other files, <command>dpkg-source</command> renames that directory to "
 msgid ""
 "If, after this, the temporary directory contains nothing but one directory "
 "and no other files, <command>dpkg-source</command> renames that directory to "


@@ -3491,7 +3521,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1694
+#: best-pkging-practices.dbk:1714

 msgid ""
 "Otherwise, the upstream tarball must have been packaged without a common top-"
 "level directory (shame on the upstream author!).  In this case, "
 msgid ""
 "Otherwise, the upstream tarball must have been packaged without a common top-"
 "level directory (shame on the upstream author!).  In this case, "


@@ -3506,13 +3536,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1705
+#: best-pkging-practices.dbk:1725

 msgid "Repackaged upstream source"
 msgstr "Source amont reconstruite"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Repackaged upstream source"
 msgstr "Source amont reconstruite"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1707
+#: best-pkging-practices.dbk:1727

 msgid ""
 "You <emphasis role=\"strong\">should</emphasis> upload packages with a "
 "pristine source tarball if possible, but there are various reasons why it "
 msgid ""
 "You <emphasis role=\"strong\">should</emphasis> upload packages with a "
 "pristine source tarball if possible, but there are various reasons why it "


@@ -3530,15 +3560,17 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1714
+#: best-pkging-practices.dbk:1734
+#, fuzzy

 msgid ""
 msgid ""

-"In these cases the developer must construct a suitable <literal>.orig.tar.gz "
-"</literal> file himself.  We refer to such a tarball as a repackaged "
-"upstream source.  Note that a repackaged upstream source is different from a "
-"Debian-native package.  A repackaged source still comes with Debian-specific "
-"changes in a separate <literal>.diff.gz</literal> and still has a version "
-"number composed of <literal>&lt;upstream-version&gt;</literal> and "
-"<literal>&lt;debian-revision&gt;</literal>."
+"In these cases the developer must construct a suitable <literal>.orig.tar."
+"{gz,bz2} </literal> file himself.  We refer to such a tarball as a "
+"repackaged upstream source.  Note that a repackaged upstream source is "
+"different from a Debian-native package.  A repackaged source still comes "
+"with Debian-specific changes in a separate <literal>.diff.gz</literal> or "
+"<literal>.debian.tar.{gz,bz2}</literal> and still has a version number "
+"composed of <literal>&lt;upstream-version&gt;</literal> and <literal>&lt;"
+"debian-revision&gt;</literal>."

 msgstr ""
 "Dans ces cas, le responsable doit construire menuellement une archive "
 "<literal>.orig.tar.gz </literal>. Cette archive sera appelée une archive "
 msgstr ""
 "Dans ces cas, le responsable doit construire menuellement une archive "
 "<literal>.orig.tar.gz </literal>. Cette archive sera appelée une archive "


@@ -3550,7 +3582,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1723
+#: best-pkging-practices.dbk:1743

 msgid ""
 "There may be cases where it is desirable to repackage the source even though "
 "upstream distributes a <literal>.tar.gz</literal> that could in principle be "
 msgid ""
 "There may be cases where it is desirable to repackage the source even though "
 "upstream distributes a <literal>.tar.gz</literal> that could in principle be "


@@ -3571,13 +3603,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1732
-msgid "A repackaged <literal>.orig.tar.gz</literal>"
+#: best-pkging-practices.dbk:1752
+#, fuzzy
+msgid "A repackaged <literal>.orig.tar.{gz,bz2}</literal>"

 msgstr "Un fichier <literal>.orig.tar.gz</literal> reconstruit"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgstr "Un fichier <literal>.orig.tar.gz</literal> reconstruit"
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1737
+#: best-pkging-practices.dbk:1757

 #, fuzzy
 msgid ""
 "should be documented in the resulting source package.  Detailed information "
 #, fuzzy
 msgid ""
 "should be documented in the resulting source package.  Detailed information "


@@ -3598,7 +3631,7 @@ msgstr ""
 "\">Le script de construction principal : debian/rules</ulink>."
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para><footnote><para>
 "\">Le script de construction principal : debian/rules</ulink>."
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para><footnote><para>

-#: best-pkging-practices.dbk:1752
+#: best-pkging-practices.dbk:1772

 msgid ""
 "As a special exception, if the omission of non-free files would lead to the "
 "source failing to build without assistance from the Debian diff, it might be "
 msgid ""
 "As a special exception, if the omission of non-free files would lead to the "
 "source failing to build without assistance from the Debian diff, it might be "


@@ -3609,7 +3642,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1750
+#: best-pkging-practices.dbk:1770

 msgid ""
 "<emphasis role=\"strong\">should not</emphasis> contain any file that does "
 "not come from the upstream author(s), or whose contents has been changed by "
 msgid ""
 "<emphasis role=\"strong\">should not</emphasis> contain any file that does "
 "not come from the upstream author(s), or whose contents has been changed by "


@@ -3618,7 +3651,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1763
+#: best-pkging-practices.dbk:1783

 msgid ""
 "<emphasis role=\"strong\">should</emphasis>, except where impossible for "
 "legal reasons, preserve the entire building and portablility infrastructure "
 msgid ""
 "<emphasis role=\"strong\">should</emphasis>, except where impossible for "
 "legal reasons, preserve the entire building and portablility infrastructure "


@@ -3631,7 +3664,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1772
+#: best-pkging-practices.dbk:1792

 msgid ""
 "(<emphasis>Rationale:</emphasis> It is common for Debian users who need to "
 "build software for non-Debian platforms to fetch the source from a Debian "
 msgid ""
 "(<emphasis>Rationale:</emphasis> It is common for Debian users who need to "
 "build software for non-Debian platforms to fetch the source from a Debian "


@@ -3640,7 +3673,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1779
+#: best-pkging-practices.dbk:1799

 msgid ""
 "<emphasis role=\"strong\">should</emphasis> use <literal>&lt;packagename&gt;-"
 "&lt;upstream-version&gt;.orig</literal> as the name of the top-level "
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> use <literal>&lt;packagename&gt;-"
 "&lt;upstream-version&gt;.orig</literal> as the name of the top-level "


@@ -3648,83 +3681,41 @@ msgid ""
 "tarballs from repackaged ones."
 msgstr ""
 
 "tarballs from repackaged ones."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1787
-msgid ""
-"<emphasis role=\"strong\">should</emphasis> be gzipped with maximal "
-"compression."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para>
-#. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1792
-msgid ""
-"The canonical way to meet the latter two points is to let <literal>dpkg-"
-"source -b</literal> construct the repackaged tarball from an unpacked "
-"directory."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><title>
-#. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1798
-msgid "Changing binary files in <literal>diff.gz</literal>"
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para><footnote><para>
-#. type: Content of: <chapter><section><section><section><para><footnote><para>

 #: best-pkging-practices.dbk:1807
 msgid ""
 #: best-pkging-practices.dbk:1807
 msgid ""

-"The file should have a name that makes it clear which binary file it "
-"encodes.  Usually, some postfix indicating the encoding should be appended "
-"to the original filename.  Note that you don't need to depend on <systemitem "
-"role=\"package\">sharutils</systemitem> to get the <command>uudecode</"
-"command> program if you use <command>perl</command>'s <literal>pack</"
-"literal> function.  The code could look like"
+"<emphasis role=\"strong\">should</emphasis> be gzipped or bzipped with "
+"maximal compression."

 msgstr ""
 
 msgstr ""
 

-#. type: Content of: <chapter><section><section><section><para><footnote>
-#: best-pkging-practices.dbk:1815
-msgid "&example-uu;"
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:1814
+msgid "Changing binary files"

 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1800
+#: best-pkging-practices.dbk:1816

 msgid ""
 "Sometimes it is necessary to change binary files contained in the original "
 msgid ""
 "Sometimes it is necessary to change binary files contained in the original "

-"tarball, or to add binary files that are not in it.  If this is done by "
-"simply copying the files into the debianized source tree, <command>dpkg-"
-"source</command> will not be able to handle this.  On the other hand, "
-"according to the guidelines given above, you cannot include such a changed "
-"binary file in a repackaged <filename>orig.tar.gz</filename>.  Instead, "
-"include the file in the <filename>debian</filename> directory in "
-"<command>uuencode</command>d (or similar) form <placeholder type=\"footnote"
-"\" id=\"0\"/>.  The file would then be decoded and copied to its place "
-"during the build process.  Thus the change will be visible quite easy."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para>
-#. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1821
-msgid ""
-"Some packages use <command>dbs</command> to manage patches to their upstream "
-"source, and always create a new <literal>orig.tar.gz</literal> file that "
-"contains the real <literal>orig.tar.gz</literal> in its toplevel directory.  "
-"This is questionable with respect to the preference for pristine source.  On "
-"the other hand, it is easy to modify or add binary files in this case: Just "
-"put them into the newly created <literal>orig.tar.gz</literal> file, besides "
-"the real one, and copy them to the right place during the build process."
+"tarball, or to add binary files that are not in it. This is fully supported "
+"when using source packages in “3.0 (quilt)” format, see the "
+"<citerefentry><refentrytitle>dpkg-source</refentrytitle><manvolnum>1</"
+"manvolnum></citerefentry> manual page for details. When using the older "
+"format “1.0”, binary files can't be stored in the <filename>.diff.gz</"
+"filename> so you must store an <command>uuencode</command>d (or similar) "
+"version of the file(s)  and decode it at build time in <filename>debian/"
+"rules</filename> (and move it in its official location)."

 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1834
+#: best-pkging-practices.dbk:1831

 msgid "Best practices for debug packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Best practices for debug packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1836
+#: best-pkging-practices.dbk:1833

 msgid ""
 "A debug package is a package with a name ending in -dbg, that contains "
 "additional information that gdb can use.  Since Debian binaries are stripped "
 msgid ""
 "A debug package is a package with a name ending in -dbg, that contains "
 "additional information that gdb can use.  Since Debian binaries are stripped "


@@ -3736,7 +3727,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1844
+#: best-pkging-practices.dbk:1841

 msgid ""
 "It is up to a package's maintainer whether to create a debug package or "
 "not.  Maintainers are encouraged to create debug packages for library "
 msgid ""
 "It is up to a package's maintainer whether to create a debug package or "
 "not.  Maintainers are encouraged to create debug packages for library "


@@ -3750,7 +3741,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1854
+#: best-pkging-practices.dbk:1851

 msgid ""
 "Some debug packages may contain an entire special debugging build of a "
 "library or other binary, but most of them can save space and build time by "
 msgid ""
 "Some debug packages may contain an entire special debugging build of a "
 "library or other binary, but most of them can save space and build time by "


@@ -3766,7 +3757,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1866
+#: best-pkging-practices.dbk:1863

 msgid ""
 "The debugging symbols can be extracted from an object file using <command> "
 "objcopy --only-keep-debug</command>.  Then the object file can be stripped, "
 msgid ""
 "The debugging symbols can be extracted from an object file using <command> "
 "objcopy --only-keep-debug</command>.  Then the object file can be stripped, "


@@ -3778,7 +3769,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1874
+#: best-pkging-practices.dbk:1871

 msgid ""
 "The <command>dh_strip</command> command in debhelper supports creating debug "
 "packages, and can take care of using <command>objcopy</command> to separate "
 msgid ""
 "The <command>dh_strip</command> command in debhelper supports creating debug "
 "packages, and can take care of using <command>objcopy</command> to separate "


@@ -3789,14 +3780,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1881
+#: best-pkging-practices.dbk:1878

 msgid ""
 "Note that the debug package should depend on the package that it provides "
 "debugging symbols for, and this dependency should be versioned.  For example:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgid ""
 "Note that the debug package should depend on the package that it provides "
 "debugging symbols for, and this dependency should be versioned.  For example:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:1885
+#: best-pkging-practices.dbk:1882

 #, no-wrap
 msgid "Depends: libfoo (= ${binary:Version})\n"
 msgstr ""
 #, no-wrap
 msgid "Depends: libfoo (= ${binary:Version})\n"
 msgstr ""

diff --git a/po4a/fr/beyond-pkging.po b/po4a/fr/beyond-pkging.po
index 2a4975443dc00ba53eddc72cd569f87650b4f676..f7ff5024f61a89fc0ad31cea6f749c88f07439bc 100644 (file)
--- a/po4a/fr/beyond-pkging.po
+++ b/po4a/fr/beyond-pkging.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2009-01-23 09:48+0100\n"
+"POT-Creation-Date: 2010-01-04 00:20+0100\n"

 "PO-Revision-Date: 2007-07-01 23:09+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "PO-Revision-Date: 2007-07-01 23:09+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"


@@ -17,11 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 
 # type: Content of: <chapter><title>
 "Content-Transfer-Encoding: \n"
 
 # type: Content of: <chapter><title>

+#. type: Content of: <chapter><title>

 #: beyond-pkging.dbk:7
 msgid "Beyond Packaging"
 msgstr "Au-delà de l'empaquetage"
 
 # type: Content of: <chapter><para>
 #: beyond-pkging.dbk:7
 msgid "Beyond Packaging"
 msgstr "Au-delà de l'empaquetage"
 
 # type: Content of: <chapter><para>

+#. type: Content of: <chapter><para>

 #: beyond-pkging.dbk:9
 msgid ""
 "Debian is about a lot more than just packaging software and maintaining "
 #: beyond-pkging.dbk:9
 msgid ""
 "Debian is about a lot more than just packaging software and maintaining "


@@ -31,6 +33,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><para>
 msgstr ""
 
 # type: Content of: <chapter><para>

+#. type: Content of: <chapter><para>

 #: beyond-pkging.dbk:14
 msgid ""
 "As a volunteer organization, Debian relies on the discretion of its members "
 #: beyond-pkging.dbk:14
 msgid ""
 "As a volunteer organization, Debian relies on the discretion of its members "


@@ -39,11 +42,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

+#. type: Content of: <chapter><section><title>

 #: beyond-pkging.dbk:19
 msgid "Bug reporting"
 msgstr "Rapporter des bogues"
 
 # type: Content of: <chapter><section><para>
 #: beyond-pkging.dbk:19
 msgid "Bug reporting"
 msgstr "Rapporter des bogues"
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:21
 msgid ""
 "We encourage you to file bugs as you find them in Debian packages.  In fact, "
 #: beyond-pkging.dbk:21
 msgid ""
 "We encourage you to file bugs as you find them in Debian packages.  In fact, "


@@ -52,6 +57,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:26
 msgid ""
 "Read the <ulink url=\"&url-bts-report;\">instructions for reporting bugs</"
 #: beyond-pkging.dbk:26
 msgid ""
 "Read the <ulink url=\"&url-bts-report;\">instructions for reporting bugs</"


@@ -59,6 +65,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:31
 msgid ""
 "Try to submit the bug from a normal user account at which you are likely to "
 #: beyond-pkging.dbk:31
 msgid ""
 "Try to submit the bug from a normal user account at which you are likely to "


@@ -67,6 +74,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:36
 msgid ""
 "You can use a tool like <citerefentry> <refentrytitle>reportbug</"
 #: beyond-pkging.dbk:36
 msgid ""
 "You can use a tool like <citerefentry> <refentrytitle>reportbug</"


@@ -75,6 +83,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:41
 msgid ""
 "Make sure the bug is not already filed against a package.  Each package has "
 #: beyond-pkging.dbk:41
 msgid ""
 "Make sure the bug is not already filed against a package.  Each package has "


@@ -87,6 +96,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:50
 msgid ""
 "Try to direct your bugs to the proper location.  When for example your bug "
 #: beyond-pkging.dbk:50
 msgid ""
 "Try to direct your bugs to the proper location.  When for example your bug "


@@ -96,6 +106,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:56
 msgid ""
 "For extra credit, you can go through other packages, merging bugs which are "
 #: beyond-pkging.dbk:56
 msgid ""
 "For extra credit, you can go through other packages, merging bugs which are "


@@ -106,6 +117,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:63
 msgid ""
 "From time to time you may want to check what has been going on with the bug "
 #: beyond-pkging.dbk:63
 msgid ""
 "From time to time you may want to check what has been going on with the bug "


@@ -116,11 +128,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

+#. type: Content of: <chapter><section><section><title>

 #: beyond-pkging.dbk:70
 msgid "Reporting lots of bugs at once (mass bug filing)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #: beyond-pkging.dbk:70
 msgid "Reporting lots of bugs at once (mass bug filing)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:72
 msgid ""
 "Reporting a great number of bugs for the same problem on a great number of "
 #: beyond-pkging.dbk:72
 msgid ""
 "Reporting a great number of bugs for the same problem on a great number of "


@@ -131,6 +145,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:79
 msgid ""
 "If you report more than 10 bugs on the same topic at once, it is recommended "
 #: beyond-pkging.dbk:79
 msgid ""
 "If you report more than 10 bugs on the same topic at once, it is recommended "


@@ -141,16 +156,17 @@ msgid ""
 "maintainers start filing the same bug report simultaneously."
 msgstr ""
 
 "maintainers start filing the same bug report simultaneously."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:87
 msgid ""
 #: beyond-pkging.dbk:87
 msgid ""

-"Please use the programms <command>dd-list</command> and if appropriate "
+"Please use the programs <command>dd-list</command> and if appropriate "

 "<command>whodepends</command> (from the package devscripts) to generate a "
 "list of all affected packages, and include the output in your mail to &email-"
 "debian-devel;."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 "<command>whodepends</command> (from the package devscripts) to generate a "
 "list of all affected packages, and include the output in your mail to &email-"
 "debian-devel;."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:93
 msgid ""
 "Note that when sending lots of bugs on the same subject, you should send the "
 #: beyond-pkging.dbk:93
 msgid ""
 "Note that when sending lots of bugs on the same subject, you should send the "


@@ -159,11 +175,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

+#. type: Content of: <chapter><section><section><section><title>

 #: beyond-pkging.dbk:98
 msgid "Usertags"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #: beyond-pkging.dbk:98
 msgid "Usertags"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

+#. type: Content of: <chapter><section><section><section><para>

 #: beyond-pkging.dbk:100
 msgid ""
 "You may wish to use BTS usertags when submitting bugs across a number of "
 #: beyond-pkging.dbk:100
 msgid ""
 "You may wish to use BTS usertags when submitting bugs across a number of "


@@ -174,17 +192,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

+#. type: Content of: <chapter><section><section><section><para>

 #: beyond-pkging.dbk:107
 msgid ""
 "To add usertags when filing bugs, specify the <literal>User</literal> and "
 "<literal>Usertags</literal> pseudo-headers:"
 msgstr ""
 
 #: beyond-pkging.dbk:107
 msgid ""
 "To add usertags when filing bugs, specify the <literal>User</literal> and "
 "<literal>Usertags</literal> pseudo-headers:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><screen>
-#: beyond-pkging.dbk:110
+#. type: Content of: <chapter><section><section><section><screen>
+#: beyond-pkging.dbk:111

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"\n"

 "To: submit@bugs.debian.org\n"
 "Subject: <replaceable>&lt;title-of-bug&gt;</replaceable>\n"
 "\n"
 "To: submit@bugs.debian.org\n"
 "Subject: <replaceable>&lt;title-of-bug&gt;</replaceable>\n"
 "\n"


@@ -197,6 +215,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

+#. type: Content of: <chapter><section><section><section><para>

 #: beyond-pkging.dbk:122
 msgid ""
 "Note that tags are seperated by spaces and cannot contain underscores. If "
 #: beyond-pkging.dbk:122
 msgid ""
 "Note that tags are seperated by spaces and cannot contain underscores. If "


@@ -206,6 +225,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

+#. type: Content of: <chapter><section><section><section><para>

 #: beyond-pkging.dbk:128
 msgid ""
 "To view bugs tagged with a specific usertag, visit <literal>http://&bugs-"
 #: beyond-pkging.dbk:128
 msgid ""
 "To view bugs tagged with a specific usertag, visit <literal>http://&bugs-"


@@ -214,16 +234,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

+#. type: Content of: <chapter><section><title>

 #: beyond-pkging.dbk:137
 msgid "Quality Assurance effort"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #: beyond-pkging.dbk:137
 msgid "Quality Assurance effort"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

+#. type: Content of: <chapter><section><section><title>

 #: beyond-pkging.dbk:139
 msgid "Daily work"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #: beyond-pkging.dbk:139
 msgid "Daily work"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:141
 msgid ""
 "Even though there is a dedicated group of people for Quality Assurance, QA "
 #: beyond-pkging.dbk:141
 msgid ""
 "Even though there is a dedicated group of people for Quality Assurance, QA "


@@ -239,11 +262,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

+#. type: Content of: <chapter><section><section><title>

 #: beyond-pkging.dbk:155
 msgid "Bug squashing parties"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #: beyond-pkging.dbk:155
 msgid "Bug squashing parties"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:157
 msgid ""
 "From time to time the QA group organizes bug squashing parties to get rid of "
 #: beyond-pkging.dbk:157
 msgid ""
 "From time to time the QA group organizes bug squashing parties to get rid of "


@@ -255,6 +280,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:166
 msgid ""
 "The rules for non-maintainer uploads differ during the parties because the "
 #: beyond-pkging.dbk:166
 msgid ""
 "The rules for non-maintainer uploads differ during the parties because the "


@@ -268,6 +294,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:175
 msgid ""
 "People participating in the party have special rules for NMU, they can NMU "
 #: beyond-pkging.dbk:175
 msgid ""
 "People participating in the party have special rules for NMU, they can NMU "


@@ -279,6 +306,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:182
 msgid ""
 "If you don't feel confident about doing an NMU, just send a patch to the "
 #: beyond-pkging.dbk:182
 msgid ""
 "If you don't feel confident about doing an NMU, just send a patch to the "


@@ -286,11 +314,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

+#. type: Content of: <chapter><section><title>

 #: beyond-pkging.dbk:190
 msgid "Contacting other maintainers"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: beyond-pkging.dbk:190
 msgid "Contacting other maintainers"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:192
 msgid ""
 "During your lifetime within Debian, you will have to contact other "
 #: beyond-pkging.dbk:192
 msgid ""
 "During your lifetime within Debian, you will have to contact other "


@@ -300,6 +330,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:198
 msgid ""
 "Looking up the email address of the maintainer for the package can be "
 #: beyond-pkging.dbk:198
 msgid ""
 "Looking up the email address of the maintainer for the package can be "


@@ -311,6 +342,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:206
 msgid ""
 "You may also be interested in contacting the persons who are subscribed to a "
 #: beyond-pkging.dbk:206
 msgid ""
 "You may also be interested in contacting the persons who are subscribed to a "


@@ -320,11 +352,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

+#. type: Content of: <chapter><section><title>

 #: beyond-pkging.dbk:215
 msgid "Dealing with inactive and/or unreachable maintainers"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: beyond-pkging.dbk:215
 msgid "Dealing with inactive and/or unreachable maintainers"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:217
 msgid ""
 "If you notice that a package is lacking maintenance, you should make sure "
 #: beyond-pkging.dbk:217
 msgid ""
 "If you notice that a package is lacking maintenance, you should make sure "


@@ -335,6 +369,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:224
 msgid ""
 "There is a simple system (the MIA database) in which information about "
 #: beyond-pkging.dbk:224
 msgid ""
 "There is a simple system (the MIA database) in which information about "


@@ -350,6 +385,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:235
 msgid ""
 "The first step is to politely contact the maintainer, and wait a reasonable "
 #: beyond-pkging.dbk:235
 msgid ""
 "The first step is to politely contact the maintainer, and wait a reasonable "


@@ -359,6 +395,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:241
 msgid ""
 "If the maintainer doesn't reply within four weeks (a month), one can assume "
 #: beyond-pkging.dbk:241
 msgid ""
 "If the maintainer doesn't reply within four weeks (a month), one can assume "


@@ -368,6 +405,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

+#. type: Content of: <chapter><section><itemizedlist><listitem><para>

 #: beyond-pkging.dbk:249
 msgid ""
 "The <literal>echelon</literal> information available through the <ulink url="
 #: beyond-pkging.dbk:249
 msgid ""
 "The <literal>echelon</literal> information available through the <ulink url="


@@ -379,6 +417,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

+#. type: Content of: <chapter><section><itemizedlist><listitem><para>

 #: beyond-pkging.dbk:259
 msgid ""
 "The number of packages this maintainer is responsible for, and the condition "
 #: beyond-pkging.dbk:259
 msgid ""
 "The number of packages this maintainer is responsible for, and the condition "


@@ -389,6 +428,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

+#. type: Content of: <chapter><section><itemizedlist><listitem><para>

 #: beyond-pkging.dbk:268
 msgid ""
 "Is there any activity of the maintainer outside of Debian? For example, they "
 #: beyond-pkging.dbk:268
 msgid ""
 "Is there any activity of the maintainer outside of Debian? For example, they "


@@ -397,6 +437,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:275
 msgid ""
 "A bit of a problem are packages which were sponsored — the maintainer is not "
 #: beyond-pkging.dbk:275
 msgid ""
 "A bit of a problem are packages which were sponsored — the maintainer is not "


@@ -408,6 +449,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:283
 msgid ""
 "It is also allowed to post a query to &email-debian-devel;, asking if anyone "
 #: beyond-pkging.dbk:283
 msgid ""
 "It is also allowed to post a query to &email-debian-devel;, asking if anyone "


@@ -416,6 +458,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:288
 msgid ""
 "Once you have gathered all of this, you can contact &email-mia;.  People on "
 #: beyond-pkging.dbk:288
 msgid ""
 "Once you have gathered all of this, you can contact &email-mia;.  People on "


@@ -427,6 +470,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:296
 msgid ""
 "One last word: please remember to be polite.  We are all volunteers and "
 #: beyond-pkging.dbk:296
 msgid ""
 "One last word: please remember to be polite.  We are all volunteers and "


@@ -438,6 +482,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:304
 msgid ""
 "On the other hand, although we are volunteers, we do have a responsibility.  "
 #: beyond-pkging.dbk:304
 msgid ""
 "On the other hand, although we are volunteers, we do have a responsibility.  "


@@ -447,6 +492,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:310
 msgid ""
 "If you are interested in working in the MIA team, please have a look at the "
 #: beyond-pkging.dbk:310
 msgid ""
 "If you are interested in working in the MIA team, please have a look at the "


@@ -456,11 +502,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

+#. type: Content of: <chapter><section><title>

 #: beyond-pkging.dbk:318
 msgid "Interacting with prospective Debian developers"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: beyond-pkging.dbk:318
 msgid "Interacting with prospective Debian developers"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:320
 msgid ""
 "Debian's success depends on its ability to attract and retain new and "
 #: beyond-pkging.dbk:320
 msgid ""
 "Debian's success depends on its ability to attract and retain new and "


@@ -470,11 +518,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

+#. type: Content of: <chapter><section><section><title>

 #: beyond-pkging.dbk:326
 msgid "Sponsoring packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #: beyond-pkging.dbk:326
 msgid "Sponsoring packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:328
 msgid ""
 "Sponsoring a package means uploading a package for a maintainer who is not "
 #: beyond-pkging.dbk:328
 msgid ""
 "Sponsoring a package means uploading a package for a maintainer who is not "


@@ -483,6 +533,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:339
 msgid ""
 "New maintainers usually have certain difficulties creating Debian packages — "
 #: beyond-pkging.dbk:339
 msgid ""
 "New maintainers usually have certain difficulties creating Debian packages — "


@@ -493,6 +544,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:346
 msgid ""
 "Sponsoring merely by signing the upload or just recompiling is <emphasis "
 #: beyond-pkging.dbk:346
 msgid ""
 "Sponsoring merely by signing the upload or just recompiling is <emphasis "


@@ -504,6 +556,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:353
 msgid ""
 "If you are an application manager for a prospective developer, you can also "
 #: beyond-pkging.dbk:353
 msgid ""
 "If you are an application manager for a prospective developer, you can also "


@@ -512,11 +565,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

+#. type: Content of: <chapter><section><section><title>

 #: beyond-pkging.dbk:360
 msgid "Managing sponsored packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #: beyond-pkging.dbk:360
 msgid "Managing sponsored packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:362
 msgid ""
 "By uploading a sponsored package to Debian, you are certifying that the "
 #: beyond-pkging.dbk:362
 msgid ""
 "By uploading a sponsored package to Debian, you are certifying that the "


@@ -525,6 +580,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:367
 msgid ""
 "You cannot simply upload a binary <filename>.deb</filename> from the "
 #: beyond-pkging.dbk:367
 msgid ""
 "You cannot simply upload a binary <filename>.deb</filename> from the "


@@ -537,6 +593,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:376
 msgid ""
 "Do not be afraid to write the sponsoree back and point out changes that need "
 #: beyond-pkging.dbk:376
 msgid ""
 "Do not be afraid to write the sponsoree back and point out changes that need "


@@ -545,19 +602,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:381
 msgid "Once the package meets Debian standards, build and sign it with"
 msgstr ""
 
 #: beyond-pkging.dbk:381
 msgid "Once the package meets Debian standards, build and sign it with"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: beyond-pkging.dbk:383
+#. type: Content of: <chapter><section><section><screen>
+#: beyond-pkging.dbk:384

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"dpkg-buildpackage -k<replaceable>KEY-ID</replaceable>\n"
+msgid "dpkg-buildpackage -k<replaceable>KEY-ID</replaceable>\n"

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:387
 msgid ""
 "before uploading it to the incoming directory.  Of course, you can also use "
 #: beyond-pkging.dbk:387
 msgid ""
 "before uploading it to the incoming directory.  Of course, you can also use "


@@ -566,6 +623,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:392
 msgid ""
 "The Maintainer field of the <filename>control</filename> file and the "
 #: beyond-pkging.dbk:392
 msgid ""
 "The Maintainer field of the <filename>control</filename> file and the "


@@ -575,6 +633,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:398
 msgid ""
 "If you prefer to leave a more evident trace of your sponsorship job, you can "
 #: beyond-pkging.dbk:398
 msgid ""
 "If you prefer to leave a more evident trace of your sponsorship job, you can "


@@ -582,6 +641,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:402
 msgid ""
 "You are encouraged to keep tabs on the package you sponsor using <xref "
 #: beyond-pkging.dbk:402
 msgid ""
 "You are encouraged to keep tabs on the package you sponsor using <xref "


@@ -589,11 +649,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

+#. type: Content of: <chapter><section><section><title>

 #: beyond-pkging.dbk:408
 msgid "Advocating new developers"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #: beyond-pkging.dbk:408
 msgid "Advocating new developers"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:410
 msgid ""
 "See the page about <ulink url=\"&url-newmaint-advocate;\">advocating a "
 #: beyond-pkging.dbk:410
 msgid ""
 "See the page about <ulink url=\"&url-newmaint-advocate;\">advocating a "


@@ -601,11 +663,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

+#. type: Content of: <chapter><section><section><title>

 #: beyond-pkging.dbk:417
 msgid "Handling new maintainer applications"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #: beyond-pkging.dbk:417
 msgid "Handling new maintainer applications"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:419
 msgid ""
 "Please see <ulink url=\"&url-newmaint-amchecklist;\">Checklist for "
 #: beyond-pkging.dbk:419
 msgid ""
 "Please see <ulink url=\"&url-newmaint-amchecklist;\">Checklist for "

diff --git a/po4a/fr/index.po b/po4a/fr/index.po
index 0013252275c2954faa032779c825c347a927eedb..0a3402c4469b39470208a1e412c274d60f1d0e41 100644 (file)
--- a/po4a/fr/index.po
+++ b/po4a/fr/index.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-08-08 11:36-0300\n"
+"POT-Creation-Date: 2010-01-04 00:20+0100\n"

 "PO-Revision-Date: 2007-07-01 23:36+0000\n"
 "Last-Translator: debacle <>\n"
 "Language-Team: English <en@li.org>\n"
 "PO-Revision-Date: 2007-07-01 23:36+0000\n"
 "Last-Translator: debacle <>\n"
 "Language-Team: English <en@li.org>\n"


@@ -17,59 +17,53 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # type: Attribute 'lang' of: <book>
 "Content-Transfer-Encoding: 8bit\n"
 
 # type: Attribute 'lang' of: <book>

+#. type: Attribute 'lang' of: <book>

 #: index.dbk:7
 msgid "en"
 msgstr "fr"
 
 # type: Content of: <book><title>
 #: index.dbk:7
 msgid "en"
 msgstr "fr"
 
 # type: Content of: <book><title>

+#. type: Content of: <book><title>

 #: index.dbk:9
 msgid "Debian Developer's Reference"
 msgstr "Référence du développeur Debian"
 
 #: index.dbk:9
 msgid "Debian Developer's Reference"
 msgstr "Référence du développeur Debian"
 

-# type: Content of: <book><bookinfo>
+#. type: Content of: <book><bookinfo>

 #: index.dbk:11
 msgid ""
 "<author> <othername>Developer's Reference Team</othername> &email-devel-ref; "
 "</author> <author> <firstname>Andreas</firstname> <surname>Barth</surname> </"
 "author> <author> <firstname>Adam</firstname> <surname>Di Carlo</surname> </"
 "author> <author> <firstname>Raphaël</firstname> <surname>Hertzog</surname> </"
 #: index.dbk:11
 msgid ""
 "<author> <othername>Developer's Reference Team</othername> &email-devel-ref; "
 "</author> <author> <firstname>Andreas</firstname> <surname>Barth</surname> </"
 "author> <author> <firstname>Adam</firstname> <surname>Di Carlo</surname> </"
 "author> <author> <firstname>Raphaël</firstname> <surname>Hertzog</surname> </"

+"author> <author> <firstname>Lucas</firstname> <surname>Nussbaum</surname> </"

 "author> <author> <firstname>Christian</firstname> <surname>Schwarz</surname> "
 "</author> <author> <firstname>Ian</firstname> <surname>Jackson</surname> </"
 "author>"
 msgstr ""
 
 # type: Content of: <book><bookinfo><releaseinfo>
 "author> <author> <firstname>Christian</firstname> <surname>Schwarz</surname> "
 "</author> <author> <firstname>Ian</firstname> <surname>Jackson</surname> </"
 "author>"
 msgstr ""
 
 # type: Content of: <book><bookinfo><releaseinfo>

-#: index.dbk:30
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: index.dbk:33

 msgid "ver. &version;"
 msgstr "ver.·&version;"
 
 msgid "ver. &version;"
 msgstr "ver.·&version;"
 

-# type: Content of: <book><bookinfo><pubdate>
-#: index.dbk:31
-msgid "&pubdate;"
-msgstr "&pubdate;"
-
-# type: Content of: <book><bookinfo><copyright><holder>
-#: index.dbk:37
-msgid "Andreas Barth"
-msgstr "Andreas Barth"
-
-# type: Content of: <book><bookinfo><copyright><holder>
-#: index.dbk:46
-msgid "Adam Di Carlo"
-msgstr "Adam Di Carlo"
-
-# type: Content of: <book><bookinfo><copyright><holder>
-#: index.dbk:51
-msgid "Raphaël Hertzog"
-msgstr "Raphaël Hertzog"
-
-# type: Content of: <book><bookinfo><copyright><holder>
-#: index.dbk:56
-msgid "Christian Schwarz"
-msgstr "Christian Schwarz"
+#. type: Content of: <book><bookinfo>
+#: index.dbk:34
+msgid ""
+"<pubdate>&pubdate;</pubdate> <copyright> <year>2004</year> <year>2005</year> "
+"<year>2006</year> <year>2007</year> <holder>Andreas Barth</holder> </"
+"copyright> <copyright> <year>1998</year> <year>1999</year> <year>2000</year> "
+"<year>2001</year> <year>2002</year> <year>2003</year> <holder>Adam Di Carlo</"
+"holder> </copyright> <copyright> <year>2002</year> <year>2003</year> "
+"<year>2008</year> <year>2009</year> <holder>Raphaël Hertzog</holder> </"
+"copyright> <copyright> <year>2008</year> <year>2009</year> <holder>Lucas "
+"Nussbaum</holder> </copyright> <copyright> <year>1997</year> <year>1998</"
+"year> <holder>Christian Schwarz</holder> </copyright>"
+msgstr ""

 
 # type: Content of: <book><bookinfo><legalnotice><para>
 
 # type: Content of: <book><bookinfo><legalnotice><para>

-#: index.dbk:60
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: index.dbk:70

 msgid ""
 "This manual is free software; you may redistribute it and/or modify it under "
 "the terms of the GNU General Public License as published by the Free "
 msgid ""
 "This manual is free software; you may redistribute it and/or modify it under "
 "the terms of the GNU General Public License as published by the Free "


@@ -81,7 +75,8 @@ msgstr ""
 "version postérieure)."
 
 # type: Content of: <book><bookinfo><legalnotice><para>
 "version postérieure)."
 
 # type: Content of: <book><bookinfo><legalnotice><para>

-#: index.dbk:65
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: index.dbk:75

 msgid ""
 "This is distributed in the hope that it will be useful, but "
 "<emphasis>without any warranty</emphasis>; without even the implied warranty "
 msgid ""
 "This is distributed in the hope that it will be useful, but "
 "<emphasis>without any warranty</emphasis>; without even the implied warranty "


@@ -94,7 +89,8 @@ msgstr ""
 "publique générale du projet GNU pour plus de détails."
 
 # type: Content of: <book><bookinfo><legalnotice><para>
 "publique générale du projet GNU pour plus de détails."
 
 # type: Content of: <book><bookinfo><legalnotice><para>

-#: index.dbk:71
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: index.dbk:81

 msgid ""
 "A copy of the GNU General Public License is available as &file-GPL; in the "
 "&debian-formal; distribution or on the World Wide Web at <ulink url=\"&url-"
 msgid ""
 "A copy of the GNU General Public License is available as &file-GPL; in the "
 "&debian-formal; distribution or on the World Wide Web at <ulink url=\"&url-"


@@ -109,7 +105,8 @@ msgstr ""
 # type: Content of: <book><bookinfo><legalnotice><para>
 #.  TODO: Maybe better: "This document has originally been written
 #. in English.  Translations into different languages are available." 
 # type: Content of: <book><bookinfo><legalnotice><para>
 #.  TODO: Maybe better: "This document has originally been written
 #. in English.  Translations into different languages are available." 

-#: index.dbk:78
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: index.dbk:88

 msgid ""
 "If you want to print this reference, you should use the <ulink url="
 "\"developers-reference.pdf\">pdf version</ulink>.  This page is also "
 msgid ""
 "If you want to print this reference, you should use the <ulink url="
 "\"developers-reference.pdf\">pdf version</ulink>.  This page is also "


@@ -119,6 +116,26 @@ msgstr ""
 "url=\"developers-reference.pdf\">version PDF</ulink>. Cette page est "
 "également disponible en <ulink url=\"index.html\">anglais</ulink>."
 
 "url=\"developers-reference.pdf\">version PDF</ulink>. Cette page est "
 "également disponible en <ulink url=\"index.html\">anglais</ulink>."
 

+# type: Content of: <book><bookinfo><pubdate>
+#~ msgid "&pubdate;"
+#~ msgstr "&pubdate;"
+
+# type: Content of: <book><bookinfo><copyright><holder>
+#~ msgid "Andreas Barth"
+#~ msgstr "Andreas Barth"
+
+# type: Content of: <book><bookinfo><copyright><holder>
+#~ msgid "Adam Di Carlo"
+#~ msgstr "Adam Di Carlo"
+
+# type: Content of: <book><bookinfo><copyright><holder>
+#~ msgid "Raphaël Hertzog"
+#~ msgstr "Raphaël Hertzog"
+
+# type: Content of: <book><bookinfo><copyright><holder>
+#~ msgid "Christian Schwarz"
+#~ msgstr "Christian Schwarz"
+

 # type: Content of: <book><bookinfo><releaseinfo>
 #~ msgid "ver. 3.3.9, 16 June, 2007"
 #~ msgstr "ver. 3.3.9, 16 June, 2007"
 # type: Content of: <book><bookinfo><releaseinfo>
 #~ msgid "ver. 3.3.9, 16 June, 2007"
 #~ msgstr "ver. 3.3.9, 16 June, 2007"

diff --git a/po4a/fr/pkgs.po b/po4a/fr/pkgs.po
index 992b347e2a7b8a3c53b84a463abcf7d9e3997d2b..1401360e727188349d6ddeb975ba09742f96438a 100644 (file)
--- a/po4a/fr/pkgs.po
+++ b/po4a/fr/pkgs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2009-09-12 17:19+0300\n"
+"POT-Creation-Date: 2010-01-04 00:20+0100\n"

 "PO-Revision-Date: 2007-07-01 23:15+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "PO-Revision-Date: 2007-07-01 23:15+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"


@@ -343,38 +343,38 @@ msgid ""
 "distinction between the original sources and the patches applied for Debian"
 msgstr ""
 
 "distinction between the original sources and the patches applied for Debian"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>

 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 #: pkgs.dbk:225
 msgid ""
 "the (more common) packages where there's an original source tarball file "
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 #: pkgs.dbk:225
 msgid ""
 "the (more common) packages where there's an original source tarball file "

-"accompanied by another file that contains the patches applied for Debian"
+"accompanied by another file that contains the changes made by Debian"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>

 #. type: Content of: <chapter><section><para>
 #: pkgs.dbk:231
 msgid ""
 "For the native packages, the source package includes a Debian source control "
 #. type: Content of: <chapter><section><para>
 #: pkgs.dbk:231
 msgid ""
 "For the native packages, the source package includes a Debian source control "

-"file (<literal>.dsc</literal>) and the source tarball (<literal>.tar.gz</"
-"literal>).  A source package of a non-native package includes a Debian "
-"source control file, the original source tarball (<literal>.orig.tar.gz</"
-"literal>) and the Debian patches (<literal>.diff.gz</literal>)."
+"file (<literal>.dsc</literal>) and the source tarball (<literal>.tar.{gz,bz2,"
+"lzma}</literal>). A source package of a non-native package includes a Debian "
+"source control file, the original source tarball (<literal>.orig.tar.{gz,bz2,"
+"lzma}</literal>) and the Debian changes (<literal>.diff.gz</literal> for the "
+"source format “1.0” or <literal>.debian.tar.{gz,bz2,lzma}</literal> for the "
+"source format “3.0 (quilt)”)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>

 #. type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:239
+#: pkgs.dbk:240

 msgid ""
 msgid ""

-"Whether a package is native or not is determined when it is built by "
-"<citerefentry> <refentrytitle>dpkg-buildpackage</refentrytitle> "
-"<manvolnum>1</manvolnum> </citerefentry>.  The rest of this section relates "
-"only to non-native packages."
+"With source format “1.0”, whether a package is native or not was determined "
+"by <command>dpkg-source</command> at build time. Nowadays it is recommended "
+"to be explicit about the desired source format by putting either “3.0 "
+"(quilt)” or “3.0 (native)” in <filename>debian/source/format</filename>.  "
+"The rest of this section relates only to non-native packages."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:245
+#: pkgs.dbk:247

 msgid ""
 "The first time a version is uploaded which corresponds to a particular "
 "upstream version, the original source tar file should be uploaded and "
 msgid ""
 "The first time a version is uploaded which corresponds to a particular "
 "upstream version, the original source tar file should be uploaded and "


@@ -383,21 +383,20 @@ msgid ""
 "filename> files, and will not need to be re-uploaded."
 msgstr ""
 
 "filename> files, and will not need to be re-uploaded."
 msgstr ""
 

-# type: Content of: <chapter><section><para>

 #. type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:252
+#: pkgs.dbk:254

 msgid ""
 "By default, <command>dpkg-genchanges</command> and <command>dpkg-"
 "buildpackage</command> will include the original source tar file if and only "
 msgid ""
 "By default, <command>dpkg-genchanges</command> and <command>dpkg-"
 "buildpackage</command> will include the original source tar file if and only "

-"if the Debian revision part of the source version number is 0 or 1, "
-"indicating a new upstream version.  This behavior may be modified by using "
-"<literal>-sa</literal> to always include it or <literal>-sd</literal> to "
-"always leave it out."
+"if the current changelog entry has a different upstream version from the "
+"preceding entry. This behavior may be modified by using <literal>-sa</"
+"literal> to always include it or <literal>-sd</literal> to always leave it "
+"out."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:260
+#: pkgs.dbk:262

 msgid ""
 "If no original source is included in the upload, the original source tar-"
 "file used by <command>dpkg-source</command> when constructing the <filename>."
 msgid ""
 "If no original source is included in the upload, the original source tar-"
 "file used by <command>dpkg-source</command> when constructing the <filename>."


@@ -405,24 +404,25 @@ msgid ""
 "byte-for-byte identical with the one already in the archive."
 msgstr ""
 
 "byte-for-byte identical with the one already in the archive."
 msgstr ""
 

-# type: Content of: <chapter><section><para>

 #. type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:267
+#: pkgs.dbk:269

 msgid ""
 "Please notice that, in non-native packages, permissions on files that are "
 msgid ""
 "Please notice that, in non-native packages, permissions on files that are "

-"not present in the .orig.tar.gz will not be preserved, as diff does not "
-"store file permissions in the patch."
+"not present in the .orig.tar.{gz,bz2} will not be preserved, as diff does "
+"not store file permissions in the patch. However when using source format "
+"“3.0 (quilt)”, permissions of files inside the <filename>debian</filename> "
+"directory are preserved since they are stored in a tar archive."

 msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:274
+#: pkgs.dbk:278

 msgid "Picking a distribution"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Picking a distribution"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:276
+#: pkgs.dbk:280

 msgid ""
 "Each upload needs to specify which distribution the package is intended "
 "for.  The package build process extracts this information from the first "
 msgid ""
 "Each upload needs to specify which distribution the package is intended "
 "for.  The package build process extracts this information from the first "


@@ -433,7 +433,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:282
+#: pkgs.dbk:286

 msgid ""
 "There are several possible values for this field: <literal>stable</literal>, "
 "<literal>unstable</literal>, <literal>testing-proposed-updates</literal> and "
 msgid ""
 "There are several possible values for this field: <literal>stable</literal>, "
 "<literal>unstable</literal>, <literal>testing-proposed-updates</literal> and "


@@ -443,7 +443,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:288
+#: pkgs.dbk:292

 msgid ""
 "Actually, there are two other possible distributions: <literal>stable-"
 "security </literal> and <literal>testing-security</literal>, but read <xref "
 msgid ""
 "Actually, there are two other possible distributions: <literal>stable-"
 "security </literal> and <literal>testing-security</literal>, but read <xref "


@@ -452,7 +452,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:293
+#: pkgs.dbk:297

 msgid ""
 "It is not possible to upload a package into several distributions at the "
 "same time."
 msgid ""
 "It is not possible to upload a package into several distributions at the "
 "same time."


@@ -460,18 +460,17 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:297
+#: pkgs.dbk:301

 msgid ""
 "Special case: uploads to the <literal>stable</literal> and "
 "<literal>oldstable</literal> distributions"
 msgstr ""
 
 msgid ""
 "Special case: uploads to the <literal>stable</literal> and "
 "<literal>oldstable</literal> distributions"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:300
+#: pkgs.dbk:304

 msgid ""
 "Uploading to <literal>stable</literal> means that the package will "
 msgid ""
 "Uploading to <literal>stable</literal> means that the package will "

-"transfered to the <literal>proposed-updates-new</literal> queue for review "
+"transferred to the <literal>proposed-updates-new</literal> queue for review "

 "by the stable release managers, and if approved will be installed in "
 "<filename>stable-proposed-updates</filename> directory of the Debian "
 "archive.  From there, it will be included in <literal>stable</literal> with "
 "by the stable release managers, and if approved will be installed in "
 "<filename>stable-proposed-updates</filename> directory of the Debian "
 "archive.  From there, it will be included in <literal>stable</literal> with "


@@ -480,7 +479,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:308
+#: pkgs.dbk:312

 msgid ""
 "To ensure that your upload will be accepted, you should discuss the changes "
 "with the stable release team before you upload. For that, send a mail to the "
 msgid ""
 "To ensure that your upload will be accepted, you should discuss the changes "
 "with the stable release team before you upload. For that, send a mail to the "


@@ -492,7 +491,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:316
+#: pkgs.dbk:320

 msgid ""
 "Extra care should be taken when uploading to <literal>stable</literal>.  "
 "Basically, a package should only be uploaded to <literal>stable</literal> if "
 msgid ""
 "Extra care should be taken when uploading to <literal>stable</literal>.  "
 "Basically, a package should only be uploaded to <literal>stable</literal> if "


@@ -501,25 +500,25 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:323
+#: pkgs.dbk:327

 msgid "a truly critical functionality problem"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "a truly critical functionality problem"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:328
+#: pkgs.dbk:332

 msgid "the package becomes uninstallable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "the package becomes uninstallable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:333
+#: pkgs.dbk:337

 msgid "a released architecture lacks the package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "a released architecture lacks the package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:338
+#: pkgs.dbk:342

 msgid ""
 "In the past, uploads to <literal>stable</literal> were used to address "
 "security problems as well.  However, this practice is deprecated, as uploads "
 msgid ""
 "In the past, uploads to <literal>stable</literal> were used to address "
 "security problems as well.  However, this practice is deprecated, as uploads "


@@ -534,7 +533,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:349
+#: pkgs.dbk:353

 msgid ""
 "Changing anything else in the package that isn't important is discouraged, "
 "because even trivial fixes can cause bugs later on."
 msgid ""
 "Changing anything else in the package that isn't important is discouraged, "
 "because even trivial fixes can cause bugs later on."


@@ -542,7 +541,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:353
+#: pkgs.dbk:357

 msgid ""
 "Packages uploaded to <literal>stable</literal> need to be compiled on "
 "systems running <literal>stable</literal>, so that their dependencies are "
 msgid ""
 "Packages uploaded to <literal>stable</literal> need to be compiled on "
 "systems running <literal>stable</literal>, so that their dependencies are "


@@ -557,7 +556,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:363
+#: pkgs.dbk:367

 msgid ""
 "Uploads to the <literal>oldstable</literal> distributions are possible as "
 "long as it hasn't been archived. The same rules as for <literal>stable </"
 msgid ""
 "Uploads to the <literal>oldstable</literal> distributions are possible as "
 "long as it hasn't been archived. The same rules as for <literal>stable </"


@@ -566,14 +565,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:370
+#: pkgs.dbk:374

 msgid ""
 "Special case: uploads to <literal>testing/testing-proposed-updates</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid ""
 "Special case: uploads to <literal>testing/testing-proposed-updates</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:372
+#: pkgs.dbk:376

 msgid ""
 "Please see the information in the <link linkend=\"t-p-u\">testing section</"
 "link> for details."
 msgid ""
 "Please see the information in the <link linkend=\"t-p-u\">testing section</"
 "link> for details."


@@ -581,23 +580,22 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:380
+#: pkgs.dbk:384

 msgid "Uploading a package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgid "Uploading a package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:382
+#: pkgs.dbk:386

 msgid "Uploading to <literal>ftp-master</literal>"
 msgstr ""
 
 msgid "Uploading to <literal>ftp-master</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:384
+#: pkgs.dbk:388

 msgid ""
 "To upload a package, you should upload the files (including the signed "
 msgid ""
 "To upload a package, you should upload the files (including the signed "

-"changes and dsc-file) with anonymous ftp to <literal>&ftp-master-host;</"
-"literal> in the directory <ulink url=\"ftp://&ftp-master-host;&upload-queue;"
+"changes and dsc-file) with anonymous ftp to <literal>&ftp-upload-host;</"
+"literal> in the directory <ulink url=\"ftp://&ftp-upload-host;&upload-queue;"

 "\">&upload-queue;</ulink>.  To get the files processed there, they need to "
 "be signed with a key in the Debian Developers keyring or the Debian "
 "Maintainers keyring (see <ulink url=\"&url-wiki-dm;\"></ulink>)."
 "\">&upload-queue;</ulink>.  To get the files processed there, they need to "
 "be signed with a key in the Debian Developers keyring or the Debian "
 "Maintainers keyring (see <ulink url=\"&url-wiki-dm;\"></ulink>)."


@@ -605,7 +603,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:393
+#: pkgs.dbk:397

 msgid ""
 "Please note that you should transfer the changes file last.  Otherwise, your "
 "upload may be rejected because the archive maintenance software will parse "
 msgid ""
 "Please note that you should transfer the changes file last.  Otherwise, your "
 "upload may be rejected because the archive maintenance software will parse "


@@ -614,30 +612,29 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:398
+#: pkgs.dbk:402

 msgid ""
 "You may also find the Debian packages <xref linkend=\"dupload\"/> or <xref "
 "linkend=\"dput\"/> useful when uploading packages.  These handy programs "
 "help automate the process of uploading packages into Debian."
 msgstr ""
 
 msgid ""
 "You may also find the Debian packages <xref linkend=\"dupload\"/> or <xref "
 "linkend=\"dput\"/> useful when uploading packages.  These handy programs "
 "help automate the process of uploading packages into Debian."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:403
+#: pkgs.dbk:407

 msgid ""
 msgid ""

-"For removing packages, please see the README file in that ftp directory, and "
-"the Debian package <xref linkend=\"dcut\"/> ."
+"For removing packages, please see <ulink url=\"ftp://&ftp-upload-host;"
+"&upload-queue;/README\"/> and the Debian package <xref linkend=\"dcut\"/> ."

 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:409
+#: pkgs.dbk:414

 msgid "Delayed uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Delayed uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:412
+#: pkgs.dbk:417

 msgid ""
 "It is sometimes useful to upload a package immediately, but to want this "
 "package to arrive in the archive only a few days later. For example, when "
 msgid ""
 "It is sometimes useful to upload a package immediately, but to want this "
 "package to arrive in the archive only a few days later. For example, when "


@@ -645,22 +642,21 @@ msgid ""
 "want to give the maintainer a few days to react."
 msgstr ""
 
 "want to give the maintainer a few days to react."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:419
+#: pkgs.dbk:424

 msgid ""
 "An upload to the delayed directory keeps the package in <ulink url=\"http://"
 "ftp-master.debian.org/deferred.html\"> the deferred uploads queue\"</"
 "ulink>.  When the specified waiting time is over, the package is moved into "
 "the regular incoming directory for processing.  This is done through "
 msgid ""
 "An upload to the delayed directory keeps the package in <ulink url=\"http://"
 "ftp-master.debian.org/deferred.html\"> the deferred uploads queue\"</"
 "ulink>.  When the specified waiting time is over, the package is moved into "
 "the regular incoming directory for processing.  This is done through "

-"automatic uploading to <literal>&ftp-master-host;</literal> in upload-"
+"automatic uploading to <literal>&ftp-upload-host;</literal> in upload-"

 "directory <literal>DELAYED/[012345678]-day</literal>. 0-day is uploaded "
 "directory <literal>DELAYED/[012345678]-day</literal>. 0-day is uploaded "

-"multiple times per day to <literal>&ftp-master-host;</literal>."
+"multiple times per day to <literal>&ftp-upload-host;</literal>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:430
+#: pkgs.dbk:435

 msgid ""
 "With dput, you can use the <literal>--delayed <replaceable>DELAY</"
 "replaceable></literal> parameter to put the package into one of the queues."
 msgid ""
 "With dput, you can use the <literal>--delayed <replaceable>DELAY</"
 "replaceable></literal> parameter to put the package into one of the queues."


@@ -668,13 +664,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:436
+#: pkgs.dbk:441

 msgid "Security uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Security uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:438
+#: pkgs.dbk:443

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 "upload queue (<literal>oldstable-security</literal>, <literal>stable-"
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 "upload queue (<literal>oldstable-security</literal>, <literal>stable-"


@@ -686,46 +682,36 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:448
+#: pkgs.dbk:453

 msgid "Other upload queues"
 msgstr ""
 
 msgid "Other upload queues"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:450
-msgid ""
-"The scp queues on <literal>&ftp-master-host;</literal>, and <literal> "
-"security.debian.org</literal> are mostly unusable due to the login "
-"restrictions on those hosts."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:455
 msgid ""
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:455
 msgid ""

-"The anonymous queues on ftp.uni-erlangen.de and ftp.uk.debian.org are "
-"currently down.  Work is underway to resurrect them."
+"There is an alternative upload queue in Europe at <ulink url=\"ftp://&ftp-eu-"
+"upload-host;&upload-queue;\"/>. It operates in the same way as <literal>&ftp-"
+"upload-host;</literal>, but should be faster for European developers."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:459
+#: pkgs.dbk:461

 msgid ""
 msgid ""

-"The queues on master.debian.org, samosa.debian.org, master.debian.or.jp, and "
-"ftp.chiark.greenend.org.uk are down permanently, and will not be "
-"resurrected.  The queue in Japan will be replaced with a new queue on hp."
-"debian.or.jp some day."
+"Packages can also be uploaded via ssh to <literal>&ssh-upload-host;</"
+"literal>; files should be put <literal>/srv/upload.debian.org/UploadQueue</"
+"literal>. This queue does not support <xref linkend=\"delayed-incoming"
+"\">delayed uploads</xref>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:467
+#: pkgs.dbk:469

 msgid "Notification that a new package has been installed"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Notification that a new package has been installed"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:469
+#: pkgs.dbk:471

 msgid ""
 "The Debian archive maintainers are responsible for handling package "
 "uploads.  For the most part, uploads are automatically handled on a daily "
 msgid ""
 "The Debian archive maintainers are responsible for handling package "
 "uploads.  For the most part, uploads are automatically handled on a daily "


@@ -739,7 +725,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:479
+#: pkgs.dbk:481

 msgid ""
 "In any case, you will receive an email notification indicating that the "
 "package has been added to the archive, which also indicates which bugs will "
 msgid ""
 "In any case, you will receive an email notification indicating that the "
 "package has been added to the archive, which also indicates which bugs will "


@@ -749,7 +735,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:485
+#: pkgs.dbk:487

 msgid ""
 "The installation notification also includes information on what section the "
 "package was inserted into.  If there is a disparity, you will receive a "
 msgid ""
 "The installation notification also includes information on what section the "
 "package was inserted into.  If there is a disparity, you will receive a "


@@ -758,7 +744,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:490
+#: pkgs.dbk:492

 msgid ""
 "Note that if you upload via queues, the queue daemon software will also send "
 "you a notification by email."
 msgid ""
 "Note that if you upload via queues, the queue daemon software will also send "
 "you a notification by email."


@@ -766,13 +752,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:498
+#: pkgs.dbk:500

 msgid "Specifying the package section, subsection and priority"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Specifying the package section, subsection and priority"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:500
+#: pkgs.dbk:502

 msgid ""
 "The <filename>debian/control</filename> file's <literal>Section</literal> "
 "and <literal>Priority</literal> fields do not actually specify where the "
 msgid ""
 "The <filename>debian/control</filename> file's <literal>Section</literal> "
 "and <literal>Priority</literal> fields do not actually specify where the "


@@ -784,7 +770,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:508
+#: pkgs.dbk:510

 msgid ""
 "The archive maintainers keep track of the canonical sections and priorities "
 "for packages in the <literal>override file</literal>.  If there is a "
 msgid ""
 "The archive maintainers keep track of the canonical sections and priorities "
 "for packages in the <literal>override file</literal>.  If there is a "


@@ -796,21 +782,22 @@ msgid ""
 "in the <literal>override file</literal>."
 msgstr ""
 
 "in the <literal>override file</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>

 #. type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:518
+#: pkgs.dbk:520

 msgid ""
 "To alter the actual section that a package is put in, you need to first make "
 "sure that the <filename>debian/control</filename> file in your package is "
 msgid ""
 "To alter the actual section that a package is put in, you need to first make "
 "sure that the <filename>debian/control</filename> file in your package is "

-"accurate.  Next, send an email &email-override; or submit a bug against "
-"<systemitem role=\"package\">ftp.debian.org</systemitem> requesting that the "
-"section or priority for your package be changed from the old section or "
-"priority to the new one.  Be sure to explain your reasoning."
+"accurate.  Next, submit a bug against <systemitem role=\"package\">ftp."
+"debian.org</systemitem> requesting that the section or priority for your "
+"package be changed from the old section or priority to the new one. Use a "
+"Subject like <literal>override: PACKAGE1:section/priority, [...], PACKAGEX:"
+"section/priority</literal>, and include the justification for the change in "
+"the body of the bug report."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:526
+#: pkgs.dbk:531

 msgid ""
 "For more information about <literal>override files</literal>, see "
 "<citerefentry> <refentrytitle>dpkg-scanpackages</refentrytitle> "
 msgid ""
 "For more information about <literal>override files</literal>, see "
 "<citerefentry> <refentrytitle>dpkg-scanpackages</refentrytitle> "


@@ -820,7 +807,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:532
+#: pkgs.dbk:537

 msgid ""
 "Note that the <literal>Section</literal> field describes both the section as "
 "well as the subsection, which are described in <xref linkend=\"archive-"
 msgid ""
 "Note that the <literal>Section</literal> field describes both the section as "
 "well as the subsection, which are described in <xref linkend=\"archive-"


@@ -831,13 +818,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:541
+#: pkgs.dbk:546

 msgid "Handling bugs"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Handling bugs"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:543
+#: pkgs.dbk:548

 msgid ""
 "Every developer has to be able to work with the Debian <ulink url=\"&url-bts;"
 "\">bug tracking system</ulink>.  This includes knowing how to file bug "
 msgid ""
 "Every developer has to be able to work with the Debian <ulink url=\"&url-bts;"
 "\">bug tracking system</ulink>.  This includes knowing how to file bug "


@@ -847,7 +834,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:549
+#: pkgs.dbk:554

 msgid ""
 "The bug tracking system's features are described in the <ulink url=\"&url-"
 "bts-devel;\">BTS documentation for developers</ulink>.  This includes "
 msgid ""
 "The bug tracking system's features are described in the <ulink url=\"&url-"
 "bts-devel;\">BTS documentation for developers</ulink>.  This includes "


@@ -857,7 +844,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:555
+#: pkgs.dbk:560

 msgid ""
 "Operations such as reassigning bugs to other packages, merging separate bug "
 "reports about the same issue, or reopening bugs when they are prematurely "
 msgid ""
 "Operations such as reassigning bugs to other packages, merging separate bug "
 "reports about the same issue, or reopening bugs when they are prematurely "


@@ -868,13 +855,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:563
+#: pkgs.dbk:568

 msgid "Monitoring bugs"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Monitoring bugs"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:565
+#: pkgs.dbk:570

 msgid ""
 "If you want to be a good maintainer, you should periodically check the "
 "<ulink url=\"&url-bts;\">Debian bug tracking system (BTS)</ulink> for your "
 msgid ""
 "If you want to be a good maintainer, you should periodically check the "
 "<ulink url=\"&url-bts;\">Debian bug tracking system (BTS)</ulink> for your "


@@ -885,7 +872,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:572
+#: pkgs.dbk:577

 msgid ""
 "Maintainers interact with the BTS via email addresses at <literal>&bugs-host;"
 "</literal>.  Documentation on available commands can be found at <ulink url="
 msgid ""
 "Maintainers interact with the BTS via email addresses at <literal>&bugs-host;"
 "</literal>.  Documentation on available commands can be found at <ulink url="


@@ -896,7 +883,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:579
+#: pkgs.dbk:584

 msgid ""
 "Some find it useful to get periodic reports on open bugs.  You can add a "
 "cron job such as the following if you want to get a weekly email outlining "
 msgid ""
 "Some find it useful to get periodic reports on open bugs.  You can add a "
 "cron job such as the following if you want to get a weekly email outlining "


@@ -904,7 +891,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:584
+#: pkgs.dbk:589

 #, no-wrap
 msgid ""
 "# ask for weekly reports of bugs in my packages\n"
 #, no-wrap
 msgid ""
 "# ask for weekly reports of bugs in my packages\n"


@@ -913,7 +900,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:588
+#: pkgs.dbk:593

 msgid ""
 "Replace <replaceable>address</replaceable> with your official Debian "
 "maintainer address."
 msgid ""
 "Replace <replaceable>address</replaceable> with your official Debian "
 "maintainer address."


@@ -921,13 +908,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:594
+#: pkgs.dbk:599

 msgid "Responding to bugs"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Responding to bugs"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:596
+#: pkgs.dbk:601

 msgid ""
 "When responding to bugs, make sure that any discussion you have about bugs "
 "is sent both to the original submitter of the bug, and to the bug itself (e."
 msgid ""
 "When responding to bugs, make sure that any discussion you have about bugs "
 "is sent both to the original submitter of the bug, and to the bug itself (e."


@@ -940,7 +927,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:605
+#: pkgs.dbk:610

 msgid ""
 "If you get a bug which mentions FTBFS, this means Fails to build from "
 "source.  Porters frequently use this acronym."
 msgid ""
 "If you get a bug which mentions FTBFS, this means Fails to build from "
 "source.  Porters frequently use this acronym."


@@ -948,7 +935,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:609
+#: pkgs.dbk:614

 msgid ""
 "Once you've dealt with a bug report (e.g.  fixed it), mark it as "
 "<literal>done</literal> (close it) by sending an explanation message to "
 msgid ""
 "Once you've dealt with a bug report (e.g.  fixed it), mark it as "
 "<literal>done</literal> (close it) by sending an explanation message to "


@@ -959,7 +946,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:616
+#: pkgs.dbk:621

 msgid ""
 "You should <emphasis>never</emphasis> close bugs via the bug server "
 "<literal>close</literal> command sent to &email-bts-control;.  If you do so, "
 msgid ""
 "You should <emphasis>never</emphasis> close bugs via the bug server "
 "<literal>close</literal> command sent to &email-bts-control;.  If you do so, "


@@ -969,13 +956,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:624
+#: pkgs.dbk:629

 msgid "Bug housekeeping"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Bug housekeeping"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:626
+#: pkgs.dbk:631

 msgid ""
 "As a package maintainer, you will often find bugs in other packages or have "
 "bugs reported against your packages which are actually bugs in other "
 msgid ""
 "As a package maintainer, you will often find bugs in other packages or have "
 "bugs reported against your packages which are actually bugs in other "


@@ -989,7 +976,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:637
+#: pkgs.dbk:642

 msgid ""
 "Filing bugs for problems that you find in other packages is one of the civic "
 "obligations of maintainership, see <xref linkend=\"submit-bug\"/> for "
 msgid ""
 "Filing bugs for problems that you find in other packages is one of the civic "
 "obligations of maintainership, see <xref linkend=\"submit-bug\"/> for "


@@ -999,13 +986,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:642
+#: pkgs.dbk:647

 msgid "Here's a list of steps that you may follow to handle a bug report:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgid "Here's a list of steps that you may follow to handle a bug report:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:647
+#: pkgs.dbk:652

 msgid ""
 "Decide whether the report corresponds to a real bug or not.  Sometimes users "
 "are just calling a program in the wrong way because they haven't read the "
 msgid ""
 "Decide whether the report corresponds to a real bug or not.  Sometimes users "
 "are just calling a program in the wrong way because they haven't read the "


@@ -1019,7 +1006,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:657
+#: pkgs.dbk:662

 msgid ""
 "If the bug submitter disagrees with your decision to close the bug, they may "
 "reopen it until you find an agreement on how to handle it.  If you don't "
 msgid ""
 "If the bug submitter disagrees with your decision to close the bug, they may "
 "reopen it until you find an agreement on how to handle it.  If you don't "


@@ -1035,7 +1022,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:671
+#: pkgs.dbk:676

 msgid ""
 "If the bug is real but it's caused by another package, just reassign the bug "
 "to the right package.  If you don't know which package it should be "
 msgid ""
 "If the bug is real but it's caused by another package, just reassign the bug "
 "to the right package.  If you don't know which package it should be "


@@ -1051,7 +1038,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:683
+#: pkgs.dbk:688

 msgid ""
 "If the bug affects the operation of your package, please consider cloning "
 "the bug and reassigning the clone to the package that really causes the "
 msgid ""
 "If the bug affects the operation of your package, please consider cloning "
 "the bug and reassigning the clone to the package that really causes the "


@@ -1063,7 +1050,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:693
+#: pkgs.dbk:698

 msgid ""
 "Sometimes you also have to adjust the severity of the bug so that it matches "
 "our definition of the severity.  That's because people tend to inflate the "
 msgid ""
 "Sometimes you also have to adjust the severity of the bug so that it matches "
 "our definition of the severity.  That's because people tend to inflate the "


@@ -1074,7 +1061,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:701
+#: pkgs.dbk:706

 msgid ""
 "If the bug is real but the same problem has already been reported by someone "
 "else, then the two relevant bug reports should be merged into one using the "
 msgid ""
 "If the bug is real but the same problem has already been reported by someone "
 "else, then the two relevant bug reports should be merged into one using the "


@@ -1087,7 +1074,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:712
+#: pkgs.dbk:717

 msgid ""
 "The bug submitter may have forgotten to provide some information, in which "
 "case you have to ask them for the required information.  You may use the "
 msgid ""
 "The bug submitter may have forgotten to provide some information, in which "
 "case you have to ask them for the required information.  You may use the "


@@ -1100,7 +1087,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:723
+#: pkgs.dbk:728

 msgid ""
 "If the bug is related to the packaging, you just fix it.  If you are not "
 "able to fix it yourself, then tag the bug as <literal>help</literal>.  You "
 msgid ""
 "If the bug is related to the packaging, you just fix it.  If you are not "
 "able to fix it yourself, then tag the bug as <literal>help</literal>.  You "


@@ -1116,7 +1103,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:737
+#: pkgs.dbk:742

 msgid ""
 "If you have fixed a bug in your local copy, or if a fix has been committed "
 "to the CVS repository, you may tag the bug as <literal>pending</literal> to "
 msgid ""
 "If you have fixed a bug in your local copy, or if a fix has been committed "
 "to the CVS repository, you may tag the bug as <literal>pending</literal> to "


@@ -1128,7 +1115,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:747
+#: pkgs.dbk:752

 msgid ""
 "Once a corrected package is available in the archive, the bug should be "
 "closed indicating the version in which it was fixed. This can be done "
 msgid ""
 "Once a corrected package is available in the archive, the bug should be "
 "closed indicating the version in which it was fixed. This can be done "


@@ -1137,13 +1124,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:756
+#: pkgs.dbk:761

 msgid "When bugs are closed by new uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "When bugs are closed by new uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:758
+#: pkgs.dbk:763

 msgid ""
 "As bugs and problems are fixed in your packages, it is your responsibility "
 "as the package maintainer to close these bugs.  However, you should not "
 msgid ""
 "As bugs and problems are fixed in your packages, it is your responsibility "
 "as the package maintainer to close these bugs.  However, you should not "


@@ -1155,7 +1142,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:766
+#: pkgs.dbk:771

 msgid ""
 "However, it's possible to avoid having to manually close bugs after the "
 "upload — just list the fixed bugs in your <filename>debian/changelog</"
 msgid ""
 "However, it's possible to avoid having to manually close bugs after the "
 "upload — just list the fixed bugs in your <filename>debian/changelog</"


@@ -1164,7 +1151,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:772
+#: pkgs.dbk:777

 #, no-wrap
 msgid ""
 "acme-cannon (3.1415) unstable; urgency=low\n"
 #, no-wrap
 msgid ""
 "acme-cannon (3.1415) unstable; urgency=low\n"


@@ -1177,21 +1164,21 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:780
+#: pkgs.dbk:785

 msgid ""
 "Technically speaking, the following Perl regular expression describes how "
 "bug closing changelogs are identified:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgid ""
 "Technically speaking, the following Perl regular expression describes how "
 "bug closing changelogs are identified:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:784
+#: pkgs.dbk:789

 #, no-wrap
 msgid "  /closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig\n"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 #, no-wrap
 msgid "  /closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig\n"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:787
+#: pkgs.dbk:792

 msgid ""
 "We prefer the <literal>closes: #<replaceable>XXX</replaceable></literal> "
 "syntax, as it is the most concise entry and the easiest to integrate with "
 msgid ""
 "We prefer the <literal>closes: #<replaceable>XXX</replaceable></literal> "
 "syntax, as it is the most concise entry and the easiest to integrate with "


@@ -1204,7 +1191,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:796
+#: pkgs.dbk:801

 msgid ""
 "Historically, uploads identified as <link linkend=\"nmu\">Non-maintainer "
 "upload (NMU)</link> were tagged <literal>fixed</literal> instead of being "
 msgid ""
 "Historically, uploads identified as <link linkend=\"nmu\">Non-maintainer "
 "upload (NMU)</link> were tagged <literal>fixed</literal> instead of being "


@@ -1214,7 +1201,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:802
+#: pkgs.dbk:807

 msgid ""
 "If you happen to mistype a bug number or forget a bug in the changelog "
 "entries, don't hesitate to undo any damage the error caused.  To reopen "
 msgid ""
 "If you happen to mistype a bug number or forget a bug in the changelog "
 "entries, don't hesitate to undo any damage the error caused.  To reopen "


@@ -1230,7 +1217,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:814
+#: pkgs.dbk:819

 msgid ""
 "Bear in mind that it is not obligatory to close bugs using the changelog as "
 "described above.  If you simply want to close bugs that don't have anything "
 msgid ""
 "Bear in mind that it is not obligatory to close bugs using the changelog as "
 "described above.  If you simply want to close bugs that don't have anything "


@@ -1242,7 +1229,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:822
+#: pkgs.dbk:827

 msgid ""
 "For general information on how to write your changelog entries, see <xref "
 "linkend=\"bpp-debian-changelog\"/> ."
 msgid ""
 "For general information on how to write your changelog entries, see <xref "
 "linkend=\"bpp-debian-changelog\"/> ."


@@ -1250,13 +1237,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:828
+#: pkgs.dbk:833

 msgid "Handling security-related bugs"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Handling security-related bugs"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:830
+#: pkgs.dbk:835

 msgid ""
 "Due to their sensitive nature, security-related bugs must be handled "
 "carefully.  The Debian Security Team exists to coordinate this activity, "
 msgid ""
 "Due to their sensitive nature, security-related bugs must be handled "
 "carefully.  The Debian Security Team exists to coordinate this activity, "


@@ -1267,7 +1254,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:837
+#: pkgs.dbk:842

 msgid ""
 "When you become aware of a security-related bug in a Debian package, whether "
 "or not you are the maintainer, collect pertinent information about the "
 msgid ""
 "When you become aware of a security-related bug in a Debian package, whether "
 "or not you are the maintainer, collect pertinent information about the "


@@ -1279,7 +1266,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:847
+#: pkgs.dbk:852

 msgid ""
 "Which versions of the package are known to be affected by the bug.  Check "
 "each version that is present in a supported Debian release, as well as "
 msgid ""
 "Which versions of the package are known to be affected by the bug.  Check "
 "each version that is present in a supported Debian release, as well as "


@@ -1288,14 +1275,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:854
+#: pkgs.dbk:859

 msgid ""
 "The nature of the fix, if any is available (patches are especially helpful)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "The nature of the fix, if any is available (patches are especially helpful)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:859
+#: pkgs.dbk:864

 msgid ""
 "Any fixed packages that you have prepared yourself (send only the <literal>."
 "diff.gz</literal> and <literal>.dsc</literal> files and read <xref linkend="
 msgid ""
 "Any fixed packages that you have prepared yourself (send only the <literal>."
 "diff.gz</literal> and <literal>.dsc</literal> files and read <xref linkend="


@@ -1304,7 +1291,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:866
+#: pkgs.dbk:871

 msgid ""
 "Any assistance you can provide to help with testing (exploits, regression "
 "testing, etc.)"
 msgid ""
 "Any assistance you can provide to help with testing (exploits, regression "
 "testing, etc.)"


@@ -1312,7 +1299,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:872
+#: pkgs.dbk:877

 msgid ""
 "Any information needed for the advisory (see <xref linkend=\"bug-security-"
 "advisories\"/> )"
 msgid ""
 "Any information needed for the advisory (see <xref linkend=\"bug-security-"
 "advisories\"/> )"


@@ -1320,7 +1307,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:877
+#: pkgs.dbk:882

 msgid ""
 "As the maintainer of the package, you have the responsibility to maintain "
 "it, even in the stable release. You are in the best position to evaluate "
 msgid ""
 "As the maintainer of the package, you have the responsibility to maintain "
 "it, even in the stable release. You are in the best position to evaluate "


@@ -1330,16 +1317,15 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:883
+#: pkgs.dbk:888

 msgid "The Security Tracker"
 msgstr ""
 
 msgid "The Security Tracker"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>

 #. type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:885
+#: pkgs.dbk:890

 msgid ""
 "The security team maintains a central database, the <ulink url=\"http://"
 msgid ""
 "The security team maintains a central database, the <ulink url=\"http://"

-"security-tracker.debian.net/\">Debian Security Tracker</ulink>.  This "
+"security-tracker.debian.org/\">Debian Security Tracker</ulink>.  This "

 "contains all public information that is known about security issues: which "
 "packages and versions are affected or fixed, and thus whether stable, "
 "testing and/or unstable are vulnerable. Information that is still "
 "contains all public information that is known about security issues: which "
 "packages and versions are affected or fixed, and thus whether stable, "
 "testing and/or unstable are vulnerable. Information that is still "


@@ -1348,7 +1334,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:893
+#: pkgs.dbk:898

 msgid ""
 "You can search it for a specific issue, but also on package name. Look for "
 "your package to see which issues are still open. If you can, please provide "
 msgid ""
 "You can search it for a specific issue, but also on package name. Look for "
 "your package to see which issues are still open. If you can, please provide "


@@ -1358,13 +1344,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:901
+#: pkgs.dbk:906

 msgid "Confidentiality"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Confidentiality"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:903
+#: pkgs.dbk:908

 msgid ""
 "Unlike most other activities within Debian, information about security "
 "issues must sometimes be kept private for a time.  This allows software "
 msgid ""
 "Unlike most other activities within Debian, information about security "
 "issues must sometimes be kept private for a time.  This allows software "


@@ -1376,31 +1362,31 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:910
+#: pkgs.dbk:915

 msgid "There are several ways developers can learn of a security problem:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "There are several ways developers can learn of a security problem:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:915
+#: pkgs.dbk:920

 msgid "they notice it on a public forum (mailing list, web site, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "they notice it on a public forum (mailing list, web site, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:920
+#: pkgs.dbk:925

 msgid "someone files a bug report"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "someone files a bug report"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:925
+#: pkgs.dbk:930

 msgid "someone informs them via private email"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "someone informs them via private email"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:930
+#: pkgs.dbk:935

 msgid ""
 "In the first two cases, the information is public and it is important to "
 "have a fix as soon as possible.  In the last case, however, it might not be "
 msgid ""
 "In the first two cases, the information is public and it is important to "
 "have a fix as soon as possible.  In the last case, however, it might not be "


@@ -1410,7 +1396,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:938
+#: pkgs.dbk:943

 msgid ""
 "If the security exposure is minor, there is sometimes no need to keep the "
 "problem a secret and a fix should be made and released."
 msgid ""
 "If the security exposure is minor, there is sometimes no need to keep the "
 "problem a secret and a fix should be made and released."


@@ -1418,7 +1404,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:944
+#: pkgs.dbk:949

 msgid ""
 "If the problem is severe, it is preferable to share the information with "
 "other vendors and coordinate a release.  The security team keeps in contact "
 msgid ""
 "If the problem is severe, it is preferable to share the information with "
 "other vendors and coordinate a release.  The security team keeps in contact "


@@ -1427,7 +1413,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:951
+#: pkgs.dbk:956

 msgid ""
 "In all cases if the person who reports the problem asks that it not be "
 "disclosed, such requests should be honored, with the obvious exception of "
 msgid ""
 "In all cases if the person who reports the problem asks that it not be "
 "disclosed, such requests should be honored, with the obvious exception of "


@@ -1438,7 +1424,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:958
+#: pkgs.dbk:963

 msgid ""
 "Please note that if secrecy is needed you may not upload a fix to "
 "<literal>unstable</literal> (or anywhere else, such as a public CVS "
 msgid ""
 "Please note that if secrecy is needed you may not upload a fix to "
 "<literal>unstable</literal> (or anywhere else, such as a public CVS "


@@ -1449,7 +1435,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:965
+#: pkgs.dbk:970

 msgid ""
 "There are two reasons for releasing information even though secrecy is "
 "requested: the problem has been known for a while, or the problem or exploit "
 msgid ""
 "There are two reasons for releasing information even though secrecy is "
 "requested: the problem has been known for a while, or the problem or exploit "


@@ -1458,7 +1444,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:970
+#: pkgs.dbk:975

 msgid ""
 "The Security Team has a PGP-key to enable encrypted communication about "
 "sensitive issues. See the <ulink url=\"http://www.debian.org/security/faq.en."
 msgid ""
 "The Security Team has a PGP-key to enable encrypted communication about "
 "sensitive issues. See the <ulink url=\"http://www.debian.org/security/faq.en."


@@ -1467,13 +1453,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:976
+#: pkgs.dbk:981

 msgid "Security Advisories"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Security Advisories"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:978
+#: pkgs.dbk:983

 msgid ""
 "Security advisories are only issued for the current, released stable "
 "distribution, and <emphasis>not</emphasis> for <literal>testing</literal> or "
 msgid ""
 "Security advisories are only issued for the current, released stable "
 "distribution, and <emphasis>not</emphasis> for <literal>testing</literal> or "


@@ -1488,61 +1474,61 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:991
+#: pkgs.dbk:996

 msgid "A description of the problem and its scope, including:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "A description of the problem and its scope, including:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

-#: pkgs.dbk:996
+#: pkgs.dbk:1001

 msgid "The type of problem (privilege escalation, denial of service, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "The type of problem (privilege escalation, denial of service, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

-#: pkgs.dbk:1001
+#: pkgs.dbk:1006

 msgid "What privileges may be gained, and by whom (if any)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "What privileges may be gained, and by whom (if any)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

-#: pkgs.dbk:1006
+#: pkgs.dbk:1011

 msgid "How it can be exploited"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "How it can be exploited"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

-#: pkgs.dbk:1011
+#: pkgs.dbk:1016

 msgid "Whether it is remotely or locally exploitable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Whether it is remotely or locally exploitable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

-#: pkgs.dbk:1016
+#: pkgs.dbk:1021

 msgid "How the problem was fixed"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "How the problem was fixed"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1021
+#: pkgs.dbk:1026

 msgid "This information allows users to assess the threat to their systems."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "This information allows users to assess the threat to their systems."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1026
+#: pkgs.dbk:1031

 msgid "Version numbers of affected packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "Version numbers of affected packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1031
+#: pkgs.dbk:1036

 msgid "Version numbers of fixed packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "Version numbers of fixed packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1036
+#: pkgs.dbk:1041

 msgid ""
 "Information on where to obtain the updated packages (usually from the Debian "
 "security archive)"
 msgid ""
 "Information on where to obtain the updated packages (usually from the Debian "
 "security archive)"


@@ -1550,7 +1536,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1042
+#: pkgs.dbk:1047

 msgid ""
 "References to upstream advisories, <ulink url=\"http://cve.mitre.org\">CVE</"
 "ulink> identifiers, and any other information useful in cross-referencing "
 msgid ""
 "References to upstream advisories, <ulink url=\"http://cve.mitre.org\">CVE</"
 "ulink> identifiers, and any other information useful in cross-referencing "


@@ -1559,13 +1545,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1051
+#: pkgs.dbk:1056

 msgid "Preparing packages to address security issues"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Preparing packages to address security issues"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1053
+#: pkgs.dbk:1058

 msgid ""
 "One way that you can assist the security team in their duties is to provide "
 "them with fixed packages suitable for a security advisory for the stable "
 msgid ""
 "One way that you can assist the security team in their duties is to provide "
 "them with fixed packages suitable for a security advisory for the stable "


@@ -1574,7 +1560,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1058
+#: pkgs.dbk:1063

 msgid ""
 "When an update is made to the stable release, care must be taken to avoid "
 "changing system behavior or introducing new bugs.  In order to do this, make "
 msgid ""
 "When an update is made to the stable release, care must be taken to avoid "
 "changing system behavior or introducing new bugs.  In order to do this, make "


@@ -1586,7 +1572,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1066
+#: pkgs.dbk:1071

 msgid ""
 "This means that moving to a new upstream version is not a good solution.  "
 "Instead, the relevant changes should be back-ported to the version present "
 msgid ""
 "This means that moving to a new upstream version is not a good solution.  "
 "Instead, the relevant changes should be back-ported to the version present "


@@ -1597,7 +1583,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1072
+#: pkgs.dbk:1077

 msgid ""
 "In some cases, it is not possible to back-port a security fix, for example "
 "when large amounts of source code need to be modified or rewritten.  If this "
 msgid ""
 "In some cases, it is not possible to back-port a security fix, for example "
 "when large amounts of source code need to be modified or rewritten.  If this "


@@ -1608,7 +1594,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1079
+#: pkgs.dbk:1084

 msgid ""
 "Related to this is another important guideline: always test your changes.  "
 "If you have an exploit available, try it and see if it indeed succeeds on "
 msgid ""
 "Related to this is another important guideline: always test your changes.  "
 "If you have an exploit available, try it and see if it indeed succeeds on "


@@ -1619,7 +1605,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1086
+#: pkgs.dbk:1091

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> include any changes in your "
 "package which are not directly related to fixing the vulnerability.  These "
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> include any changes in your "
 "package which are not directly related to fixing the vulnerability.  These "


@@ -1633,7 +1619,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1096
+#: pkgs.dbk:1101

 msgid ""
 "Review and test your changes as much as possible.  Check the differences "
 "from the previous version repeatedly (<command>interdiff</command> from the "
 msgid ""
 "Review and test your changes as much as possible.  Check the differences "
 "from the previous version repeatedly (<command>interdiff</command> from the "


@@ -1644,13 +1630,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1104
+#: pkgs.dbk:1109

 msgid "Be sure to verify the following items:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "Be sure to verify the following items:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1109
+#: pkgs.dbk:1114

 msgid ""
 "<emphasis role=\"strong\">Target the right distribution</emphasis> in your "
 "<filename>debian/changelog</filename>.  For <literal>stable</literal> this "
 msgid ""
 "<emphasis role=\"strong\">Target the right distribution</emphasis> in your "
 "<filename>debian/changelog</filename>.  For <literal>stable</literal> this "


@@ -1663,14 +1649,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1120
+#: pkgs.dbk:1125

 msgid ""
 "The upload should have <emphasis role=\"strong\">urgency=high</emphasis>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The upload should have <emphasis role=\"strong\">urgency=high</emphasis>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1125
+#: pkgs.dbk:1130

 msgid ""
 "Make descriptive, meaningful changelog entries.  Others will rely on them to "
 "determine whether a particular bug was fixed.  Add <literal>closes:</"
 msgid ""
 "Make descriptive, meaningful changelog entries.  Others will rely on them to "
 "determine whether a particular bug was fixed.  Add <literal>closes:</"


@@ -1683,7 +1669,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1136
+#: pkgs.dbk:1141

 msgid ""
 "Make sure the <emphasis role=\"strong\">version number</emphasis> is "
 "proper.  It must be greater than the current package, but less than package "
 msgid ""
 "Make sure the <emphasis role=\"strong\">version number</emphasis> is "
 "proper.  It must be greater than the current package, but less than package "


@@ -1698,7 +1684,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1149
+#: pkgs.dbk:1154

 msgid ""
 "Unless the upstream source has been uploaded to <literal>security.debian.org "
 "</literal> before (by a previous security update), build the upload "
 msgid ""
 "Unless the upstream source has been uploaded to <literal>security.debian.org "
 "</literal> before (by a previous security update), build the upload "


@@ -1709,18 +1695,17 @@ msgid ""
 "-sd</literal>)."
 msgstr ""
 
 "-sd</literal>)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1159
+#: pkgs.dbk:1164

 msgid ""
 "Be sure to use the <emphasis role=\"strong\">exact same <filename>*.orig.tar."
 msgid ""
 "Be sure to use the <emphasis role=\"strong\">exact same <filename>*.orig.tar."

-"gz</filename></emphasis> as used in the normal archive, otherwise it is not "
-"possible to move the security fix into the main archives later."
+"{gz,bz2}</filename></emphasis> as used in the normal archive, otherwise it "
+"is not possible to move the security fix into the main archives later."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1167
+#: pkgs.dbk:1172

 msgid ""
 "Build the package on a <emphasis role=\"strong\">clean system</emphasis> "
 "which only has packages installed from the distribution you are building "
 msgid ""
 "Build the package on a <emphasis role=\"strong\">clean system</emphasis> "
 "which only has packages installed from the distribution you are building "


@@ -1731,13 +1716,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1178
+#: pkgs.dbk:1183

 msgid "Uploading the fixed package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Uploading the fixed package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1180
+#: pkgs.dbk:1185

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 "upload queue (<literal>oldstable-security</literal>, <literal>stable-"
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 "upload queue (<literal>oldstable-security</literal>, <literal>stable-"


@@ -1748,7 +1733,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1187
+#: pkgs.dbk:1192

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload your fix to <literal> "
 "proposed-updates</literal> without coordinating with the security team.  "
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload your fix to <literal> "
 "proposed-updates</literal> without coordinating with the security team.  "


@@ -1762,7 +1747,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1197
+#: pkgs.dbk:1202

 msgid ""
 "Once you have created and tested the new package and it has been approved by "
 "the security team, it needs to be uploaded so that it can be installed in "
 msgid ""
 "Once you have created and tested the new package and it has been approved by "
 "the security team, it needs to be uploaded so that it can be installed in "


@@ -1773,7 +1758,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1203
+#: pkgs.dbk:1208

 msgid ""
 "Once an upload to the security queue has been accepted, the package will "
 "automatically be built for all architectures and stored for verification by "
 msgid ""
 "Once an upload to the security queue has been accepted, the package will "
 "automatically be built for all architectures and stored for verification by "


@@ -1782,7 +1767,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1208
+#: pkgs.dbk:1213

 msgid ""
 "Uploads which are waiting for acceptance or verification are only accessible "
 "by the security team.  This is necessary since there might be fixes for "
 msgid ""
 "Uploads which are waiting for acceptance or verification are only accessible "
 "by the security team.  This is necessary since there might be fixes for "


@@ -1791,7 +1776,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1213
+#: pkgs.dbk:1218

 msgid ""
 "If a member of the security team accepts a package, it will be installed on "
 "<literal>security.debian.org</literal> as well as proposed for the proper "
 msgid ""
 "If a member of the security team accepts a package, it will be installed on "
 "<literal>security.debian.org</literal> as well as proposed for the proper "


@@ -1801,13 +1786,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:1225
+#: pkgs.dbk:1230

 msgid "Moving, removing, renaming, adopting, and orphaning packages"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Moving, removing, renaming, adopting, and orphaning packages"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:1227
+#: pkgs.dbk:1232

 msgid ""
 "Some archive manipulation operations are not automated in the Debian upload "
 "process.  These procedures should be manually followed by maintainers.  This "
 msgid ""
 "Some archive manipulation operations are not automated in the Debian upload "
 "process.  These procedures should be manually followed by maintainers.  This "


@@ -1816,20 +1801,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1232
+#: pkgs.dbk:1237

 msgid "Moving packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para><footnote><para>
 #. type: Content of: <chapter><section><section><para><footnote><para>
 msgid "Moving packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para><footnote><para>
 #. type: Content of: <chapter><section><section><para><footnote><para>

-#: pkgs.dbk:1236
+#: pkgs.dbk:1241

 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "guidelines on what section a package belongs in."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "guidelines on what section a package belongs in."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1234
+#: pkgs.dbk:1239

 msgid ""
 "Sometimes a package will change its section.  For instance, a package from "
 "the `non-free' section might be GPL'd in a later version, in which case the "
 msgid ""
 "Sometimes a package will change its section.  For instance, a package from "
 "the `non-free' section might be GPL'd in a later version, in which case the "


@@ -1837,15 +1822,14 @@ msgid ""
 "\" id=\"0\"/>"
 msgstr ""
 
 "\" id=\"0\"/>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1241
+#: pkgs.dbk:1246

 msgid ""
 "If you need to change the section for one of your packages, change the "
 "package control information to place the package in the desired section, and "
 "re-upload the package (see the <ulink url=\"&url-debian-policy;\">Debian "
 "Policy Manual</ulink> for details).  You must ensure that you include the "
 msgid ""
 "If you need to change the section for one of your packages, change the "
 "package control information to place the package in the desired section, and "
 "re-upload the package (see the <ulink url=\"&url-debian-policy;\">Debian "
 "Policy Manual</ulink> for details).  You must ensure that you include the "

-"<filename>.orig.tar.gz</filename> in your upload (even if you are not "
+"<filename>.orig.tar.{gz,bz2}</filename> in your upload (even if you are not "

 "uploading a new upstream version), or it will not appear in the new section "
 "together with the rest of the package.  If your new section is valid, it "
 "will be moved automatically.  If it does not, then contact the ftpmasters in "
 "uploading a new upstream version), or it will not appear in the new section "
 "together with the rest of the package.  If your new section is valid, it "
 "will be moved automatically.  If it does not, then contact the ftpmasters in "


@@ -1854,7 +1838,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1253
+#: pkgs.dbk:1258

 msgid ""
 "If, on the other hand, you need to change the <literal>subsection</literal> "
 "of one of your packages (e.g., ``devel'', ``admin''), the procedure is "
 msgid ""
 "If, on the other hand, you need to change the <literal>subsection</literal> "
 "of one of your packages (e.g., ``devel'', ``admin''), the procedure is "


@@ -1865,13 +1849,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1262
+#: pkgs.dbk:1267

 msgid "Removing packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Removing packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1264
+#: pkgs.dbk:1269

 msgid ""
 "If for some reason you want to completely remove a package (say, if it is an "
 "old compatibility library which is no longer required), you need to file a "
 msgid ""
 "If for some reason you want to completely remove a package (say, if it is an "
 "old compatibility library which is no longer required), you need to file a "


@@ -1891,7 +1875,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1281
+#: pkgs.dbk:1286

 msgid ""
 "If you want to remove a package you maintain, you should note this in the "
 "bug title by prepending <literal>ROM</literal> (Request Of Maintainer).  "
 msgid ""
 "If you want to remove a package you maintain, you should note this in the "
 "bug title by prepending <literal>ROM</literal> (Request Of Maintainer).  "


@@ -1903,7 +1887,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1290
+#: pkgs.dbk:1295

 msgid ""
 "Note that removals can only be done for the <literal>unstable </literal>, "
 "<literal>experimental</literal> and <literal>stable </literal> "
 msgid ""
 "Note that removals can only be done for the <literal>unstable </literal>, "
 "<literal>experimental</literal> and <literal>stable </literal> "


@@ -1915,7 +1899,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1299
+#: pkgs.dbk:1304

 msgid ""
 "There is one exception when an explicit removal request is not necessary: If "
 "a (source or binary) package is an orphan, it will be removed semi-"
 msgid ""
 "There is one exception when an explicit removal request is not necessary: If "
 "a (source or binary) package is an orphan, it will be removed semi-"


@@ -1928,7 +1912,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1308
+#: pkgs.dbk:1313

 msgid ""
 "In your removal request, you have to detail the reasons justifying the "
 "request.  This is to avoid unwanted removals and to keep a trace of why a "
 msgid ""
 "In your removal request, you have to detail the reasons justifying the "
 "request.  This is to avoid unwanted removals and to keep a trace of why a "


@@ -1938,7 +1922,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1314
+#: pkgs.dbk:1319

 msgid ""
 "Usually you only ask for the removal of a package maintained by yourself.  "
 "If you want to remove another package, you have to get the approval of its "
 msgid ""
 "Usually you only ask for the removal of a package maintained by yourself.  "
 "If you want to remove another package, you have to get the approval of its "


@@ -1951,7 +1935,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1324
+#: pkgs.dbk:1329

 msgid ""
 "Further information relating to these and other package removal related "
 "topics may be found at <ulink url=\"http://wiki.debian.org/ftpmaster_Removals"
 msgid ""
 "Further information relating to these and other package removal related "
 "topics may be found at <ulink url=\"http://wiki.debian.org/ftpmaster_Removals"


@@ -1960,7 +1944,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1329
+#: pkgs.dbk:1334

 msgid ""
 "If in doubt concerning whether a package is disposable, email &email-debian-"
 "devel; asking for opinions.  Also of interest is the <command>apt-cache</"
 msgid ""
 "If in doubt concerning whether a package is disposable, email &email-debian-"
 "devel; asking for opinions.  Also of interest is the <command>apt-cache</"


@@ -1975,7 +1959,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1342
+#: pkgs.dbk:1347

 msgid ""
 "Once the package has been removed, the package's bugs should be handled.  "
 "They should either be reassigned to another package in the case where the "
 msgid ""
 "Once the package has been removed, the package's bugs should be handled.  "
 "They should either be reassigned to another package in the case where the "


@@ -1989,13 +1973,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1353
+#: pkgs.dbk:1358

 msgid "Removing packages from <filename>Incoming</filename>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Removing packages from <filename>Incoming</filename>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1355
+#: pkgs.dbk:1360

 msgid ""
 "In the past, it was possible to remove packages from <filename>incoming</"
 "filename>.  However, with the introduction of the new incoming system, this "
 msgid ""
 "In the past, it was possible to remove packages from <filename>incoming</"
 "filename>.  However, with the introduction of the new incoming system, this "


@@ -2010,13 +1994,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1370
+#: pkgs.dbk:1375

 msgid "Replacing or renaming packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Replacing or renaming packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1372
+#: pkgs.dbk:1377

 msgid ""
 "When the upstream maintainers for one of your packages chose to rename their "
 "software (or you made a mistake naming your package), you should follow a "
 msgid ""
 "When the upstream maintainers for one of your packages chose to rename their "
 "software (or you made a mistake naming your package), you should follow a "


@@ -2033,9 +2017,8 @@ msgid ""
 "package's bugs at the same time."
 msgstr ""
 
 "package's bugs at the same time."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1388
+#: pkgs.dbk:1393

 msgid ""
 "At other times, you may make a mistake in constructing your package and wish "
 "to replace it.  The only way to do this is to increase the version number "
 msgid ""
 "At other times, you may make a mistake in constructing your package and wish "
 "to replace it.  The only way to do this is to increase the version number "


@@ -2044,19 +2027,20 @@ msgid ""
 "sources: if you wish to replace the upstream source tarball of your package, "
 "you will need to upload it with a different version.  An easy possibility is "
 "to replace <filename>foo_1.00.orig.tar.gz</filename> with <filename>foo_1.00"
 "sources: if you wish to replace the upstream source tarball of your package, "
 "you will need to upload it with a different version.  An easy possibility is "
 "to replace <filename>foo_1.00.orig.tar.gz</filename> with <filename>foo_1.00"

-"+0.orig.tar.gz</filename>.  This restriction gives each file on the ftp site "
-"a unique name, which helps to ensure consistency across the mirror network."
+"+0.orig.tar.gz</filename> or <filename>foo_1.00.orig.tar.bz2</filename>.  "
+"This restriction gives each file on the ftp site a unique name, which helps "
+"to ensure consistency across the mirror network."

 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1402
+#: pkgs.dbk:1408

 msgid "Orphaning a package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Orphaning a package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1404
+#: pkgs.dbk:1410

 msgid ""
 "If you can no longer maintain a package, you need to inform others, and see "
 "that the package is marked as orphaned.  You should set the package "
 msgid ""
 "If you can no longer maintain a package, you need to inform others, and see "
 "that the package is marked as orphaned.  You should set the package "


@@ -2075,7 +2059,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1419
+#: pkgs.dbk:1425

 msgid ""
 "If you just intend to give the package away, but you can keep maintainership "
 "for the moment, then you should instead submit a bug against <systemitem "
 msgid ""
 "If you just intend to give the package away, but you can keep maintainership "
 "for the moment, then you should instead submit a bug against <systemitem "


@@ -2087,20 +2071,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1427
+#: pkgs.dbk:1433

 msgid ""
 "More information is on the <ulink url=\"&url-wnpp;\">WNPP web pages</ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgid ""
 "More information is on the <ulink url=\"&url-wnpp;\">WNPP web pages</ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1433
+#: pkgs.dbk:1439

 msgid "Adopting a package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Adopting a package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1435
+#: pkgs.dbk:1441

 msgid ""
 "A list of packages in need of a new maintainer is available in the <ulink "
 "url=\"&url-wnpp;\">Work-Needing and Prospective Packages list (WNPP)</"
 msgid ""
 "A list of packages in need of a new maintainer is available in the <ulink "
 "url=\"&url-wnpp;\">Work-Needing and Prospective Packages list (WNPP)</"


@@ -2111,7 +2095,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1442
+#: pkgs.dbk:1448

 msgid ""
 "It is not OK to simply take over a package that you feel is neglected — that "
 "would be package hijacking.  You can, of course, contact the current "
 msgid ""
 "It is not OK to simply take over a package that you feel is neglected — that "
 "would be package hijacking.  You can, of course, contact the current "


@@ -2122,7 +2106,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1448
+#: pkgs.dbk:1454

 msgid ""
 "Generally, you may not take over the package without the assent of the "
 "current maintainer.  Even if they ignore you, that is still not grounds to "
 msgid ""
 "Generally, you may not take over the package without the assent of the "
 "current maintainer.  Even if they ignore you, that is still not grounds to "


@@ -2135,7 +2119,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1458
+#: pkgs.dbk:1464

 msgid ""
 "If you take over an old package, you probably want to be listed as the "
 "package's official maintainer in the bug system.  This will happen "
 msgid ""
 "If you take over an old package, you probably want to be listed as the "
 "package's official maintainer in the bug system.  This will happen "


@@ -2149,13 +2133,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:1472
+#: pkgs.dbk:1478

 msgid "Porting and being ported"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Porting and being ported"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:1474
+#: pkgs.dbk:1480

 msgid ""
 "Debian supports an ever-increasing number of architectures.  Even if you are "
 "not a porter, and you don't use any architecture but one, it is part of your "
 msgid ""
 "Debian supports an ever-increasing number of architectures.  Even if you are "
 "not a porter, and you don't use any architecture but one, it is part of your "


@@ -2165,7 +2149,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:1480
+#: pkgs.dbk:1486

 msgid ""
 "Porting is the act of building Debian packages for architectures that are "
 "different from the original architecture of the package maintainer's binary "
 msgid ""
 "Porting is the act of building Debian packages for architectures that are "
 "different from the original architecture of the package maintainer's binary "


@@ -2178,13 +2162,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1489
+#: pkgs.dbk:1495

 msgid "Being kind to porters"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Being kind to porters"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1491
+#: pkgs.dbk:1497

 msgid ""
 "Porters have a difficult and unique task, since they are required to deal "
 "with a large volume of packages.  Ideally, every source package should build "
 msgid ""
 "Porters have a difficult and unique task, since they are required to deal "
 "with a large volume of packages.  Ideally, every source package should build "


@@ -2196,7 +2180,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1499
+#: pkgs.dbk:1505

 msgid ""
 "The first and most important thing is to respond quickly to bug or issues "
 "raised by porters.  Please treat porters with courtesy, as if they were in "
 msgid ""
 "The first and most important thing is to respond quickly to bug or issues "
 "raised by porters.  Please treat porters with courtesy, as if they were in "


@@ -2207,7 +2191,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1506
+#: pkgs.dbk:1512

 msgid ""
 "By far, most of the problems encountered by porters are caused by "
 "<emphasis>packaging bugs</emphasis> in the source packages.  Here is a "
 msgid ""
 "By far, most of the problems encountered by porters are caused by "
 "<emphasis>packaging bugs</emphasis> in the source packages.  Here is a "


@@ -2216,7 +2200,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1513
+#: pkgs.dbk:1519

 msgid ""
 "Make sure that your <literal>Build-Depends</literal> and <literal>Build-"
 "Depends-Indep</literal> settings in <filename>debian/control</filename> are "
 msgid ""
 "Make sure that your <literal>Build-Depends</literal> and <literal>Build-"
 "Depends-Indep</literal> settings in <filename>debian/control</filename> are "


@@ -2234,7 +2218,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1528
+#: pkgs.dbk:1534

 msgid ""
 "If you can't set up a proper chroot, <command>dpkg-depcheck</command> may be "
 "of assistance (see <xref linkend=\"dpkg-depcheck\"/> )."
 msgid ""
 "If you can't set up a proper chroot, <command>dpkg-depcheck</command> may be "
 "of assistance (see <xref linkend=\"dpkg-depcheck\"/> )."


@@ -2242,7 +2226,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1532
+#: pkgs.dbk:1538

 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "instructions on setting build dependencies."
 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "instructions on setting build dependencies."


@@ -2250,7 +2234,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1538
+#: pkgs.dbk:1544

 msgid ""
 "Don't set architecture to a value other than <literal>all</literal> or "
 "<literal>any</literal> unless you really mean it.  In too many cases, "
 msgid ""
 "Don't set architecture to a value other than <literal>all</literal> or "
 "<literal>any</literal> unless you really mean it.  In too many cases, "


@@ -2262,7 +2246,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1548
+#: pkgs.dbk:1554

 msgid ""
 "Make sure your source package is correct.  Do <literal>dpkg-source -x "
 "<replaceable>package</replaceable>.dsc</literal> to make sure your source "
 msgid ""
 "Make sure your source package is correct.  Do <literal>dpkg-source -x "
 "<replaceable>package</replaceable>.dsc</literal> to make sure your source "


@@ -2272,7 +2256,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1556
+#: pkgs.dbk:1562

 msgid ""
 "Make sure you don't ship your source package with the <filename>debian/"
 "files</filename> or <filename>debian/substvars</filename> files.  They "
 msgid ""
 "Make sure you don't ship your source package with the <filename>debian/"
 "files</filename> or <filename>debian/substvars</filename> files.  They "


@@ -2282,7 +2266,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1564
+#: pkgs.dbk:1570

 msgid ""
 "Make sure you don't rely on locally installed or hacked configurations or "
 "programs.  For instance, you should never be calling programs in <filename>/"
 msgid ""
 "Make sure you don't rely on locally installed or hacked configurations or "
 "programs.  For instance, you should never be calling programs in <filename>/"


@@ -2293,7 +2277,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1573
+#: pkgs.dbk:1579

 msgid ""
 "Don't depend on the package you're building being installed already (a sub-"
 "case of the above issue). There are, of course, exceptions to this rule, but "
 msgid ""
 "Don't depend on the package you're building being installed already (a sub-"
 "case of the above issue). There are, of course, exceptions to this rule, but "


@@ -2303,7 +2287,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1581
+#: pkgs.dbk:1587

 msgid ""
 "Don't rely on the compiler being a certain version, if possible.  If not, "
 "then make sure your build dependencies reflect the restrictions, although "
 msgid ""
 "Don't rely on the compiler being a certain version, if possible.  If not, "
 "then make sure your build dependencies reflect the restrictions, although "


@@ -2313,7 +2297,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1589
+#: pkgs.dbk:1595

 msgid ""
 "Make sure your debian/rules contains separate <literal>binary-arch</literal> "
 "and <literal>binary-indep</literal> targets, as the Debian Policy Manual "
 msgid ""
 "Make sure your debian/rules contains separate <literal>binary-arch</literal> "
 "and <literal>binary-indep</literal> targets, as the Debian Policy Manual "


@@ -2324,13 +2308,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1600
+#: pkgs.dbk:1606

 msgid "Guidelines for porter uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Guidelines for porter uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1602
+#: pkgs.dbk:1608

 msgid ""
 "If the package builds out of the box for the architecture to be ported to, "
 "you are in luck and your job is easy.  This section applies to that case; it "
 msgid ""
 "If the package builds out of the box for the architecture to be ported to, "
 "you are in luck and your job is easy.  This section applies to that case; it "


@@ -2342,7 +2326,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1610
+#: pkgs.dbk:1616

 msgid ""
 "For a porter upload, no changes are being made to the source.  You do not "
 "need to touch any of the files in the source package.  This includes "
 msgid ""
 "For a porter upload, no changes are being made to the source.  You do not "
 "need to touch any of the files in the source package.  This includes "


@@ -2351,7 +2335,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1615
+#: pkgs.dbk:1621

 msgid ""
 "The way to invoke <command>dpkg-buildpackage</command> is as <literal>dpkg-"
 "buildpackage -B -m<replaceable>porter-email</replaceable></literal>.  Of "
 msgid ""
 "The way to invoke <command>dpkg-buildpackage</command> is as <literal>dpkg-"
 "buildpackage -B -m<replaceable>porter-email</replaceable></literal>.  Of "


@@ -2363,7 +2347,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1624
+#: pkgs.dbk:1630

 msgid ""
 "If you are working on a Debian machine for your porting efforts and you need "
 "to sign your upload locally for its acceptance in the archive, you can run "
 msgid ""
 "If you are working on a Debian machine for your porting efforts and you need "
 "to sign your upload locally for its acceptance in the archive, you can run "


@@ -2374,13 +2358,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1631
+#: pkgs.dbk:1637

 msgid "Recompilation or binary-only NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Recompilation or binary-only NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1633
+#: pkgs.dbk:1639

 msgid ""
 "Sometimes the initial porter upload is problematic because the environment "
 "in which the package was built was not good enough (outdated or obsolete "
 msgid ""
 "Sometimes the initial porter upload is problematic because the environment "
 "in which the package was built was not good enough (outdated or obsolete "


@@ -2393,7 +2377,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1642
+#: pkgs.dbk:1648

 msgid ""
 "You have to make sure that your binary-only NMU doesn't render the package "
 "uninstallable.  This could happen when a source package generates arch-"
 msgid ""
 "You have to make sure that your binary-only NMU doesn't render the package "
 "uninstallable.  This could happen when a source package generates arch-"


@@ -2404,7 +2388,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1649
+#: pkgs.dbk:1655

 msgid ""
 "Despite the required modification of the changelog, these are called binary-"
 "only NMUs — there is no need in this case to trigger all other architectures "
 msgid ""
 "Despite the required modification of the changelog, these are called binary-"
 "only NMUs — there is no need in this case to trigger all other architectures "


@@ -2413,7 +2397,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1654
+#: pkgs.dbk:1660

 msgid ""
 "Such recompilations require special ``magic'' version numbering, so that the "
 "archive maintenance tools recognize that, even though there is a new Debian "
 msgid ""
 "Such recompilations require special ``magic'' version numbering, so that the "
 "archive maintenance tools recognize that, even though there is a new Debian "


@@ -2424,7 +2408,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para><footnote><para>
 #. type: Content of: <chapter><section><section><section><para><footnote><para>
 
 # type: Content of: <chapter><section><section><section><para><footnote><para>
 #. type: Content of: <chapter><section><section><section><para><footnote><para>

-#: pkgs.dbk:1669
+#: pkgs.dbk:1675

 msgid ""
 "In the past, such NMUs used the third-level number on the Debian part of the "
 "revision to denote their recompilation-only status; however, this syntax was "
 msgid ""
 "In the past, such NMUs used the third-level number on the Debian part of the "
 "revision to denote their recompilation-only status; however, this syntax was "


@@ -2434,7 +2418,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1661
+#: pkgs.dbk:1667

 msgid ""
 "The ``magic'' for a recompilation-only NMU is triggered by using a suffix "
 "appended to the package version number, following the form <literal> "
 msgid ""
 "The ``magic'' for a recompilation-only NMU is triggered by using a suffix "
 "appended to the package version number, following the form <literal> "


@@ -2449,7 +2433,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1677
+#: pkgs.dbk:1683

 msgid ""
 "Similar to initial porter uploads, the correct way of invoking <command>dpkg-"
 "buildpackage</command> is <literal>dpkg-buildpackage -B</literal> to only "
 msgid ""
 "Similar to initial porter uploads, the correct way of invoking <command>dpkg-"
 "buildpackage</command> is <literal>dpkg-buildpackage -B</literal> to only "


@@ -2458,13 +2442,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1684
+#: pkgs.dbk:1690

 msgid "When to do a source NMU if you are a porter"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "When to do a source NMU if you are a porter"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1686
+#: pkgs.dbk:1692

 msgid ""
 "Porters doing a source NMU generally follow the guidelines found in <xref "
 "linkend=\"nmu\"/> , just like non-porters.  However, it is expected that the "
 msgid ""
 "Porters doing a source NMU generally follow the guidelines found in <xref "
 "linkend=\"nmu\"/> , just like non-porters.  However, it is expected that the "


@@ -2478,7 +2462,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1695
+#: pkgs.dbk:1701

 msgid ""
 "If you are a porter doing an NMU for <literal>unstable</literal>, the above "
 "guidelines for porting should be followed, with two variations.  Firstly, "
 msgid ""
 "If you are a porter doing an NMU for <literal>unstable</literal>, the above "
 "guidelines for porting should be followed, with two variations.  Firstly, "


@@ -2494,7 +2478,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1707
+#: pkgs.dbk:1713

 msgid ""
 "Secondly, porters doing source NMUs should make sure that the bug they "
 "submit to the BTS should be of severity <literal>serious</literal> or "
 msgid ""
 "Secondly, porters doing source NMUs should make sure that the bug they "
 "submit to the BTS should be of severity <literal>serious</literal> or "


@@ -2506,7 +2490,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1715
+#: pkgs.dbk:1721

 msgid ""
 "Porters should try to avoid patches which simply kludge around bugs in the "
 "current version of the compile environment, kernel, or libc.  Sometimes such "
 msgid ""
 "Porters should try to avoid patches which simply kludge around bugs in the "
 "current version of the compile environment, kernel, or libc.  Sometimes such "


@@ -2518,7 +2502,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1723
+#: pkgs.dbk:1729

 msgid ""
 "Porters may also have an unofficial location where they can put the results "
 "of their work during the waiting period.  This helps others running the port "
 msgid ""
 "Porters may also have an unofficial location where they can put the results "
 "of their work during the waiting period.  This helps others running the port "


@@ -2528,13 +2512,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1733
+#: pkgs.dbk:1739

 msgid "Porting infrastructure and automation"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Porting infrastructure and automation"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1735
+#: pkgs.dbk:1741

 msgid ""
 "There is infrastructure and several tools to help automate package porting.  "
 "This section contains a brief overview of this automation and porting to "
 msgid ""
 "There is infrastructure and several tools to help automate package porting.  "
 "This section contains a brief overview of this automation and porting to "


@@ -2544,13 +2528,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1740
+#: pkgs.dbk:1746

 msgid "Mailing lists and web pages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Mailing lists and web pages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1742
+#: pkgs.dbk:1748

 msgid ""
 "Web pages containing the status of each port can be found at <ulink url="
 "\"&url-debian-ports;\"></ulink>."
 msgid ""
 "Web pages containing the status of each port can be found at <ulink url="
 "\"&url-debian-ports;\"></ulink>."


@@ -2558,7 +2542,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1746
+#: pkgs.dbk:1752

 msgid ""
 "Each port of Debian has a mailing list.  The list of porting mailing lists "
 "can be found at <ulink url=\"&url-debian-port-lists;\"></ulink>.  These "
 msgid ""
 "Each port of Debian has a mailing list.  The list of porting mailing lists "
 "can be found at <ulink url=\"&url-debian-port-lists;\"></ulink>.  These "


@@ -2568,13 +2552,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1754
+#: pkgs.dbk:1760

 msgid "Porter tools"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Porter tools"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1756
+#: pkgs.dbk:1762

 msgid ""
 "Descriptions of several porting tools can be found in <xref linkend=\"tools-"
 "porting\"/> ."
 msgid ""
 "Descriptions of several porting tools can be found in <xref linkend=\"tools-"
 "porting\"/> ."


@@ -2582,13 +2566,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1762
+#: pkgs.dbk:1768

 msgid "<systemitem role=\"package\">wanna-build</systemitem>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "<systemitem role=\"package\">wanna-build</systemitem>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1764
+#: pkgs.dbk:1770

 msgid ""
 "The <systemitem role=\"package\">wanna-build</systemitem> system is used as "
 "a distributed, client-server build distribution system.  It is usually used "
 msgid ""
 "The <systemitem role=\"package\">wanna-build</systemitem> system is used as "
 "a distributed, client-server build distribution system.  It is usually used "


@@ -2601,7 +2585,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1772
+#: pkgs.dbk:1778

 msgid ""
 "<systemitem role=\"package\">wanna-build</systemitem> is not yet available "
 "as a package; however, all Debian porting efforts are using it for automated "
 msgid ""
 "<systemitem role=\"package\">wanna-build</systemitem> is not yet available "
 "as a package; however, all Debian porting efforts are using it for automated "


@@ -2614,7 +2598,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1781
+#: pkgs.dbk:1787

 msgid ""
 "Most of the data produced by <systemitem role=\"package\">wanna-build </"
 "systemitem> which is generally useful to porters is available on the web at "
 msgid ""
 "Most of the data produced by <systemitem role=\"package\">wanna-build </"
 "systemitem> which is generally useful to porters is available on the web at "


@@ -2624,7 +2608,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1787
+#: pkgs.dbk:1793

 msgid ""
 "We are quite proud of this system, since it has so many possible uses.  "
 "Independent development groups can use the system for different sub-flavors "
 msgid ""
 "We are quite proud of this system, since it has so many possible uses.  "
 "Independent development groups can use the system for different sub-flavors "


@@ -2634,7 +2618,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1794
+#: pkgs.dbk:1800

 msgid ""
 "The wanna-build team, in charge of the buildds, can be reached at "
 "<literal>debian-wb-team@lists.debian.org</literal>.  To determine who (wanna-"
 msgid ""
 "The wanna-build team, in charge of the buildds, can be reached at "
 "<literal>debian-wb-team@lists.debian.org</literal>.  To determine who (wanna-"


@@ -2643,7 +2627,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1801
+#: pkgs.dbk:1807

 msgid ""
 "When requesting binNMUs or give-backs (retries after a failed build), please "
 "use the format described at <ulink url=\"&url-release-wb;\"/>."
 msgid ""
 "When requesting binNMUs or give-backs (retries after a failed build), please "
 "use the format described at <ulink url=\"&url-release-wb;\"/>."


@@ -2651,13 +2635,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1810
+#: pkgs.dbk:1816

 msgid "When your package is <emphasis>not</emphasis> portable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "When your package is <emphasis>not</emphasis> portable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1812
+#: pkgs.dbk:1818

 msgid ""
 "Some packages still have issues with building and/or working on some of the "
 "architectures supported by Debian, and cannot be ported at all, or not "
 msgid ""
 "Some packages still have issues with building and/or working on some of the "
 "architectures supported by Debian, and cannot be ported at all, or not "


@@ -2669,7 +2653,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1819
+#: pkgs.dbk:1825

 msgid ""
 "In order to prevent broken packages from being uploaded to the archive, and "
 "wasting buildd time, you need to do a few things:"
 msgid ""
 "In order to prevent broken packages from being uploaded to the archive, and "
 "wasting buildd time, you need to do a few things:"


@@ -2677,7 +2661,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1825
+#: pkgs.dbk:1831

 msgid ""
 "First, make sure your package <emphasis>does</emphasis> fail to build on "
 "architectures that it cannot support.  There are a few ways to achieve "
 msgid ""
 "First, make sure your package <emphasis>does</emphasis> fail to build on "
 "architectures that it cannot support.  There are a few ways to achieve "


@@ -2690,7 +2674,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1833
+#: pkgs.dbk:1839

 msgid ""
 "Additionally, if you believe the list of supported architectures is pretty "
 "constant, you should change <literal>any</literal> to a list of supported "
 msgid ""
 "Additionally, if you believe the list of supported architectures is pretty "
 "constant, you should change <literal>any</literal> to a list of supported "


@@ -2698,21 +2682,19 @@ msgid ""
 "will fail also, and indicate this to a human reader without actually trying."
 msgstr ""
 
 "will fail also, and indicate this to a human reader without actually trying."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>

 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1841
+#: pkgs.dbk:1847

 msgid ""
 "In order to prevent autobuilders from needlessly trying to build your "
 "package, it must be included in <filename>packages-arch-specific</filename>, "
 "a list used by the <command>wanna-build</command> script.  The current "
 msgid ""
 "In order to prevent autobuilders from needlessly trying to build your "
 "package, it must be included in <filename>packages-arch-specific</filename>, "
 "a list used by the <command>wanna-build</command> script.  The current "

-"version is available as <ulink url=\"&url-cvsweb;srcdep/Packages-arch-"
-"specific?cvsroot=dak\"></ulink>; please see the top of the file for whom to "
-"contact for changes."
+"version is available as <ulink url=\"&url-buildd-p-a-s;\"/>; please see the "
+"top of the file for whom to contact for changes."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1851
+#: pkgs.dbk:1856

 msgid ""
 "Please note that it is insufficient to only add your package to Packages-"
 "arch-specific without making it fail to build on unsupported architectures: "
 msgid ""
 "Please note that it is insufficient to only add your package to Packages-"
 "arch-specific without making it fail to build on unsupported architectures: "


@@ -2725,13 +2707,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:1864
+#: pkgs.dbk:1869

 msgid "Non-Maintainer Uploads (NMUs)"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Non-Maintainer Uploads (NMUs)"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:1866
+#: pkgs.dbk:1871

 msgid ""
 "Every package has one or more maintainers. Normally, these are the people "
 "who work on and upload new versions of the package. In some situations, it "
 msgid ""
 "Every package has one or more maintainers. Normally, these are the people "
 "who work on and upload new versions of the package. In some situations, it "


@@ -2743,19 +2725,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1875
+#: pkgs.dbk:1880

 msgid "When and how to do an NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "When and how to do an NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1878
+#: pkgs.dbk:1883

 msgid "Before doing an NMU, consider the following questions:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Before doing an NMU, consider the following questions:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1883
+#: pkgs.dbk:1888

 msgid ""
 "Does your NMU really fix bugs? Fixing cosmetic issues or changing the "
 "packaging style in NMUs is discouraged."
 msgid ""
 "Does your NMU really fix bugs? Fixing cosmetic issues or changing the "
 "packaging style in NMUs is discouraged."


@@ -2763,7 +2745,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1889
+#: pkgs.dbk:1894

 msgid ""
 "Did you give enough time to the maintainer? When was the bug reported to the "
 "BTS? Being busy for a week or two isn't unusual.  Is the bug so severe that "
 msgid ""
 "Did you give enough time to the maintainer? When was the bug reported to the "
 "BTS? Being busy for a week or two isn't unusual.  Is the bug so severe that "


@@ -2772,7 +2754,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1896
+#: pkgs.dbk:1901

 msgid ""
 "How confident are you about your changes? Please remember the Hippocratic "
 "Oath: \"Above all, do no harm.\" It is better to leave a package with an "
 msgid ""
 "How confident are you about your changes? Please remember the Hippocratic "
 "Oath: \"Above all, do no harm.\" It is better to leave a package with an "


@@ -2784,7 +2766,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1906
+#: pkgs.dbk:1911

 msgid ""
 "Have you clearly expressed your intention to NMU, at least in the BTS? It is "
 "also a good idea to try to contact the maintainer by other means (private "
 msgid ""
 "Have you clearly expressed your intention to NMU, at least in the BTS? It is "
 "also a good idea to try to contact the maintainer by other means (private "


@@ -2793,7 +2775,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1913
+#: pkgs.dbk:1918

 msgid ""
 "If the maintainer is usually active and responsive, have you tried to "
 "contact him? In general it should be considered preferable that a maintainer "
 msgid ""
 "If the maintainer is usually active and responsive, have you tried to "
 "contact him? In general it should be considered preferable that a maintainer "


@@ -2805,7 +2787,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1923
+#: pkgs.dbk:1928

 msgid ""
 "When doing an NMU, you must first make sure that your intention to NMU is "
 "clear.  Then, you must send a patch with the differences between the current "
 msgid ""
 "When doing an NMU, you must first make sure that your intention to NMU is "
 "clear.  Then, you must send a patch with the differences between the current "


@@ -2815,7 +2797,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1930
+#: pkgs.dbk:1935

 msgid ""
 "While preparing the patch, you should better be aware of any package-"
 "specific practices that the maintainer might be using. Taking them into "
 msgid ""
 "While preparing the patch, you should better be aware of any package-"
 "specific practices that the maintainer might be using. Taking them into "


@@ -2828,7 +2810,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1938
+#: pkgs.dbk:1943

 msgid ""
 "Unless you have an excellent reason not to do so, you must then give some "
 "time to the maintainer to react (for example, by uploading to the "
 msgid ""
 "Unless you have an excellent reason not to do so, you must then give some "
 "time to the maintainer to react (for example, by uploading to the "


@@ -2838,25 +2820,25 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1945
+#: pkgs.dbk:1950

 msgid "Upload fixing only release-critical bugs older than 7 days: 2 days"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Upload fixing only release-critical bugs older than 7 days: 2 days"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1950
+#: pkgs.dbk:1955

 msgid "Upload fixing only release-critical and important bugs: 5 days"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Upload fixing only release-critical and important bugs: 5 days"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1955
+#: pkgs.dbk:1960

 msgid "Other NMUs: 10 days"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Other NMUs: 10 days"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1961
+#: pkgs.dbk:1966

 msgid ""
 "Those delays are only examples. In some cases, such as uploads fixing "
 "security issues, or fixes for trivial bugs that blocking a transition, it is "
 msgid ""
 "Those delays are only examples. In some cases, such as uploads fixing "
 "security issues, or fixes for trivial bugs that blocking a transition, it is "


@@ -2865,7 +2847,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1967
+#: pkgs.dbk:1972

 msgid ""
 "Sometimes, release managers decide to allow NMUs with shorter delays for a "
 "subset of bugs (e.g release-critical bugs older than 7 days). Also, some "
 msgid ""
 "Sometimes, release managers decide to allow NMUs with shorter delays for a "
 "subset of bugs (e.g release-critical bugs older than 7 days). Also, some "


@@ -2879,7 +2861,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1977
+#: pkgs.dbk:1982

 msgid ""
 "After you upload an NMU, you are responsible for the possible problems that "
 "you might have introduced. You must keep an eye on the package (subscribing "
 msgid ""
 "After you upload an NMU, you are responsible for the possible problems that "
 "you might have introduced. You must keep an eye on the package (subscribing "


@@ -2888,7 +2870,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1983
+#: pkgs.dbk:1988

 msgid ""
 "This is not a license to perform NMUs thoughtlessly.  If you NMU when it is "
 "clear that the maintainers are active and would have acknowledged a patch in "
 msgid ""
 "This is not a license to perform NMUs thoughtlessly.  If you NMU when it is "
 "clear that the maintainers are active and would have acknowledged a patch in "


@@ -2899,13 +2881,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1993
+#: pkgs.dbk:1998

 msgid "NMUs and debian/changelog"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "NMUs and debian/changelog"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1995
+#: pkgs.dbk:2000

 msgid ""
 "Just like any other (source) upload, NMUs must add an entry to "
 "<literal>debian/changelog</literal>, telling what has changed with this "
 msgid ""
 "Just like any other (source) upload, NMUs must add an entry to "
 "<literal>debian/changelog</literal>, telling what has changed with this "


@@ -2914,18 +2896,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:2000
+#: pkgs.dbk:2005

 #, no-wrap
 msgid "  * Non-maintainer upload.\n"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 #, no-wrap
 msgid "  * Non-maintainer upload.\n"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2004
+#: pkgs.dbk:2009

 msgid "The way to version NMUs differs for native and non-native packages."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "The way to version NMUs differs for native and non-native packages."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2007
+#: pkgs.dbk:2012

 msgid ""
 "If the package is a native package (without a debian revision in the version "
 "number), the version must be the version of the last maintainer upload, plus "
 msgid ""
 "If the package is a native package (without a debian revision in the version "
 "number), the version must be the version of the last maintainer upload, plus "


@@ -2937,7 +2919,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2017
+#: pkgs.dbk:2022

 msgid ""
 "If the package is a not a native package, you should add a minor version "
 "number to the debian revision part of the version number (the portion after "
 msgid ""
 "If the package is a not a native package, you should add a minor version "
 "number to the debian revision part of the version number (the portion after "


@@ -2949,7 +2931,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2026
+#: pkgs.dbk:2031

 msgid ""
 "In both cases, if the last upload was also an NMU, the counter should be "
 "increased. For example, if the current version is <literal>1.5+nmu3</"
 msgid ""
 "In both cases, if the last upload was also an NMU, the counter should be "
 "increased. For example, if the current version is <literal>1.5+nmu3</"


@@ -2959,7 +2941,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2032
+#: pkgs.dbk:2037

 msgid ""
 "A special versioning scheme is needed to avoid disrupting the maintainer's "
 "work, since using an integer for the Debian revision will potentially "
 msgid ""
 "A special versioning scheme is needed to avoid disrupting the maintainer's "
 "work, since using an integer for the Debian revision will potentially "


@@ -2971,7 +2953,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2042
+#: pkgs.dbk:2047

 msgid ""
 "If you upload a package to testing or stable, you sometimes need to \"fork\" "
 "the version number tree. This is the case for security uploads, for "
 msgid ""
 "If you upload a package to testing or stable, you sometimes need to \"fork\" "
 "the version number tree. This is the case for security uploads, for "


@@ -2994,13 +2976,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2064
+#: pkgs.dbk:2069

 msgid "Using the <literal>DELAYED/</literal> queue"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Using the <literal>DELAYED/</literal> queue"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2067
+#: pkgs.dbk:2072

 msgid ""
 "Having to wait for a response after you request permission to NMU is "
 "inefficient, because it costs the NMUer a context switch to come back to the "
 msgid ""
 "Having to wait for a response after you request permission to NMU is "
 "inefficient, because it costs the NMUer a context switch to come back to the "


@@ -3015,7 +2997,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2081
+#: pkgs.dbk:2086

 msgid ""
 "The <literal>DELAYED</literal> queue should not be used to put additional "
 "pressure on the maintainer. In particular, it's important that you are "
 msgid ""
 "The <literal>DELAYED</literal> queue should not be used to put additional "
 "pressure on the maintainer. In particular, it's important that you are "


@@ -3025,7 +3007,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2088
+#: pkgs.dbk:2093

 msgid ""
 "If you make an NMU to <literal>DELAYED</literal> and the maintainer updates "
 "his package before the delay expires, your upload will be rejected because a "
 msgid ""
 "If you make an NMU to <literal>DELAYED</literal> and the maintainer updates "
 "his package before the delay expires, your upload will be rejected because a "


@@ -3036,13 +3018,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2098
+#: pkgs.dbk:2103

 msgid "NMUs from the maintainer's point of view"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "NMUs from the maintainer's point of view"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2101
+#: pkgs.dbk:2106

 msgid ""
 "When someone NMUs your package, this means they want to help you to keep it "
 "in good shape.  This gives users fixed packages faster.  You can consider "
 msgid ""
 "When someone NMUs your package, this means they want to help you to keep it "
 "in good shape.  This gives users fixed packages faster.  You can consider "


@@ -3053,7 +3035,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2110
+#: pkgs.dbk:2115

 msgid ""
 "To acknowledge an NMU, include its changes and changelog entry in your next "
 "maintainer upload.  If you do not acknowledge the NMU by including the NMU "
 msgid ""
 "To acknowledge an NMU, include its changes and changelog entry in your next "
 "maintainer upload.  If you do not acknowledge the NMU by including the NMU "


@@ -3063,13 +3045,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2119
+#: pkgs.dbk:2124

 msgid "Source NMUs vs Binary-only NMUs (binNMUs)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Source NMUs vs Binary-only NMUs (binNMUs)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2122
+#: pkgs.dbk:2127

 msgid ""
 "The full name of an NMU is <emphasis>source NMU</emphasis>.  There is also "
 "another type, namely the <emphasis>binary-only NMU</emphasis>, or "
 msgid ""
 "The full name of an NMU is <emphasis>source NMU</emphasis>.  There is also "
 "another type, namely the <emphasis>binary-only NMU</emphasis>, or "


@@ -3079,7 +3061,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2129
+#: pkgs.dbk:2134

 msgid ""
 "When a library (or other dependency) is updated, the packages using it may "
 "need to be rebuilt.  Since no changes to the source are needed, the same "
 msgid ""
 "When a library (or other dependency) is updated, the packages using it may "
 "need to be rebuilt.  Since no changes to the source are needed, the same "


@@ -3088,7 +3070,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2135
+#: pkgs.dbk:2140

 msgid ""
 "BinNMUs are usually triggered on the buildds by wanna-build.  An entry is "
 "added to debian/changelog, explaining why the upload was needed and "
 msgid ""
 "BinNMUs are usually triggered on the buildds by wanna-build.  An entry is "
 "added to debian/changelog, explaining why the upload was needed and "


@@ -3098,7 +3080,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2143
+#: pkgs.dbk:2148

 msgid ""
 "Buildds upload packages for their architecture to the archive as binary-only "
 "uploads.  Strictly speaking, these are binNMUs.  However, they are not "
 msgid ""
 "Buildds upload packages for their architecture to the archive as binary-only "
 "uploads.  Strictly speaking, these are binNMUs.  However, they are not "


@@ -3107,13 +3089,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2151
+#: pkgs.dbk:2156

 msgid "NMUs vs QA uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "NMUs vs QA uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2154
+#: pkgs.dbk:2159

 msgid ""
 "NMUs are uploads of packages by somebody else than their assigned "
 "maintainer.  There is another type of upload where the uploaded package is "
 msgid ""
 "NMUs are uploads of packages by somebody else than their assigned "
 "maintainer.  There is another type of upload where the uploaded package is "


@@ -3122,7 +3104,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2161
+#: pkgs.dbk:2166

 msgid ""
 "QA uploads are very much like normal maintainer uploads: they may fix "
 "anything, even minor issues; the version numbering is normal, and there is "
 msgid ""
 "QA uploads are very much like normal maintainer uploads: they may fix "
 "anything, even minor issues; the version numbering is normal, and there is "


@@ -3132,14 +3114,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:2169
+#: pkgs.dbk:2174

 #, no-wrap
 msgid " * QA upload.\n"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 #, no-wrap
 msgid " * QA upload.\n"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2173
+#: pkgs.dbk:2178

 msgid ""
 "If you want to do an NMU, and it seems that the maintainer is not active, it "
 "is wise to check if the package is orphaned (this information is displayed "
 msgid ""
 "If you want to do an NMU, and it seems that the maintainer is not active, it "
 "is wise to check if the package is orphaned (this information is displayed "


@@ -3152,7 +3134,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2184
+#: pkgs.dbk:2189

 msgid ""
 "Instead of doing a QA upload, you can also consider adopting the package by "
 "making yourself the maintainer.  You don't need permission from anybody to "
 msgid ""
 "Instead of doing a QA upload, you can also consider adopting the package by "
 "making yourself the maintainer.  You don't need permission from anybody to "


@@ -3162,13 +3144,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:2195
+#: pkgs.dbk:2200

 msgid "Collaborative maintenance"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Collaborative maintenance"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:2197
+#: pkgs.dbk:2202

 msgid ""
 "Collaborative maintenance is a term describing the sharing of Debian package "
 "maintenance duties by several people.  This collaboration is almost always a "
 msgid ""
 "Collaborative maintenance is a term describing the sharing of Debian package "
 "maintenance duties by several people.  This collaboration is almost always a "


@@ -3180,7 +3162,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:2205
+#: pkgs.dbk:2210

 msgid ""
 "Generally there is a primary maintainer and one or more co-maintainers.  The "
 "primary maintainer is the person whose name is listed in the "
 msgid ""
 "Generally there is a primary maintainer and one or more co-maintainers.  The "
 "primary maintainer is the person whose name is listed in the "


@@ -3192,7 +3174,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:2213
+#: pkgs.dbk:2218

 msgid ""
 "In its most basic form, the process of adding a new co-maintainer is quite "
 "easy:"
 msgid ""
 "In its most basic form, the process of adding a new co-maintainer is quite "
 "easy:"


@@ -3200,7 +3182,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2219
+#: pkgs.dbk:2224

 msgid ""
 "Setup the co-maintainer with access to the sources you build the package "
 "from.  Generally this implies you are using a network-capable version "
 msgid ""
 "Setup the co-maintainer with access to the sources you build the package "
 "from.  Generally this implies you are using a network-capable version "


@@ -3211,7 +3193,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2227
+#: pkgs.dbk:2232

 msgid ""
 "Add the co-maintainer's correct maintainer name and address to the "
 "<literal>Uploaders</literal> field in the first paragraph of the "
 msgid ""
 "Add the co-maintainer's correct maintainer name and address to the "
 "<literal>Uploaders</literal> field in the first paragraph of the "


@@ -3219,14 +3201,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><screen>

-#: pkgs.dbk:2232
+#: pkgs.dbk:2237

 #, no-wrap
 msgid "Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex &lt;arex@debian.org&gt;\n"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 #, no-wrap
 msgid "Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex &lt;arex@debian.org&gt;\n"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2237
+#: pkgs.dbk:2242

 msgid ""
 "Using the PTS (<xref linkend=\"pkg-tracking-system\"/> ), the co-maintainers "
 "should subscribe themselves to the appropriate source package."
 msgid ""
 "Using the PTS (<xref linkend=\"pkg-tracking-system\"/> ), the co-maintainers "
 "should subscribe themselves to the appropriate source package."


@@ -3234,7 +3216,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:2243
+#: pkgs.dbk:2248

 msgid ""
 "Another form of collaborative maintenance is team maintenance, which is "
 "recommended if you maintain several packages with the same group of "
 msgid ""
 "Another form of collaborative maintenance is team maintenance, which is "
 "recommended if you maintain several packages with the same group of "


@@ -3245,7 +3227,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>

-#: pkgs.dbk:2252
+#: pkgs.dbk:2257

 msgid ""
 "Put the team member mainly responsible for the package in the Maintainer "
 "field.  In the Uploaders, put the mailing list address, and the team members "
 msgid ""
 "Put the team member mainly responsible for the package in the Maintainer "
 "field.  In the Uploaders, put the mailing list address, and the team members "


@@ -3254,7 +3236,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>

-#: pkgs.dbk:2259
+#: pkgs.dbk:2264

 msgid ""
 "Put the mailing list address in the Maintainer field.  In the Uploaders "
 "field, put the team members who care for the package.  In this case, you "
 msgid ""
 "Put the mailing list address in the Maintainer field.  In the Uploaders "
 "field, put the team members who care for the package.  In this case, you "


@@ -3264,7 +3246,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:2267
+#: pkgs.dbk:2272

 msgid ""
 "In any case, it is a bad idea to automatically put all team members in the "
 "Uploaders field.  It clutters the Developer's Package Overview listing (see "
 msgid ""
 "In any case, it is a bad idea to automatically put all team members in the "
 "Uploaders field.  It clutters the Developer's Package Overview listing (see "


@@ -3274,19 +3256,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:2275
+#: pkgs.dbk:2280

 msgid "The testing distribution"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgid "The testing distribution"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2277
+#: pkgs.dbk:2282

 msgid "Basics"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Basics"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2279
+#: pkgs.dbk:2284

 msgid ""
 "Packages are usually installed into the <literal>testing</literal> "
 "distribution after they have undergone some degree of <literal>testing</"
 msgid ""
 "Packages are usually installed into the <literal>testing</literal> "
 "distribution after they have undergone some degree of <literal>testing</"


@@ -3295,7 +3277,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2284
+#: pkgs.dbk:2289

 msgid ""
 "They must be in sync on all architectures and mustn't have dependencies that "
 "make them uninstallable; they also have to have generally no known release-"
 msgid ""
 "They must be in sync on all architectures and mustn't have dependencies that "
 "make them uninstallable; they also have to have generally no known release-"


@@ -3306,13 +3288,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2293
+#: pkgs.dbk:2298

 msgid "Updates from unstable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Updates from unstable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2295
+#: pkgs.dbk:2300

 msgid ""
 "The scripts that update the <literal>testing</literal> distribution are run "
 "twice each day, right after the installation of the updated packages; these "
 msgid ""
 "The scripts that update the <literal>testing</literal> distribution are run "
 "twice each day, right after the installation of the updated packages; these "


@@ -3324,7 +3306,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2303
+#: pkgs.dbk:2308

 msgid ""
 "The inclusion of a package from <literal>unstable</literal> is conditional "
 "on the following:"
 msgid ""
 "The inclusion of a package from <literal>unstable</literal> is conditional "
 "on the following:"


@@ -3332,7 +3314,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2309
+#: pkgs.dbk:2314

 msgid ""
 "The package must have been available in <literal>unstable</literal> for 2, 5 "
 "or 10 days, depending on the urgency (high, medium or low).  Please note "
 msgid ""
 "The package must have been available in <literal>unstable</literal> for 2, 5 "
 "or 10 days, depending on the urgency (high, medium or low).  Please note "


@@ -3344,7 +3326,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2319
+#: pkgs.dbk:2324

 msgid ""
 "It must not have new release-critical bugs (RC bugs affecting the version "
 "available in <literal>unstable</literal>, but not affecting the version in "
 msgid ""
 "It must not have new release-critical bugs (RC bugs affecting the version "
 "available in <literal>unstable</literal>, but not affecting the version in "


@@ -3353,7 +3335,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2326
+#: pkgs.dbk:2331

 msgid ""
 "It must be available on all architectures on which it has previously been "
 "built in <literal>unstable</literal>.  <xref linkend=\"dak-ls\"/> may be of "
 msgid ""
 "It must be available on all architectures on which it has previously been "
 "built in <literal>unstable</literal>.  <xref linkend=\"dak-ls\"/> may be of "


@@ -3362,7 +3344,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2333
+#: pkgs.dbk:2338

 msgid ""
 "It must not break any dependency of a package which is already available in "
 "<literal>testing</literal>;"
 msgid ""
 "It must not break any dependency of a package which is already available in "
 "<literal>testing</literal>;"


@@ -3370,7 +3352,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2339
+#: pkgs.dbk:2344

 msgid ""
 "The packages on which it depends must either be available in "
 "<literal>testing</literal> or they must be accepted into <literal>testing</"
 msgid ""
 "The packages on which it depends must either be available in "
 "<literal>testing</literal> or they must be accepted into <literal>testing</"


@@ -3380,7 +3362,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2347
+#: pkgs.dbk:2352

 msgid ""
 "To find out whether a package is progressing into <literal>testing</literal> "
 "or not, see the <literal>testing</literal> script output on the <ulink url="
 msgid ""
 "To find out whether a package is progressing into <literal>testing</literal> "
 "or not, see the <literal>testing</literal> script output on the <ulink url="


@@ -3394,7 +3376,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2358
+#: pkgs.dbk:2363

 msgid ""
 "The <filename>update_excuses</filename> file does not always give the "
 "precise reason why the package is refused; you may have to find it on your "
 msgid ""
 "The <filename>update_excuses</filename> file does not always give the "
 "precise reason why the package is refused; you may have to find it on your "


@@ -3405,7 +3387,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2365
+#: pkgs.dbk:2370

 msgid ""
 "Sometimes, some packages never enter <literal>testing</literal> because the "
 "set of inter-relationship is too complicated and cannot be sorted out by the "
 msgid ""
 "Sometimes, some packages never enter <literal>testing</literal> because the "
 "set of inter-relationship is too complicated and cannot be sorted out by the "


@@ -3414,7 +3396,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2370
+#: pkgs.dbk:2375

 msgid ""
 "Some further dependency analysis is shown on <ulink url=\"http://release."
 "debian.org/migration/\"></ulink> — but be warned, this page also shows build "
 msgid ""
 "Some further dependency analysis is shown on <ulink url=\"http://release."
 "debian.org/migration/\"></ulink> — but be warned, this page also shows build "


@@ -3423,14 +3405,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2375
+#: pkgs.dbk:2380

 msgid "out-of-date"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #.  FIXME: better rename this file than document rampant professionalism? 
 #. type: Content of: <chapter><section><section><section><para>
 msgid "out-of-date"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #.  FIXME: better rename this file than document rampant professionalism? 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2378
+#: pkgs.dbk:2383

 msgid ""
 "For the <literal>testing</literal> migration script, outdated means: There "
 "are different versions in <literal>unstable</literal> for the release "
 msgid ""
 "For the <literal>testing</literal> migration script, outdated means: There "
 "are different versions in <literal>unstable</literal> for the release "


@@ -3442,55 +3424,55 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2386
+#: pkgs.dbk:2391

 msgid "Consider this example:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 msgid "Consider this example:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2393 pkgs.dbk:2426
+#: pkgs.dbk:2398 pkgs.dbk:2431

 msgid "alpha"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 msgid "alpha"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2394 pkgs.dbk:2427
+#: pkgs.dbk:2399 pkgs.dbk:2432

 msgid "arm"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 msgid "arm"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2399 pkgs.dbk:2433 pkgs.dbk:2495
+#: pkgs.dbk:2404 pkgs.dbk:2438 pkgs.dbk:2500

 msgid "testing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "testing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2400 pkgs.dbk:2405 pkgs.dbk:2434 pkgs.dbk:2435 pkgs.dbk:2442
+#: pkgs.dbk:2405 pkgs.dbk:2410 pkgs.dbk:2439 pkgs.dbk:2440 pkgs.dbk:2447

 msgid "1"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "1"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2401 pkgs.dbk:2436 pkgs.dbk:2441
+#: pkgs.dbk:2406 pkgs.dbk:2441 pkgs.dbk:2446

 msgid "-"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 msgid "-"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2404 pkgs.dbk:2439 pkgs.dbk:2496
+#: pkgs.dbk:2409 pkgs.dbk:2444 pkgs.dbk:2501

 msgid "unstable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "unstable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2406 pkgs.dbk:2440
+#: pkgs.dbk:2411 pkgs.dbk:2445

 msgid "2"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "2"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2412
+#: pkgs.dbk:2417

 msgid ""
 "The package is out of date on alpha in <literal>unstable</literal>, and will "
 "not go to <literal>testing</literal>. Removing the package would not help at "
 msgid ""
 "The package is out of date on alpha in <literal>unstable</literal>, and will "
 "not go to <literal>testing</literal>. Removing the package would not help at "


@@ -3500,7 +3482,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2418
+#: pkgs.dbk:2423

 msgid ""
 "However, if ftp-master removes a package in <literal>unstable</literal> "
 "(here on <literal>arm</literal>):"
 msgid ""
 "However, if ftp-master removes a package in <literal>unstable</literal> "
 "(here on <literal>arm</literal>):"


@@ -3508,13 +3490,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2428
+#: pkgs.dbk:2433

 msgid "hurd-i386"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "hurd-i386"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2448
+#: pkgs.dbk:2453

 msgid ""
 "In this case, the package is up to date on all release architectures in "
 "<literal>unstable</literal> (and the extra <literal>hurd-i386</literal> "
 msgid ""
 "In this case, the package is up to date on all release architectures in "
 "<literal>unstable</literal> (and the extra <literal>hurd-i386</literal> "


@@ -3523,7 +3505,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2453
+#: pkgs.dbk:2458

 msgid ""
 "Sometimes, the question is raised if it is possible to allow packages in "
 "that are not yet built on all architectures: No.  Just plainly no.  (Except "
 msgid ""
 "Sometimes, the question is raised if it is possible to allow packages in "
 "that are not yet built on all architectures: No.  Just plainly no.  (Except "


@@ -3532,13 +3514,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2460
+#: pkgs.dbk:2465

 msgid "Removals from testing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Removals from testing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2462
+#: pkgs.dbk:2467

 msgid ""
 "Sometimes, a package is removed to allow another package in: This happens "
 "only to allow <emphasis>another</emphasis> package to go in if it's ready in "
 msgid ""
 "Sometimes, a package is removed to allow another package in: This happens "
 "only to allow <emphasis>another</emphasis> package to go in if it's ready in "


@@ -3549,7 +3531,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2469
+#: pkgs.dbk:2474

 msgid ""
 "Of course, there is another reason to remove a package from <literal>testing "
 "</literal>: It's just too buggy (and having a single RC-bug is enough to be "
 msgid ""
 "Of course, there is another reason to remove a package from <literal>testing "
 "</literal>: It's just too buggy (and having a single RC-bug is enough to be "


@@ -3558,7 +3540,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2474
+#: pkgs.dbk:2479

 msgid ""
 "Furthermore, if a package has been removed from <literal>unstable</literal>, "
 "and no package in <literal>testing</literal> depends on it any more, then it "
 msgid ""
 "Furthermore, if a package has been removed from <literal>unstable</literal>, "
 "and no package in <literal>testing</literal> depends on it any more, then it "


@@ -3567,13 +3549,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2481
+#: pkgs.dbk:2486

 msgid "circular dependencies"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "circular dependencies"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2483
+#: pkgs.dbk:2488

 msgid ""
 "A situation which is not handled very well by britney is if package "
 "<literal>a</literal> depends on the new version of package <literal>b</"
 msgid ""
 "A situation which is not handled very well by britney is if package "
 "<literal>a</literal> depends on the new version of package <literal>b</"


@@ -3582,49 +3564,49 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2488
+#: pkgs.dbk:2493

 msgid "An example of this is:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "An example of this is:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2501
+#: pkgs.dbk:2506

 msgid "a"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "a"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2502
+#: pkgs.dbk:2507

 msgid "1; depends: b=1"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "1; depends: b=1"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2503
+#: pkgs.dbk:2508

 msgid "2; depends: b=2"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "2; depends: b=2"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2506
+#: pkgs.dbk:2511

 msgid "b"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "b"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2507
+#: pkgs.dbk:2512

 msgid "1; depends: a=1"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "1; depends: a=1"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2508
+#: pkgs.dbk:2513

 msgid "2; depends: a=2"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "2; depends: a=2"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2514
+#: pkgs.dbk:2519

 msgid ""
 "Neither package <literal>a</literal> nor package <literal>b</literal> is "
 "considered for update."
 msgid ""
 "Neither package <literal>a</literal> nor package <literal>b</literal> is "
 "considered for update."


@@ -3632,7 +3614,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2518
+#: pkgs.dbk:2523

 msgid ""
 "Currently, this requires some manual hinting from the release team.  Please "
 "contact them by sending mail to &email-debian-release; if this happens to "
 msgid ""
 "Currently, this requires some manual hinting from the release team.  Please "
 "contact them by sending mail to &email-debian-release; if this happens to "


@@ -3641,13 +3623,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2525
+#: pkgs.dbk:2530

 msgid "influence of package in testing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "influence of package in testing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2527
+#: pkgs.dbk:2532

 msgid ""
 "Generally, there is nothing that the status of a package in <literal>testing "
 "</literal> means for transition of the next version from <literal>unstable </"
 msgid ""
 "Generally, there is nothing that the status of a package in <literal>testing "
 "</literal> means for transition of the next version from <literal>unstable </"


@@ -3664,7 +3646,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2539
+#: pkgs.dbk:2544

 msgid ""
 "In summary this means: The only influence that a package being in <literal> "
 "testing</literal> has on a new version of the same package is that the new "
 msgid ""
 "In summary this means: The only influence that a package being in <literal> "
 "testing</literal> has on a new version of the same package is that the new "


@@ -3673,19 +3655,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2546
+#: pkgs.dbk:2551

 msgid "details"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "details"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2548
+#: pkgs.dbk:2553

 msgid "If you are interested in details, this is how britney works:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "If you are interested in details, this is how britney works:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2551
+#: pkgs.dbk:2556

 msgid ""
 "The packages are looked at to determine whether they are valid candidates.  "
 "This gives the update excuses.  The most common reasons why a package is not "
 msgid ""
 "The packages are looked at to determine whether they are valid candidates.  "
 "This gives the update excuses.  The most common reasons why a package is not "


@@ -3699,7 +3681,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2560
+#: pkgs.dbk:2565

 msgid ""
 "Now, the more complex part happens: Britney tries to update <literal>testing "
 "</literal> with the valid candidates. For that, britney tries to add each "
 msgid ""
 "Now, the more complex part happens: Britney tries to update <literal>testing "
 "</literal> with the valid candidates. For that, britney tries to add each "


@@ -3713,7 +3695,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2570
+#: pkgs.dbk:2575

 msgid ""
 "If you want to see more details, you can look it up on <filename>merkel:/org/"
 "&ftp-debian-org;/testing/update_out/</filename> (or in <filename>merkel:~aba/"
 msgid ""
 "If you want to see more details, you can look it up on <filename>merkel:/org/"
 "&ftp-debian-org;/testing/update_out/</filename> (or in <filename>merkel:~aba/"


@@ -3724,7 +3706,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2577
+#: pkgs.dbk:2582

 msgid ""
 "The hints are available via <ulink url=\"http://&ftp-master-host;/testing/"
 "hints/\"></ulink>."
 msgid ""
 "The hints are available via <ulink url=\"http://&ftp-master-host;/testing/"
 "hints/\"></ulink>."


@@ -3732,13 +3714,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2585
+#: pkgs.dbk:2590

 msgid "Direct updates to testing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Direct updates to testing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2587
+#: pkgs.dbk:2592

 msgid ""
 "The <literal>testing</literal> distribution is fed with packages from "
 "<literal>unstable</literal> according to the rules explained above.  "
 msgid ""
 "The <literal>testing</literal> distribution is fed with packages from "
 "<literal>unstable</literal> according to the rules explained above.  "


@@ -3749,7 +3731,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2594
+#: pkgs.dbk:2599

 msgid ""
 "Keep in mind that packages uploaded there are not automatically processed, "
 "they have to go through the hands of the release manager.  So you'd better "
 msgid ""
 "Keep in mind that packages uploaded there are not automatically processed, "
 "they have to go through the hands of the release manager.  So you'd better "


@@ -3760,7 +3742,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2601
+#: pkgs.dbk:2606

 msgid ""
 "You should not upload to <literal>testing-proposed-updates</literal> when "
 "you can update your packages through <literal>unstable</literal>.  If you "
 msgid ""
 "You should not upload to <literal>testing-proposed-updates</literal> when "
 "you can update your packages through <literal>unstable</literal>.  If you "


@@ -3774,7 +3756,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2610
+#: pkgs.dbk:2615

 msgid ""
 "Version numbers are usually selected by adding the codename of the "
 "<literal>testing</literal> distribution and a running number, like "
 msgid ""
 "Version numbers are usually selected by adding the codename of the "
 "<literal>testing</literal> distribution and a running number, like "


@@ -3784,13 +3766,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2617
+#: pkgs.dbk:2622

 msgid "Please make sure you didn't miss any of these items in your upload:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Please make sure you didn't miss any of these items in your upload:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2622
+#: pkgs.dbk:2627

 msgid ""
 "Make sure that your package really needs to go through <literal>testing-"
 "proposed-updates</literal>, and can't go through <literal> unstable</"
 msgid ""
 "Make sure that your package really needs to go through <literal>testing-"
 "proposed-updates</literal>, and can't go through <literal> unstable</"


@@ -3799,20 +3781,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2629
+#: pkgs.dbk:2634

 msgid "Make sure that you included only the minimal amount of changes;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Make sure that you included only the minimal amount of changes;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2634
+#: pkgs.dbk:2639

 msgid ""
 "Make sure that you included an appropriate explanation in the changelog;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "Make sure that you included an appropriate explanation in the changelog;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2639
+#: pkgs.dbk:2644

 msgid ""
 "Make sure that you've written <literal>testing</literal> or <literal>testing-"
 "proposed-updates</literal> into your target distribution;"
 msgid ""
 "Make sure that you've written <literal>testing</literal> or <literal>testing-"
 "proposed-updates</literal> into your target distribution;"


@@ -3820,7 +3802,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2645
+#: pkgs.dbk:2650

 msgid ""
 "Make sure that you've built and tested your package in <literal>testing</"
 "literal>, not in <literal>unstable</literal>;"
 msgid ""
 "Make sure that you've built and tested your package in <literal>testing</"
 "literal>, not in <literal>unstable</literal>;"


@@ -3828,7 +3810,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2651
+#: pkgs.dbk:2656

 msgid ""
 "Make sure that your version number is higher than the version in "
 "<literal>testing</literal> and <literal>testing-proposed-updates</literal>, "
 msgid ""
 "Make sure that your version number is higher than the version in "
 "<literal>testing</literal> and <literal>testing-proposed-updates</literal>, "


@@ -3837,7 +3819,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2658
+#: pkgs.dbk:2663

 msgid ""
 "After uploading and successful build on all platforms, contact the release "
 "team at &email-debian-release; and ask them to approve your upload."
 msgid ""
 "After uploading and successful build on all platforms, contact the release "
 "team at &email-debian-release; and ask them to approve your upload."


@@ -3845,19 +3827,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2666
+#: pkgs.dbk:2671

 msgid "Frequently asked questions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 msgid "Frequently asked questions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2668
+#: pkgs.dbk:2673

 msgid "What are release-critical bugs, and how do they get counted?"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "What are release-critical bugs, and how do they get counted?"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2670
+#: pkgs.dbk:2675

 msgid ""
 "All bugs of some higher severities are by default considered release-"
 "critical; currently, these are <literal>critical</literal>, <literal>grave</"
 msgid ""
 "All bugs of some higher severities are by default considered release-"
 "critical; currently, these are <literal>critical</literal>, <literal>grave</"


@@ -3866,7 +3848,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2675
+#: pkgs.dbk:2680

 msgid ""
 "Such bugs are presumed to have an impact on the chances that the package "
 "will be released with the <literal>stable</literal> release of Debian: in "
 msgid ""
 "Such bugs are presumed to have an impact on the chances that the package "
 "will be released with the <literal>stable</literal> release of Debian: in "


@@ -3877,7 +3859,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2682
+#: pkgs.dbk:2687

 msgid ""
 "The <literal>unstable</literal> bug count are all release-critical bugs "
 "which are marked to apply to <replaceable>package</replaceable>/"
 msgid ""
 "The <literal>unstable</literal> bug count are all release-critical bugs "
 "which are marked to apply to <replaceable>package</replaceable>/"


@@ -3888,7 +3870,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2690
+#: pkgs.dbk:2695

 msgid ""
 "How could installing a package into <literal>testing</literal> possibly "
 "break other packages?"
 msgid ""
 "How could installing a package into <literal>testing</literal> possibly "
 "break other packages?"


@@ -3896,7 +3878,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2693
+#: pkgs.dbk:2698

 msgid ""
 "The structure of the distribution archives is such that they can only "
 "contain one version of a package; a package is defined by its name.  So when "
 msgid ""
 "The structure of the distribution archives is such that they can only "
 "contain one version of a package; a package is defined by its name.  So when "


@@ -3908,7 +3890,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2701
+#: pkgs.dbk:2706

 msgid ""
 "However, the old version may have provided a binary package with an old "
 "soname of a library, such as <literal>libacme-foo0</literal>.  Removing the "
 msgid ""
 "However, the old version may have provided a binary package with an old "
 "soname of a library, such as <literal>libacme-foo0</literal>.  Removing the "


@@ -3918,7 +3900,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2707
+#: pkgs.dbk:2712

 msgid ""
 "Evidently, this mainly affects packages which provide changing sets of "
 "binary packages in different versions (in turn, mainly libraries).  However, "
 msgid ""
 "Evidently, this mainly affects packages which provide changing sets of "
 "binary packages in different versions (in turn, mainly libraries).  However, "


@@ -3928,7 +3910,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2713
+#: pkgs.dbk:2718

 msgid ""
 "When the set of binary packages provided by a source package change in this "
 "way, all the packages that depended on the old binaries will have to be "
 msgid ""
 "When the set of binary packages provided by a source package change in this "
 "way, all the packages that depended on the old binaries will have to be "


@@ -3943,7 +3925,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2724
+#: pkgs.dbk:2729

 msgid ""
 "If you are having problems with complicated groups of packages like this, "
 "contact &email-debian-devel; or &email-debian-release; for help."
 msgid ""
 "If you are having problems with complicated groups of packages like this, "
 "contact &email-debian-devel; or &email-debian-release; for help."

diff --git a/po4a/fr/resources.po b/po4a/fr/resources.po
index cf156ac393714c507a93515a6c22545e7d2ae591..e72610b84078b137ff1dad2b07d8a57fa49969d2 100644 (file)
--- a/po4a/fr/resources.po
+++ b/po4a/fr/resources.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2009-06-25 22:00+0300\n"
+"POT-Creation-Date: 2010-01-04 00:20+0100\n"

 "PO-Revision-Date: 2007-07-01 23:16+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "PO-Revision-Date: 2007-07-01 23:16+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"


@@ -240,22 +240,19 @@ msgid ""
 "full of interesting information for developers."
 msgstr ""
 
 "full of interesting information for developers."
 msgstr ""
 

-# type: Content of: <chapter><section><para>

 #. type: Content of: <chapter><section><para>
 #: resources.dbk:151
 msgid ""
 "Since <literal>#debian-devel</literal> is an open channel, you should not "
 "speak there of issues that are discussed in &email-debian-private;.  There's "
 "another channel for this purpose, it's called <literal>#debian-private</"
 #. type: Content of: <chapter><section><para>
 #: resources.dbk:151
 msgid ""
 "Since <literal>#debian-devel</literal> is an open channel, you should not "
 "speak there of issues that are discussed in &email-debian-private;.  There's "
 "another channel for this purpose, it's called <literal>#debian-private</"

-"literal> and it's protected by a key.  This key is available in the archives "
-"of debian-private in <filename>master.debian.org:&file-debian-private-"
-"archive;</filename>, just <command>zgrep</command> for <literal>#debian-"
-"private</literal> in all the files."
+"literal> and it's protected by a key.  This key is available at "
+"<filename>master.debian.org:&file-debian-private-key;</filename>."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:161
+#: resources.dbk:159

 msgid ""
 "There are other additional channels dedicated to specific subjects.  "
 "<literal>#debian-bugs</literal> is used for coordinating bug squashing "
 msgid ""
 "There are other additional channels dedicated to specific subjects.  "
 "<literal>#debian-bugs</literal> is used for coordinating bug squashing "


@@ -270,7 +267,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:172
+#: resources.dbk:170

 msgid ""
 "Some non-English developers' channels exist as well, for example "
 "<literal>#debian-devel-fr</literal> for French speaking people interested in "
 msgid ""
 "Some non-English developers' channels exist as well, for example "
 "<literal>#debian-devel-fr</literal> for French speaking people interested in "


@@ -279,7 +276,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:177
+#: resources.dbk:175

 msgid ""
 "Channels dedicated to Debian also exist on other IRC networks, notably on "
 "the <ulink url=\"&url-openprojects;\">freenode</ulink> IRC network, which "
 msgid ""
 "Channels dedicated to Debian also exist on other IRC networks, notably on "
 "the <ulink url=\"&url-openprojects;\">freenode</ulink> IRC network, which "


@@ -289,7 +286,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:183
+#: resources.dbk:181

 msgid ""
 "To get a cloak on freenode, you send Jörg Jaspert &lt;joerg@debian.org&gt; a "
 "signed mail where you tell what your nick is.  Put cloak somewhere in the "
 msgid ""
 "To get a cloak on freenode, you send Jörg Jaspert &lt;joerg@debian.org&gt; a "
 "signed mail where you tell what your nick is.  Put cloak somewhere in the "


@@ -302,13 +299,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:194
+#: resources.dbk:192

 msgid "Documentation"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Documentation"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:196
+#: resources.dbk:194

 msgid ""
 "This document contains a lot of information which is useful to Debian "
 "developers, but it cannot contain everything.  Most of the other interesting "
 msgid ""
 "This document contains a lot of information which is useful to Debian "
 "developers, but it cannot contain everything.  Most of the other interesting "


@@ -319,13 +316,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:205
+#: resources.dbk:203

 msgid "Debian machines"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Debian machines"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:207
+#: resources.dbk:205

 msgid ""
 "Debian has several computers working as servers, most of which serve "
 "critical functions in the Debian project.  Most of the machines are used for "
 msgid ""
 "Debian has several computers working as servers, most of which serve "
 "critical functions in the Debian project.  Most of the machines are used for "


@@ -334,7 +331,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:212
+#: resources.dbk:210

 msgid ""
 "Some of the machines are available for individual developers to use, as long "
 "as the developers follow the rules set forth in the <ulink url=\"&url-dmup;"
 msgid ""
 "Some of the machines are available for individual developers to use, as long "
 "as the developers follow the rules set forth in the <ulink url=\"&url-dmup;"


@@ -343,7 +340,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:217
+#: resources.dbk:215

 msgid ""
 "Generally speaking, you can use these machines for Debian-related purposes "
 "as you see fit.  Please be kind to system administrators, and do not use up "
 msgid ""
 "Generally speaking, you can use these machines for Debian-related purposes "
 "as you see fit.  Please be kind to system administrators, and do not use up "


@@ -354,7 +351,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:224
+#: resources.dbk:222

 msgid ""
 "Please take care to protect your Debian passwords and SSH keys installed on "
 "Debian machines.  Avoid login or upload methods which send passwords over "
 msgid ""
 "Please take care to protect your Debian passwords and SSH keys installed on "
 "Debian machines.  Avoid login or upload methods which send passwords over "


@@ -363,7 +360,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:229
+#: resources.dbk:227

 msgid ""
 "Please do not put any material that doesn't relate to Debian on the Debian "
 "servers, unless you have prior permission."
 msgid ""
 "Please do not put any material that doesn't relate to Debian on the Debian "
 "servers, unless you have prior permission."


@@ -371,7 +368,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:233
+#: resources.dbk:231

 msgid ""
 "The current list of Debian machines is available at <ulink url=\"&url-devel-"
 "machines;\"></ulink>.  That web page contains machine names, contact "
 msgid ""
 "The current list of Debian machines is available at <ulink url=\"&url-devel-"
 "machines;\"></ulink>.  That web page contains machine names, contact "


@@ -380,7 +377,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:239
+#: resources.dbk:237

 msgid ""
 "If you have a problem with the operation of a Debian server, and you think "
 "that the system operators need to be notified of this problem, you can check "
 msgid ""
 "If you have a problem with the operation of a Debian server, and you think "
 "that the system operators need to be notified of this problem, you can check "


@@ -392,7 +389,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:247
+#: resources.dbk:245

 msgid ""
 "If you have a problem with a certain service, not related to the system "
 "administration (such as packages to be removed from the archive, suggestions "
 msgid ""
 "If you have a problem with a certain service, not related to the system "
 "administration (such as packages to be removed from the archive, suggestions "


@@ -403,7 +400,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:254
+#: resources.dbk:252

 msgid ""
 "Some of the core servers are restricted, but the information from there is "
 "mirrored to another server."
 msgid ""
 "Some of the core servers are restricted, but the information from there is "
 "mirrored to another server."


@@ -411,13 +408,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:258
+#: resources.dbk:256

 msgid "The bugs server"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The bugs server"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:260
+#: resources.dbk:258

 msgid ""
 "<literal>&bugs-host;</literal> is the canonical location for the Bug "
 "Tracking System (BTS)."
 msgid ""
 "<literal>&bugs-host;</literal> is the canonical location for the Bug "
 "Tracking System (BTS)."


@@ -425,13 +422,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:264 resources.dbk:282
+#: resources.dbk:262 resources.dbk:280

 msgid "It is restricted; a mirror is available on <literal>merkel</literal>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "It is restricted; a mirror is available on <literal>merkel</literal>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:267
+#: resources.dbk:265

 msgid ""
 "If you plan on doing some statistical analysis or processing of Debian bugs, "
 "this would be the place to do it.  Please describe your plans on &email-"
 msgid ""
 "If you plan on doing some statistical analysis or processing of Debian bugs, "
 "this would be the place to do it.  Please describe your plans on &email-"


@@ -441,22 +438,21 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:275
+#: resources.dbk:273

 msgid "The ftp-master server"
 msgstr ""
 
 msgid "The ftp-master server"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:277
+#: resources.dbk:275

 msgid ""
 "The <literal>&ftp-master-host;</literal> server holds the canonical copy of "
 msgid ""
 "The <literal>&ftp-master-host;</literal> server holds the canonical copy of "

-"the Debian archive.  Generally, package uploads go to this server; see <xref "
-"linkend=\"upload\"/>."
+"the Debian archive.  Generally, package uploaded to &ftp-upload-host; end up "
+"on this server, see <xref linkend=\"upload\"/>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:285
+#: resources.dbk:283

 msgid ""
 "Problems with the Debian FTP archive generally need to be reported as bugs "
 "against the <systemitem role=\"package\">&ftp-debian-org;</systemitem> "
 msgid ""
 "Problems with the Debian FTP archive generally need to be reported as bugs "
 "against the <systemitem role=\"package\">&ftp-debian-org;</systemitem> "


@@ -466,13 +462,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:293
+#: resources.dbk:291

 msgid "The www-master server"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The www-master server"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:295
+#: resources.dbk:293

 msgid ""
 "The main web server is <literal>www-master.debian.org</literal>.  It holds "
 "the official web pages, the face of Debian for most newbies."
 msgid ""
 "The main web server is <literal>www-master.debian.org</literal>.  It holds "
 "the official web pages, the face of Debian for most newbies."


@@ -480,7 +476,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:299
+#: resources.dbk:297

 msgid ""
 "If you find a problem with the Debian web server, you should generally "
 "submit a bug against the pseudo-package, <systemitem role=\"package\">www."
 msgid ""
 "If you find a problem with the Debian web server, you should generally "
 "submit a bug against the pseudo-package, <systemitem role=\"package\">www."


@@ -491,13 +487,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:308
+#: resources.dbk:306

 msgid "The people web server"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The people web server"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:310
+#: resources.dbk:308

 msgid ""
 "<literal>people.debian.org</literal> is the server used for developers' own "
 "web pages about anything related to Debian."
 msgid ""
 "<literal>people.debian.org</literal> is the server used for developers' own "
 "web pages about anything related to Debian."


@@ -505,7 +501,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:314
+#: resources.dbk:312

 msgid ""
 "If you have some Debian-specific information which you want to serve on the "
 "web, you can do this by putting material in the <filename>public_html</"
 msgid ""
 "If you have some Debian-specific information which you want to serve on the "
 "web, you can do this by putting material in the <filename>public_html</"


@@ -516,7 +512,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:321
+#: resources.dbk:319

 msgid ""
 "You should only use this particular location because it will be backed up, "
 "whereas on other hosts it won't."
 msgid ""
 "You should only use this particular location because it will be backed up, "
 "whereas on other hosts it won't."


@@ -524,7 +520,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:325
+#: resources.dbk:323

 msgid ""
 "Usually the only reason to use a different host is when you need to publish "
 "materials subject to the U.S.  export restrictions, in which case you can "
 msgid ""
 "Usually the only reason to use a different host is when you need to publish "
 "materials subject to the U.S.  export restrictions, in which case you can "


@@ -533,19 +529,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:330
+#: resources.dbk:328

 msgid "Send mail to &email-debian-devel; if you have any questions."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgid "Send mail to &email-debian-devel; if you have any questions."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:335
+#: resources.dbk:333

 msgid "The VCS servers"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The VCS servers"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:337
+#: resources.dbk:335

 msgid ""
 "If you need to use a Version Control System for any of your Debian work, you "
 "can use one the existing repositories hosted on Alioth or you can request a "
 msgid ""
 "If you need to use a Version Control System for any of your Debian work, you "
 "can use one the existing repositories hosted on Alioth or you can request a "


@@ -560,7 +556,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:348
+#: resources.dbk:346

 msgid ""
 "Historically, Debian first used <literal>cvs.debian.org</literal> to host "
 "CVS repositories. But that service is deprecated in favor of Alioth.  Only a "
 msgid ""
 "Historically, Debian first used <literal>cvs.debian.org</literal> to host "
 "CVS repositories. But that service is deprecated in favor of Alioth.  Only a "


@@ -569,20 +565,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:355
+#: resources.dbk:353

 msgid "chroots to different distributions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "chroots to different distributions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:357
+#: resources.dbk:355

 msgid ""
 "On some machines, there are chroots to different distributions available.  "
 "You can use them like this:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgid ""
 "On some machines, there are chroots to different distributions available.  "
 "You can use them like this:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: resources.dbk:361
+#: resources.dbk:359

 #, no-wrap
 msgid ""
 "vore$ dchroot unstable\n"
 #, no-wrap
 msgid ""
 "vore$ dchroot unstable\n"


@@ -591,7 +587,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:365
+#: resources.dbk:363

 msgid ""
 "In all chroots, the normal user home directories are available.  You can "
 "find out which chroots are available via <literal>&url-devel-machines;</"
 msgid ""
 "In all chroots, the normal user home directories are available.  You can "
 "find out which chroots are available via <literal>&url-devel-machines;</"


@@ -600,13 +596,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:374
+#: resources.dbk:372

 msgid "The Developers Database"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "The Developers Database"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:376
+#: resources.dbk:374

 msgid ""
 "The Developers Database, at <ulink url=\"&url-debian-db;\"></ulink>, is an "
 "LDAP directory for managing Debian developer attributes.  You can use this "
 msgid ""
 "The Developers Database, at <ulink url=\"&url-debian-db;\"></ulink>, is an "
 "LDAP directory for managing Debian developer attributes.  You can use this "


@@ -617,7 +613,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:384
+#: resources.dbk:382

 msgid ""
 "Developers can <ulink url=\"&url-debian-db-login;\">log into the database</"
 "ulink> to change various information about themselves, such as:"
 msgid ""
 "Developers can <ulink url=\"&url-debian-db-login;\">log into the database</"
 "ulink> to change various information about themselves, such as:"


@@ -625,25 +621,25 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:390
+#: resources.dbk:388

 msgid "forwarding address for your debian.org email"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "forwarding address for your debian.org email"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:395
+#: resources.dbk:393

 msgid "subscription to debian-private"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "subscription to debian-private"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:400
+#: resources.dbk:398

 msgid "whether you are on vacation"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "whether you are on vacation"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:405
+#: resources.dbk:403

 msgid ""
 "personal information such as your address, country, the latitude and "
 "longitude of the place where you live for use in <ulink url=\"&url-worldmap;"
 msgid ""
 "personal information such as your address, country, the latitude and "
 "longitude of the place where you live for use in <ulink url=\"&url-worldmap;"


@@ -653,13 +649,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:413
+#: resources.dbk:411

 msgid "password and preferred shell on Debian Project machines"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "password and preferred shell on Debian Project machines"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:418
+#: resources.dbk:416

 msgid ""
 "Most of the information is not accessible to the public, naturally.  For "
 "more information please read the online documentation that you can find at "
 msgid ""
 "Most of the information is not accessible to the public, naturally.  For "
 "more information please read the online documentation that you can find at "


@@ -668,7 +664,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:423
+#: resources.dbk:421

 msgid ""
 "Developers can also submit their SSH keys to be used for authorization on "
 "the official Debian machines, and even add new *.debian.net DNS entries.  "
 msgid ""
 "Developers can also submit their SSH keys to be used for authorization on "
 "the official Debian machines, and even add new *.debian.net DNS entries.  "


@@ -678,13 +674,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:431
+#: resources.dbk:429

 msgid "The Debian archive"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "The Debian archive"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:433
+#: resources.dbk:431

 msgid ""
 "The &debian-formal; distribution consists of a lot of packages (<filename>."
 "deb</filename>'s, currently around &number-of-pkgs;) and a few additional "
 msgid ""
 "The &debian-formal; distribution consists of a lot of packages (<filename>."
 "deb</filename>'s, currently around &number-of-pkgs;) and a few additional "


@@ -693,13 +689,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:439
+#: resources.dbk:437

 msgid "Here is an example directory tree of a complete Debian archive:"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Here is an example directory tree of a complete Debian archive:"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:443
+#: resources.dbk:441

 msgid ""
 "As you can see, the top-level directory contains two directories, "
 "<filename>dists/</filename> and <filename>pool/</filename>.  The latter is a "
 msgid ""
 "As you can see, the top-level directory contains two directories, "
 "<filename>dists/</filename> and <filename>pool/</filename>.  The latter is a "


@@ -717,7 +713,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:457
+#: resources.dbk:455

 msgid ""
 "<filename>dists/stable</filename> contains three directories, namely "
 "<filename>main</filename>, <filename>contrib</filename>, and <filename>non-"
 msgid ""
 "<filename>dists/stable</filename> contains three directories, namely "
 "<filename>main</filename>, <filename>contrib</filename>, and <filename>non-"


@@ -726,7 +722,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:462
+#: resources.dbk:460

 msgid ""
 "In each of the areas, there is a directory for the source packages "
 "(<filename>source</filename>) and a directory for each supported "
 msgid ""
 "In each of the areas, there is a directory for the source packages "
 "(<filename>source</filename>) and a directory for each supported "


@@ -736,7 +732,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:467
+#: resources.dbk:465

 msgid ""
 "The <filename>main</filename> area contains additional directories which "
 "hold the disk images and some essential pieces of documentation required for "
 msgid ""
 "The <filename>main</filename> area contains additional directories which "
 "hold the disk images and some essential pieces of documentation required for "


@@ -746,13 +742,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:473
+#: resources.dbk:471

 msgid "Sections"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Sections"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:475
+#: resources.dbk:473

 msgid ""
 "The <literal>main</literal> section of the Debian archive is what makes up "
 "the <emphasis role=\"strong\">official &debian-formal; distribution</"
 msgid ""
 "The <literal>main</literal> section of the Debian archive is what makes up "
 "the <emphasis role=\"strong\">official &debian-formal; distribution</"


@@ -764,7 +760,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:483
+#: resources.dbk:481

 msgid ""
 "Every package in the main section must fully comply with the <ulink url="
 "\"&url-dfsg;\">Debian Free Software Guidelines</ulink> (DFSG) and with all "
 msgid ""
 "Every package in the main section must fully comply with the <ulink url="
 "\"&url-dfsg;\">Debian Free Software Guidelines</ulink> (DFSG) and with all "


@@ -775,7 +771,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:491
+#: resources.dbk:489

 msgid ""
 "Packages in the <literal>contrib</literal> section have to comply with the "
 "DFSG, but may fail other requirements.  For instance, they may depend on non-"
 msgid ""
 "Packages in the <literal>contrib</literal> section have to comply with the "
 "DFSG, but may fail other requirements.  For instance, they may depend on non-"


@@ -784,7 +780,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:496
+#: resources.dbk:494

 msgid ""
 "Packages which do not conform to the DFSG are placed in the <literal>non-"
 "free</literal> section.  These packages are not considered as part of the "
 msgid ""
 "Packages which do not conform to the DFSG are placed in the <literal>non-"
 "free</literal> section.  These packages are not considered as part of the "


@@ -795,7 +791,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:503
+#: resources.dbk:501

 msgid ""
 "The <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> contains "
 "a more exact definition of the three sections.  The above discussion is just "
 msgid ""
 "The <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> contains "
 "a more exact definition of the three sections.  The above discussion is just "


@@ -804,7 +800,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:508
+#: resources.dbk:506

 msgid ""
 "The separation of the three sections at the top-level of the archive is "
 "important for all people who want to distribute Debian, either via FTP "
 msgid ""
 "The separation of the three sections at the top-level of the archive is "
 "important for all people who want to distribute Debian, either via FTP "


@@ -816,7 +812,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:516
+#: resources.dbk:514

 msgid ""
 "On the other hand, a CD-ROM vendor could easily check the individual package "
 "licenses of the packages in <literal>non-free</literal> and include as many "
 msgid ""
 "On the other hand, a CD-ROM vendor could easily check the individual package "
 "licenses of the packages in <literal>non-free</literal> and include as many "


@@ -826,7 +822,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:522
+#: resources.dbk:520

 msgid ""
 "Note that the term section is also used to refer to categories which "
 "simplify the organization and browsing of available packages, e.g.  "
 msgid ""
 "Note that the term section is also used to refer to categories which "
 "simplify the organization and browsing of available packages, e.g.  "


@@ -838,13 +834,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:532
+#: resources.dbk:530

 msgid "Architectures"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Architectures"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:534
+#: resources.dbk:532

 msgid ""
 "In the first days, the Linux kernel was only available for Intel i386 (or "
 "greater) platforms, and so was Debian.  But as Linux became more and more "
 msgid ""
 "In the first days, the Linux kernel was only available for Intel i386 (or "
 "greater) platforms, and so was Debian.  But as Linux became more and more "


@@ -853,7 +849,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:539
+#: resources.dbk:537

 msgid ""
 "The Linux 2.0 kernel supports Intel x86, DEC Alpha, SPARC, Motorola 680x0 "
 "(like Atari, Amiga and Macintoshes), MIPS, and PowerPC.  The Linux 2.2 "
 msgid ""
 "The Linux 2.0 kernel supports Intel x86, DEC Alpha, SPARC, Motorola 680x0 "
 "(like Atari, Amiga and Macintoshes), MIPS, and PowerPC.  The Linux 2.2 "


@@ -870,7 +866,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:553
+#: resources.dbk:551

 msgid ""
 "&debian-formal; 1.3 is only available as <literal>i386</literal>.  Debian "
 "2.0 shipped for <literal>i386</literal> and <literal>m68k</literal> "
 msgid ""
 "&debian-formal; 1.3 is only available as <literal>i386</literal>.  Debian "
 "2.0 shipped for <literal>i386</literal> and <literal>m68k</literal> "


@@ -885,7 +881,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:564
+#: resources.dbk:562

 msgid ""
 "Information for developers and users about the specific ports are available "
 "at the <ulink url=\"&url-debian-ports;\">Debian Ports web pages</ulink>."
 msgid ""
 "Information for developers and users about the specific ports are available "
 "at the <ulink url=\"&url-debian-ports;\">Debian Ports web pages</ulink>."


@@ -893,44 +889,72 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:570
+#: resources.dbk:568

 msgid "Packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:572
+#: resources.dbk:570

 msgid ""
 "There are two types of Debian packages, namely <literal>source</literal> and "
 "<literal>binary</literal> packages."
 msgstr ""
 
 msgid ""
 "There are two types of Debian packages, namely <literal>source</literal> and "
 "<literal>binary</literal> packages."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:576
+#: resources.dbk:574

 msgid ""
 msgid ""

-"Source packages consist of either two or three files: a <filename>.dsc</"
-"filename> file, and either a <filename>.tar.gz</filename> file or both an "
-"<filename>.orig.tar.gz</filename> and a <filename>.diff.gz</filename> file."
+"Depending on the format of the source package, it will consist of one or "
+"more files in addition to the mandatory <filename>.dsc</filename> file:"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para><itemizedlist><listitem><para>
+#: resources.dbk:578
+msgid ""
+"with format “1.0”, it has either a <filename>.tar.gz</filename> file or both "
+"an <filename>.orig.tar.gz</filename> and a <filename>.diff.gz</filename> "
+"file;"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para><itemizedlist><listitem><para>
+#: resources.dbk:581
+msgid ""
+"with format “3.0 (quilt)”, it has a mandatory <filename>.orig.tar.{gz,bz2,"
+"lzma}</filename> upstream tarball, muliple optional <filename>.orig-"
+"<replaceable>component</replaceable>.tar.{gz,bz2,lzma}</filename> additional "
+"upstream tarballs"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para><itemizedlist><listitem><filename>
+#: resources.dbk:584
+msgid "debian.tar.{gz,bz2,lzma} debian tarball"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para><itemizedlist><listitem><para>
+#: resources.dbk:585
+msgid ""
+"with format “3.0 (native)”, it has only a single <filename>.tar.{gz,bz2,lzma}"
+"</filename> tarball."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:582
+#: resources.dbk:590

 msgid ""
 "If a package is developed specially for Debian and is not distributed "
 msgid ""
 "If a package is developed specially for Debian and is not distributed "

-"outside of Debian, there is just one <filename>.tar.gz</filename> file which "
-"contains the sources of the program.  If a package is distributed elsewhere "
-"too, the <filename>.orig.tar.gz</filename> file stores the so-called "
+"outside of Debian, there is just one <filename>.tar.{gz,bz2,lzma}</filename> "
+"file which contains the sources of the program, it's called a “native” "
+"source package.  If a package is distributed elsewhere too, the <filename>."
+"orig.tar.{gz,bz2,lzma}</filename> file stores the so-called "

 "<literal>upstream source code</literal>, that is the source code that's "
 "distributed by the <literal>upstream maintainer</literal> (often the author "
 "<literal>upstream source code</literal>, that is the source code that's "
 "distributed by the <literal>upstream maintainer</literal> (often the author "

-"of the software).  In this case, the <filename>.diff.gz</filename> contains "
-"the changes made by the Debian maintainer."
+"of the software). In this case, the <filename>.diff.gz</filename> or the "
+"<filename>debian.tar.{gz,bz2,lzma}</filename> contains the changes made by "
+"the Debian maintainer."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:592
+#: resources.dbk:603

 msgid ""
 "The <filename>.dsc</filename> file lists all the files in the source package "
 "together with checksums (<command>md5sums</command>) and some additional "
 msgid ""
 "The <filename>.dsc</filename> file lists all the files in the source package "
 "together with checksums (<command>md5sums</command>) and some additional "


@@ -939,13 +963,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:599
+#: resources.dbk:610

 msgid "Distributions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Distributions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:601
+#: resources.dbk:612

 msgid ""
 "The directory system described in the previous chapter is itself contained "
 "within <literal>distribution directories</literal>.  Each distribution is "
 msgid ""
 "The directory system described in the previous chapter is itself contained "
 "within <literal>distribution directories</literal>.  Each distribution is "


@@ -955,7 +979,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:607
+#: resources.dbk:618

 msgid ""
 "To summarize, the Debian archive has a root directory within an FTP server.  "
 "For instance, at the mirror site, <literal>ftp.us.debian.org</literal>, the "
 msgid ""
 "To summarize, the Debian archive has a root directory within an FTP server.  "
 "For instance, at the mirror site, <literal>ftp.us.debian.org</literal>, the "


@@ -966,7 +990,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:614
+#: resources.dbk:625

 msgid ""
 "A distribution comprises Debian source and binary packages, and the "
 "respective <filename>Sources</filename> and <filename>Packages</filename> "
 msgid ""
 "A distribution comprises Debian source and binary packages, and the "
 "respective <filename>Sources</filename> and <filename>Packages</filename> "


@@ -978,13 +1002,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: resources.dbk:622
+#: resources.dbk:633

 msgid "Stable, testing, and unstable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Stable, testing, and unstable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:624
+#: resources.dbk:635

 msgid ""
 "There are always distributions called <literal>stable</literal> (residing in "
 "<filename>dists/stable</filename>), <literal>testing</literal> (residing in "
 msgid ""
 "There are always distributions called <literal>stable</literal> (residing in "
 "<filename>dists/stable</filename>), <literal>testing</literal> (residing in "


@@ -995,7 +1019,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:631
+#: resources.dbk:642

 msgid ""
 "Active development is done in the <literal>unstable</literal> distribution "
 "(that's why this distribution is sometimes called the <literal>development "
 msgid ""
 "Active development is done in the <literal>unstable</literal> distribution "
 "(that's why this distribution is sometimes called the <literal>development "


@@ -1008,7 +1032,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:640
+#: resources.dbk:651

 msgid ""
 "The <link linkend=\"testing\">testing</link> distribution is generated "
 "automatically by taking packages from <literal>unstable</literal> if they "
 msgid ""
 "The <link linkend=\"testing\">testing</link> distribution is generated "
 "automatically by taking packages from <literal>unstable</literal> if they "


@@ -1020,7 +1044,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:648
+#: resources.dbk:659

 msgid ""
 "After a period of development, once the release manager deems fit, the "
 "<literal>testing</literal> distribution is frozen, meaning that the policies "
 msgid ""
 "After a period of development, once the release manager deems fit, the "
 "<literal>testing</literal> distribution is frozen, meaning that the policies "


@@ -1041,7 +1065,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:665
+#: resources.dbk:676

 msgid ""
 "This development cycle is based on the assumption that the "
 "<literal>unstable</literal> distribution becomes <literal>stable</literal> "
 msgid ""
 "This development cycle is based on the assumption that the "
 "<literal>unstable</literal> distribution becomes <literal>stable</literal> "


@@ -1061,7 +1085,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:682
+#: resources.dbk:693

 msgid ""
 "Note that development under <literal>unstable</literal> continues during the "
 "freeze period, since the <literal>unstable</literal> distribution remains in "
 msgid ""
 "Note that development under <literal>unstable</literal> continues during the "
 "freeze period, since the <literal>unstable</literal> distribution remains in "


@@ -1070,13 +1094,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: resources.dbk:689
+#: resources.dbk:700

 msgid "More information about the testing distribution"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "More information about the testing distribution"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:691
+#: resources.dbk:702

 msgid ""
 "Packages are usually installed into the <literal>testing</literal> "
 "distribution after they have undergone some degree of testing in "
 msgid ""
 "Packages are usually installed into the <literal>testing</literal> "
 "distribution after they have undergone some degree of testing in "


@@ -1085,7 +1109,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:695
+#: resources.dbk:706

 msgid ""
 "For more details, please see the <link linkend=\"testing\">information about "
 "the testing distribution</link>."
 msgid ""
 "For more details, please see the <link linkend=\"testing\">information about "
 "the testing distribution</link>."


@@ -1093,13 +1117,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: resources.dbk:701
+#: resources.dbk:712

 msgid "Experimental"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Experimental"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:703
+#: resources.dbk:714

 msgid ""
 "The <literal>experimental</literal> distribution is a special distribution.  "
 "It is not a full distribution in the same sense as <literal>stable</"
 msgid ""
 "The <literal>experimental</literal> distribution is a special distribution.  "
 "It is not a full distribution in the same sense as <literal>stable</"


@@ -1115,7 +1139,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:715
+#: resources.dbk:726

 msgid ""
 "These are the <citerefentry> <refentrytitle>sources.list</refentrytitle> "
 "<manvolnum>5</manvolnum> </citerefentry> lines for <literal>experimental</"
 msgid ""
 "These are the <citerefentry> <refentrytitle>sources.list</refentrytitle> "
 "<manvolnum>5</manvolnum> </citerefentry> lines for <literal>experimental</"


@@ -1123,7 +1147,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><programlisting>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><programlisting>

-#: resources.dbk:720
+#: resources.dbk:731

 #, no-wrap
 msgid ""
 "deb http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ experimental main\n"
 #, no-wrap
 msgid ""
 "deb http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ experimental main\n"


@@ -1132,7 +1156,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:724
+#: resources.dbk:735

 msgid ""
 "If there is a chance that the software could do grave damage to a system, it "
 "is likely to be better to put it into <literal>experimental</literal>.  For "
 msgid ""
 "If there is a chance that the software could do grave damage to a system, it "
 "is likely to be better to put it into <literal>experimental</literal>.  For "


@@ -1142,7 +1166,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:730
+#: resources.dbk:741

 msgid ""
 "Whenever there is a new upstream version of a package that introduces new "
 "features but breaks a lot of old ones, it should either not be uploaded, or "
 msgid ""
 "Whenever there is a new upstream version of a package that introduces new "
 "features but breaks a lot of old ones, it should either not be uploaded, or "


@@ -1156,7 +1180,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:740
+#: resources.dbk:751

 msgid ""
 "Some experimental software can still go into <literal>unstable</literal>, "
 "with a few warnings in the description, but that isn't recommended because "
 msgid ""
 "Some experimental software can still go into <literal>unstable</literal>, "
 "with a few warnings in the description, but that isn't recommended because "


@@ -1170,7 +1194,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:750
+#: resources.dbk:761

 msgid ""
 "New software which isn't likely to damage your system can go directly into "
 "<literal>unstable</literal>."
 msgid ""
 "New software which isn't likely to damage your system can go directly into "
 "<literal>unstable</literal>."


@@ -1178,7 +1202,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:754
+#: resources.dbk:765

 msgid ""
 "An alternative to <literal>experimental</literal> is to use your personal "
 "web space on <literal>people.debian.org</literal>."
 msgid ""
 "An alternative to <literal>experimental</literal> is to use your personal "
 "web space on <literal>people.debian.org</literal>."


@@ -1186,7 +1210,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:758
+#: resources.dbk:769

 msgid ""
 "When uploading to <literal>unstable</literal> a package which had bugs fixed "
 "in <literal>experimental</literal>, please consider using the option "
 msgid ""
 "When uploading to <literal>unstable</literal> a package which had bugs fixed "
 "in <literal>experimental</literal>, please consider using the option "


@@ -1196,12 +1220,12 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:768
+#: resources.dbk:779

 msgid "Release code names"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "Release code names"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:770
+#: resources.dbk:781

 msgid ""
 "Every released Debian distribution has a <literal>code name</literal>: "
 "Debian 1.1 is called <literal>buzz</literal>; Debian 1.2, <literal>rex</"
 msgid ""
 "Every released Debian distribution has a <literal>code name</literal>: "
 "Debian 1.1 is called <literal>buzz</literal>; Debian 1.2, <literal>rex</"


@@ -1222,7 +1246,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:788
+#: resources.dbk:799

 msgid ""
 "Since Debian has an open development model (i.e., everyone can participate "
 "and follow the development) even the <literal>unstable</literal> and "
 msgid ""
 "Since Debian has an open development model (i.e., everyone can participate "
 "and follow the development) even the <literal>unstable</literal> and "


@@ -1236,7 +1260,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:798
+#: resources.dbk:809

 msgid ""
 "On the other hand, if we called the distribution directories <literal>Debian-"
 "x.y</literal> from the beginning, people would think that Debian release "
 msgid ""
 "On the other hand, if we called the distribution directories <literal>Debian-"
 "x.y</literal> from the beginning, people would think that Debian release "


@@ -1248,7 +1272,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:806
+#: resources.dbk:817

 msgid ""
 "Thus, the names of the distribution directories in the archive are "
 "determined by their code names and not their release status (e.g., "
 msgid ""
 "Thus, the names of the distribution directories in the archive are "
 "determined by their code names and not their release status (e.g., "


@@ -1262,13 +1286,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:820
+#: resources.dbk:831

 msgid "Debian mirrors"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Debian mirrors"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:822
+#: resources.dbk:833

 msgid ""
 "The various download archives and the web site have several mirrors "
 "available in order to relieve our canonical servers from heavy load.  In "
 msgid ""
 "The various download archives and the web site have several mirrors "
 "available in order to relieve our canonical servers from heavy load.  In "


@@ -1283,7 +1307,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:833
+#: resources.dbk:844

 msgid ""
 "All the information on Debian mirrors, including a list of the available "
 "public FTP/HTTP servers, can be found at <ulink url=\"&url-debian-mirrors;"
 msgid ""
 "All the information on Debian mirrors, including a list of the available "
 "public FTP/HTTP servers, can be found at <ulink url=\"&url-debian-mirrors;"


@@ -1294,7 +1318,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:840
+#: resources.dbk:851

 msgid ""
 "Note that mirrors are generally run by third-parties who are interested in "
 "helping Debian.  As such, developers generally do not have accounts on these "
 msgid ""
 "Note that mirrors are generally run by third-parties who are interested in "
 "helping Debian.  As such, developers generally do not have accounts on these "


@@ -1303,13 +1327,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:847
+#: resources.dbk:858

 msgid "The Incoming system"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "The Incoming system"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:849
+#: resources.dbk:860

 msgid ""
 "The Incoming system is responsible for collecting updated packages and "
 "installing them in the Debian archive.  It consists of a set of directories "
 msgid ""
 "The Incoming system is responsible for collecting updated packages and "
 "installing them in the Debian archive.  It consists of a set of directories "


@@ -1318,7 +1342,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:854
+#: resources.dbk:865

 msgid ""
 "Packages are uploaded by all the maintainers into a directory called "
 "<filename>UploadQueue</filename>.  This directory is scanned every few "
 msgid ""
 "Packages are uploaded by all the maintainers into a directory called "
 "<filename>UploadQueue</filename>.  This directory is scanned every few "


@@ -1342,7 +1366,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:873
+#: resources.dbk:884

 msgid ""
 "Once the package is accepted, the system sends a confirmation mail to the "
 "maintainer and closes all the bugs marked as fixed by the upload, and the "
 msgid ""
 "Once the package is accepted, the system sends a confirmation mail to the "
 "maintainer and closes all the bugs marked as fixed by the upload, and the "


@@ -1359,7 +1383,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:885
+#: resources.dbk:896

 msgid ""
 "The archive maintenance software will also send the OpenPGP/GnuPG signed "
 "<filename>.changes</filename> file that you uploaded to the appropriate "
 msgid ""
 "The archive maintenance software will also send the OpenPGP/GnuPG signed "
 "<filename>.changes</filename> file that you uploaded to the appropriate "


@@ -1373,7 +1397,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:895
+#: resources.dbk:906

 msgid ""
 "Though ftp-master is restricted, a copy of the installation is available to "
 "all developers on <literal>&ftp-master-mirror;</literal>."
 msgid ""
 "Though ftp-master is restricted, a copy of the installation is available to "
 "all developers on <literal>&ftp-master-mirror;</literal>."


@@ -1381,19 +1405,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:958
+#: resources.dbk:969

 msgid "Package information"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgid "Package information"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:960
+#: resources.dbk:971

 msgid "On the web"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "On the web"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:962
+#: resources.dbk:973

 msgid ""
 "Each package has several dedicated web pages.  <literal>http://&packages-"
 "host;/<replaceable>package-name</replaceable></literal> displays each "
 msgid ""
 "Each package has several dedicated web pages.  <literal>http://&packages-"
 "host;/<replaceable>package-name</replaceable></literal> displays each "


@@ -1404,7 +1428,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:969
+#: resources.dbk:980

 msgid ""
 "The bug tracking system tracks bugs for each package.  You can view the bugs "
 "of a given package at the URL <literal>http://&bugs-host;/"
 msgid ""
 "The bug tracking system tracks bugs for each package.  You can view the bugs "
 "of a given package at the URL <literal>http://&bugs-host;/"


@@ -1413,13 +1437,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:976
+#: resources.dbk:987

 msgid "The <command>dak ls</command> utility"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The <command>dak ls</command> utility"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:978
+#: resources.dbk:989

 msgid ""
 "<command>dak ls</command> is part of the dak suite of tools, listing "
 "available package versions for all known distributions and architectures.  "
 msgid ""
 "<command>dak ls</command> is part of the dak suite of tools, listing "
 "available package versions for all known distributions and architectures.  "


@@ -1430,7 +1454,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: resources.dbk:986
+#: resources.dbk:997

 #, no-wrap
 msgid ""
 "$ dak ls evince\n"
 #, no-wrap
 msgid ""
 "$ dak ls evince\n"


@@ -1444,7 +1468,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:995
+#: resources.dbk:1006

 msgid ""
 "In this example, you can see that the version in <literal>unstable</literal> "
 "differs from the version in <literal>testing</literal> and that there has "
 msgid ""
 "In this example, you can see that the version in <literal>unstable</literal> "
 "differs from the version in <literal>testing</literal> and that there has "


@@ -1454,13 +1478,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:1005
+#: resources.dbk:1016

 msgid "The Package Tracking System"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "The Package Tracking System"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1007
+#: resources.dbk:1018

 msgid ""
 "The Package Tracking System (PTS) is an email-based tool to track the "
 "activity of a source package.  This really means that you can get the same "
 msgid ""
 "The Package Tracking System (PTS) is an email-based tool to track the "
 "activity of a source package.  This really means that you can get the same "


@@ -1470,7 +1494,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1012
+#: resources.dbk:1023

 msgid ""
 "Each email sent through the PTS is classified under one of the keywords "
 "listed below.  This will let you select the mails that you want to receive."
 msgid ""
 "Each email sent through the PTS is classified under one of the keywords "
 "listed below.  This will let you select the mails that you want to receive."


@@ -1478,31 +1502,31 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1016
+#: resources.dbk:1027

 msgid "By default you will get:"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgid "By default you will get:"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1020
+#: resources.dbk:1031

 msgid "<literal>bts</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>bts</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1023
+#: resources.dbk:1034

 msgid "All the bug reports and following discussions."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgid "All the bug reports and following discussions."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1028
+#: resources.dbk:1039

 msgid "<literal>bts-control</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>bts-control</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1031
+#: resources.dbk:1042

 msgid ""
 "The email notifications from <email>control@&bugs-host;</email> about bug "
 "report status changes."
 msgid ""
 "The email notifications from <email>control@&bugs-host;</email> about bug "
 "report status changes."


@@ -1510,13 +1534,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1037
+#: resources.dbk:1048

 msgid "<literal>upload-source</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>upload-source</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1040
+#: resources.dbk:1051

 msgid ""
 "The email notification from <command>katie</command> when an uploaded source "
 "package is accepted."
 msgid ""
 "The email notification from <command>katie</command> when an uploaded source "
 "package is accepted."


@@ -1524,13 +1548,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1046
+#: resources.dbk:1057

 msgid "<literal>katie-other</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>katie-other</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1049
+#: resources.dbk:1060

 msgid ""
 "Other warning and error emails from <command>katie</command> (such as an "
 "override disparity for the section and/or the priority field)."
 msgid ""
 "Other warning and error emails from <command>katie</command> (such as an "
 "override disparity for the section and/or the priority field)."


@@ -1538,13 +1562,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1055
+#: resources.dbk:1066

 msgid "<literal>default</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>default</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1058
+#: resources.dbk:1069

 msgid ""
 "Any non-automatic email sent to the PTS by people who wanted to contact the "
 "subscribers of the package.  This can be done by sending mail to "
 msgid ""
 "Any non-automatic email sent to the PTS by people who wanted to contact the "
 "subscribers of the package.  This can be done by sending mail to "


@@ -1555,46 +1579,47 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1067
+#: resources.dbk:1078

 msgid "<literal>contact</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>contact</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1070
+#: resources.dbk:1081

 msgid ""
 "Mails sent to the maintainer through the *@packages.debian.org email aliases."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgid ""
 "Mails sent to the maintainer through the *@packages.debian.org email aliases."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1076
+#: resources.dbk:1087

 msgid "<literal>summary</literal>"
 msgstr ""
 
 msgid "<literal>summary</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1079
+#: resources.dbk:1090

 msgid ""
 msgid ""

-"Regular summary emails about the package's status.  Currently, only "
-"progression in <literal>testing</literal> is sent."
+"Regular summary emails about the package's status, including progression "
+"into <literal>testing</literal>, <ulink url=\"&url-dehs;\">DEHS</ulink> "
+"notifications of new upstream versions, and a notification if the package is "
+"removed or orphaned."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1086
+#: resources.dbk:1100

 msgid "You can also decide to receive additional information:"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgid "You can also decide to receive additional information:"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1090
+#: resources.dbk:1104

 msgid "<literal>upload-binary</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>upload-binary</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1093
+#: resources.dbk:1107

 msgid ""
 "The email notification from <command>katie</command> when an uploaded binary "
 "package is accepted.  In other words, whenever a build daemon or a porter "
 msgid ""
 "The email notification from <command>katie</command> when an uploaded binary "
 "package is accepted.  In other words, whenever a build daemon or a porter "


@@ -1604,13 +1629,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1101
+#: resources.dbk:1115

 msgid "<literal>cvs</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>cvs</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1104
+#: resources.dbk:1118

 msgid ""
 "VCS commit notifications, if the package has a VCS repository and the "
 "maintainer has set up forwarding of commit notifications to the PTS. The "
 msgid ""
 "VCS commit notifications, if the package has a VCS repository and the "
 "maintainer has set up forwarding of commit notifications to the PTS. The "


@@ -1620,13 +1645,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1112
+#: resources.dbk:1126

 msgid "<literal>ddtp</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>ddtp</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1115
+#: resources.dbk:1129

 msgid ""
 "Translations of descriptions or debconf templates submitted to the Debian "
 "Description Translation Project."
 msgid ""
 "Translations of descriptions or debconf templates submitted to the Debian "
 "Description Translation Project."


@@ -1634,13 +1659,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1121
+#: resources.dbk:1135

 msgid "<literal>derivatives</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>derivatives</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1124
+#: resources.dbk:1138

 msgid ""
 "Information about changes made to the package in derivative distributions "
 "(for example Ubuntu)."
 msgid ""
 "Information about changes made to the package in derivative distributions "
 "(for example Ubuntu)."


@@ -1648,13 +1673,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:1131
+#: resources.dbk:1145

 msgid "The PTS email interface"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The PTS email interface"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1133
+#: resources.dbk:1147

 msgid ""
 "You can control your subscription(s) to the PTS by sending various commands "
 "to <email>pts@qa.debian.org</email>."
 msgid ""
 "You can control your subscription(s) to the PTS by sending various commands "
 "to <email>pts@qa.debian.org</email>."


@@ -1662,13 +1687,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1138
+#: resources.dbk:1152

 msgid "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1141
+#: resources.dbk:1155

 msgid ""
 "Subscribes <replaceable>email</replaceable> to communications related to the "
 "source package <replaceable>sourcepackage</replaceable>.  Sender address is "
 msgid ""
 "Subscribes <replaceable>email</replaceable> to communications related to the "
 "source package <replaceable>sourcepackage</replaceable>.  Sender address is "


@@ -1680,13 +1705,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1151
+#: resources.dbk:1165

 msgid "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1154
+#: resources.dbk:1168

 msgid ""
 "Removes a previous subscription to the source package "
 "<replaceable>sourcepackage</replaceable> using the specified email address "
 msgid ""
 "Removes a previous subscription to the source package "
 "<replaceable>sourcepackage</replaceable> using the specified email address "


@@ -1695,13 +1720,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1161
+#: resources.dbk:1175

 msgid "<literal>unsubscribeall [&lt;email&gt;]</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>unsubscribeall [&lt;email&gt;]</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1164
+#: resources.dbk:1178

 msgid ""
 "Removes all subscriptions of the specified email address or the sender "
 "address if the second argument is left out."
 msgid ""
 "Removes all subscriptions of the specified email address or the sender "
 "address if the second argument is left out."


@@ -1709,13 +1734,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1170
+#: resources.dbk:1184

 msgid "<literal>which [&lt;email&gt;]</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>which [&lt;email&gt;]</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1173
+#: resources.dbk:1187

 msgid ""
 "Lists all subscriptions for the sender or the email address optionally "
 "specified."
 msgid ""
 "Lists all subscriptions for the sender or the email address optionally "
 "specified."


@@ -1723,13 +1748,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1179
+#: resources.dbk:1193

 msgid "<literal>keyword [&lt;email&gt;]</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>keyword [&lt;email&gt;]</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1182
+#: resources.dbk:1196

 msgid ""
 "Tells you the keywords that you are accepting.  For an explanation of "
 "keywords, <link linkend=\"pkg-tracking-system\">see above</link>.  Here's a "
 msgid ""
 "Tells you the keywords that you are accepting.  For an explanation of "
 "keywords, <link linkend=\"pkg-tracking-system\">see above</link>.  Here's a "


@@ -1738,21 +1763,21 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1189
+#: resources.dbk:1203

 msgid ""
 "<literal>bts</literal>: mails coming from the Debian Bug Tracking System"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid ""
 "<literal>bts</literal>: mails coming from the Debian Bug Tracking System"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1194
+#: resources.dbk:1208

 msgid ""
 "<literal>bts-control</literal>: reply to mails sent to &email-bts-control;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid ""
 "<literal>bts-control</literal>: reply to mails sent to &email-bts-control;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1200
+#: resources.dbk:1214

 msgid ""
 "<literal>summary</literal>: automatic summary mails about the state of a "
 "package"
 msgid ""
 "<literal>summary</literal>: automatic summary mails about the state of a "
 "package"


@@ -1760,7 +1785,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1206
+#: resources.dbk:1220

 msgid ""
 "<literal>contact</literal>: mails sent to the maintainer through the "
 "*@packages.debian.org aliases"
 msgid ""
 "<literal>contact</literal>: mails sent to the maintainer through the "
 "*@packages.debian.org aliases"


@@ -1768,20 +1793,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1212
+#: resources.dbk:1226

 msgid "<literal>cvs</literal>: notification of VCS commits"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid "<literal>cvs</literal>: notification of VCS commits"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1217
+#: resources.dbk:1231

 msgid ""
 "<literal>ddtp</literal>: translations of descriptions and debconf templates"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid ""
 "<literal>ddtp</literal>: translations of descriptions and debconf templates"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1222
+#: resources.dbk:1236

 msgid ""
 "<literal>derivatives</literal>: changes made on the package by derivative "
 "distributions"
 msgid ""
 "<literal>derivatives</literal>: changes made on the package by derivative "
 "distributions"


@@ -1789,7 +1814,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1228
+#: resources.dbk:1242

 msgid ""
 "<literal>upload-source</literal>: announce of a new source upload that has "
 "been accepted"
 msgid ""
 "<literal>upload-source</literal>: announce of a new source upload that has "
 "been accepted"


@@ -1797,7 +1822,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1234
+#: resources.dbk:1248

 msgid ""
 "<literal>upload-binary</literal>: announce of a new binary-only upload "
 "(porting)"
 msgid ""
 "<literal>upload-binary</literal>: announce of a new binary-only upload "
 "(porting)"


@@ -1805,7 +1830,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1240
+#: resources.dbk:1254

 msgid ""
 "<literal>katie-other</literal>: other mails from ftpmasters (override "
 "disparity, etc.)"
 msgid ""
 "<literal>katie-other</literal>: other mails from ftpmasters (override "
 "disparity, etc.)"


@@ -1813,7 +1838,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1246
+#: resources.dbk:1260

 msgid ""
 "<literal>default</literal>: all the other mails (those which aren't "
 "automatic)"
 msgid ""
 "<literal>default</literal>: all the other mails (those which aren't "
 "automatic)"


@@ -1821,13 +1846,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1253
+#: resources.dbk:1267

 msgid "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1256
+#: resources.dbk:1270

 msgid ""
 "Same as the previous item but for the given source package, since you may "
 "select a different set of keywords for each source package."
 msgid ""
 "Same as the previous item but for the given source package, since you may "
 "select a different set of keywords for each source package."


@@ -1835,14 +1860,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1262
+#: resources.dbk:1276

 msgid ""
 "<literal>keyword [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid ""
 "<literal>keyword [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1265
+#: resources.dbk:1279

 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the default set of "
 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the default set of "


@@ -1851,7 +1876,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1272
+#: resources.dbk:1286

 msgid ""
 "<literal>keywordall [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</"
 "literal>"
 msgid ""
 "<literal>keywordall [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</"
 "literal>"


@@ -1859,7 +1884,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1275
+#: resources.dbk:1289

 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the set of accepted "
 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the set of accepted "


@@ -1868,7 +1893,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1282
+#: resources.dbk:1296

 msgid ""
 "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;] {+|-|=} &lt;list of "
 "keywords&gt;</literal>"
 msgid ""
 "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;] {+|-|=} &lt;list of "
 "keywords&gt;</literal>"


@@ -1876,7 +1901,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1285
+#: resources.dbk:1299

 msgid ""
 "Same as previous item but overrides the keywords list for the indicated "
 "source package."
 msgid ""
 "Same as previous item but overrides the keywords list for the indicated "
 "source package."


@@ -1884,19 +1909,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1291
+#: resources.dbk:1305

 msgid "<literal>quit | thanks | --</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>quit | thanks | --</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1294
+#: resources.dbk:1308

 msgid "Stops processing commands.  All following lines are ignored by the bot."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Stops processing commands.  All following lines are ignored by the bot."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1300
+#: resources.dbk:1314

 msgid ""
 "The <command>pts-subscribe</command> command-line utility (from the "
 "<systemitem role=\"package\">devscripts</systemitem> package) can be handy "
 msgid ""
 "The <command>pts-subscribe</command> command-line utility (from the "
 "<systemitem role=\"package\">devscripts</systemitem> package) can be handy "


@@ -1906,13 +1931,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:1308
+#: resources.dbk:1322

 msgid "Filtering PTS mails"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Filtering PTS mails"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1310
+#: resources.dbk:1324

 msgid ""
 "Once you are subscribed to a package, you will get the mails sent to "
 "<literal><replaceable>sourcepackage</replaceable>@&pts-host;</literal>.  "
 msgid ""
 "Once you are subscribed to a package, you will get the mails sent to "
 "<literal><replaceable>sourcepackage</replaceable>@&pts-host;</literal>.  "


@@ -1924,14 +1949,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1318
+#: resources.dbk:1332

 msgid ""
 "Here is an example of added headers for a source upload notification on the "
 "<systemitem role=\"package\">dpkg</systemitem> package:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgid ""
 "Here is an example of added headers for a source upload notification on the "
 "<systemitem role=\"package\">dpkg</systemitem> package:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: resources.dbk:1322
+#: resources.dbk:1336

 #, no-wrap
 msgid ""
 "X-Loop: dpkg@&pts-host;\n"
 #, no-wrap
 msgid ""
 "X-Loop: dpkg@&pts-host;\n"


@@ -1942,13 +1967,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:1330
+#: resources.dbk:1344

 msgid "Forwarding VCS commits in the PTS"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Forwarding VCS commits in the PTS"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1332
+#: resources.dbk:1346

 msgid ""
 "If you use a publicly accessible VCS repository for maintaining your Debian "
 "package, you may want to forward the commit notification to the PTS so that "
 msgid ""
 "If you use a publicly accessible VCS repository for maintaining your Debian "
 "package, you may want to forward the commit notification to the PTS so that "


@@ -1958,7 +1983,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1338
+#: resources.dbk:1352

 msgid ""
 "Once you set up the VCS repository to generate commit notifications, you "
 "just have to make sure it sends a copy of those mails to "
 msgid ""
 "Once you set up the VCS repository to generate commit notifications, you "
 "just have to make sure it sends a copy of those mails to "


@@ -1971,7 +1996,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1347
+#: resources.dbk:1361

 msgid ""
 "For Subversion repositories, the usage of svnmailer is recommended.  See "
 "<ulink url=\"&url-alioth-pkg;\" /> for an example on how to do it."
 msgid ""
 "For Subversion repositories, the usage of svnmailer is recommended.  See "
 "<ulink url=\"&url-alioth-pkg;\" /> for an example on how to do it."


@@ -1979,13 +2004,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:1353
+#: resources.dbk:1367

 msgid "The PTS web interface"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The PTS web interface"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1355
+#: resources.dbk:1369

 msgid ""
 "The PTS has a web interface at <ulink url=\"http://&pts-host;/\"></ulink> "
 "that puts together a lot of information about each source package.  It "
 msgid ""
 "The PTS has a web interface at <ulink url=\"http://&pts-host;/\"></ulink> "
 "that puts together a lot of information about each source package.  It "


@@ -1999,7 +2024,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1365
+#: resources.dbk:1379

 msgid ""
 "You can jump directly to the web page concerning a specific source package "
 "with a URL like <literal>http://&pts-host;/<replaceable>sourcepackage</"
 msgid ""
 "You can jump directly to the web page concerning a specific source package "
 "with a URL like <literal>http://&pts-host;/<replaceable>sourcepackage</"


@@ -2008,7 +2033,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1370
+#: resources.dbk:1384

 msgid ""
 "This web interface has been designed like a portal for the development of "
 "packages: you can add custom content on your packages' pages.  You can add "
 msgid ""
 "This web interface has been designed like a portal for the development of "
 "packages: you can add custom content on your packages' pages.  You can add "


@@ -2018,13 +2043,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1376
+#: resources.dbk:1390

 msgid "Static news items can be used to indicate:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Static news items can be used to indicate:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1381
+#: resources.dbk:1395

 msgid ""
 "the availability of a project hosted on <link linkend=\"alioth\">Alioth</"
 "link> for co-maintaining the package"
 msgid ""
 "the availability of a project hosted on <link linkend=\"alioth\">Alioth</"
 "link> for co-maintaining the package"


@@ -2032,25 +2057,25 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1387
+#: resources.dbk:1401

 msgid "a link to the upstream web site"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "a link to the upstream web site"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1392
+#: resources.dbk:1406

 msgid "a link to the upstream bug tracker"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "a link to the upstream bug tracker"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1397
+#: resources.dbk:1411

 msgid "the existence of an IRC channel dedicated to the software"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "the existence of an IRC channel dedicated to the software"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1402
+#: resources.dbk:1416

 msgid ""
 "any other available resource that could be useful in the maintenance of the "
 "package"
 msgid ""
 "any other available resource that could be useful in the maintenance of the "
 "package"


@@ -2058,56 +2083,56 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1408
+#: resources.dbk:1422

 msgid "Usual news items may be used to announce that:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Usual news items may be used to announce that:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1413
+#: resources.dbk:1427

 msgid "beta packages are available for testing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "beta packages are available for testing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1418
+#: resources.dbk:1432

 msgid "final packages are expected for next week"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "final packages are expected for next week"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1423
+#: resources.dbk:1437

 msgid "the packaging is about to be redone from scratch"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "the packaging is about to be redone from scratch"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1428
+#: resources.dbk:1442

 msgid "backports are available"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "backports are available"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1433
+#: resources.dbk:1447

 msgid ""
 "the maintainer is on vacation (if they wish to publish this information)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "the maintainer is on vacation (if they wish to publish this information)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1438
+#: resources.dbk:1452

 msgid "a NMU is being worked on"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "a NMU is being worked on"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1443
+#: resources.dbk:1457

 msgid "something important will affect the package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "something important will affect the package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1448
+#: resources.dbk:1462

 msgid ""
 "Both kinds of news are generated in a similar manner: you just have to send "
 "an email either to <email>pts-static-news@qa.debian.org</email> or to "
 msgid ""
 "Both kinds of news are generated in a similar manner: you just have to send "
 "an email either to <email>pts-static-news@qa.debian.org</email> or to "


@@ -2122,7 +2147,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1459
+#: resources.dbk:1473

 msgid ""
 "Here are a few examples of valid mails used to generate news items in the "
 "PTS.  The first one adds a link to the cvsweb interface of debian-cd in the "
 msgid ""
 "Here are a few examples of valid mails used to generate news items in the "
 "PTS.  The first one adds a link to the cvsweb interface of debian-cd in the "


@@ -2130,7 +2155,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: resources.dbk:1464
+#: resources.dbk:1478

 #, no-wrap
 msgid ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
 #, no-wrap
 msgid ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"


@@ -2143,7 +2168,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1472
+#: resources.dbk:1486

 msgid ""
 "The second one is an announcement sent to a mailing list which is also sent "
 "to the PTS so that it is published on the PTS web page of the package.  Note "
 msgid ""
 "The second one is an announcement sent to a mailing list which is also sent "
 "to the PTS so that it is published on the PTS web page of the package.  Note "


@@ -2151,7 +2176,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: resources.dbk:1477
+#: resources.dbk:1491

 #, no-wrap
 msgid ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
 #, no-wrap
 msgid ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"


@@ -2169,7 +2194,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1490
+#: resources.dbk:1504

 msgid ""
 "Think twice before adding a news item to the PTS because you won't be able "
 "to remove it later and you won't be able to edit it either.  The only thing "
 msgid ""
 "Think twice before adding a news item to the PTS because you won't be able "
 "to remove it later and you won't be able to edit it either.  The only thing "


@@ -2179,13 +2204,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:1500
+#: resources.dbk:1514

 msgid "Developer's packages overview"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Developer's packages overview"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1502
+#: resources.dbk:1516

 msgid ""
 "A QA (quality assurance) web portal is available at <ulink url=\"&url-ddpo;"
 "\"></ulink> which displays a table listing all the packages of a single "
 msgid ""
 "A QA (quality assurance) web portal is available at <ulink url=\"&url-ddpo;"
 "\"></ulink> which displays a table listing all the packages of a single "


@@ -2197,7 +2222,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1511
+#: resources.dbk:1525

 msgid ""
 "It is a good idea to look up your own data regularly so that you don't "
 "forget any open bugs, and so that you don't forget which packages are your "
 msgid ""
 "It is a good idea to look up your own data regularly so that you don't "
 "forget any open bugs, and so that you don't forget which packages are your "


@@ -2206,13 +2231,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:1518
+#: resources.dbk:1532

 msgid "Debian's GForge installation: Alioth"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Debian's GForge installation: Alioth"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1520
+#: resources.dbk:1534

 msgid ""
 "Alioth is a Debian service based on a slightly modified version of the "
 "GForge software (which evolved from SourceForge). This software offers "
 msgid ""
 "Alioth is a Debian service based on a slightly modified version of the "
 "GForge software (which evolved from SourceForge). This software offers "


@@ -2223,7 +2248,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1527
+#: resources.dbk:1541

 msgid ""
 "It is intended to provide facilities to free software projects backed or led "
 "by Debian, facilitate contributions from external developers to projects "
 msgid ""
 "It is intended to provide facilities to free software projects backed or led "
 "by Debian, facilitate contributions from external developers to projects "


@@ -2234,7 +2259,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1534
+#: resources.dbk:1548

 msgid ""
 "All Debian developers automatically have an account on Alioth.  They can "
 "activate it by using the recover password facility.  External developers can "
 msgid ""
 "All Debian developers automatically have an account on Alioth.  They can "
 "activate it by using the recover password facility.  External developers can "


@@ -2243,52 +2268,65 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1539
+#: resources.dbk:1553

 msgid "For more information please visit the following links:"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "For more information please visit the following links:"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:1542
+#: resources.dbk:1556

 msgid "<ulink url=\"&url-alioth-wiki;\" />"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"&url-alioth-wiki;\" />"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:1543
+#: resources.dbk:1557

 msgid "<ulink url=\"&url-alioth-faq;\" />"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"&url-alioth-faq;\" />"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:1544
+#: resources.dbk:1558

 msgid "<ulink url=\"&url-alioth-pkg;\" />"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"&url-alioth-pkg;\" />"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:1545
+#: resources.dbk:1559

 msgid "<ulink url=\"&url-alioth;\" />"
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 msgid "<ulink url=\"&url-alioth;\" />"
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:1550
+#: resources.dbk:1564

 msgid "Goodies for Developers"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgid "Goodies for Developers"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:1552
+#: resources.dbk:1566

 msgid "LWN Subscriptions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "LWN Subscriptions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1554
+#: resources.dbk:1568

 msgid ""
 "Since October of 2002, HP has sponsored a subscription to LWN for all "
 "interested Debian developers.  Details on how to get access to this benefit "
 "are in <ulink url=\"http://&lists-host;/debian-devel-announce/2002/10/"
 "msg00018.html\"></ulink>."
 msgstr ""
 msgid ""
 "Since October of 2002, HP has sponsored a subscription to LWN for all "
 "interested Debian developers.  Details on how to get access to this benefit "
 "are in <ulink url=\"http://&lists-host;/debian-devel-announce/2002/10/"
 "msg00018.html\"></ulink>."
 msgstr ""

+
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:1575
+msgid "Gandi.net Hosting Discount"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1577
+msgid ""
+"As of November 2008, Gandi.net offers a discount rate on their VPS hosting "
+"for Debian Developers.  See <ulink url=\"http://&lists-host;/debian-devel-"
+"announce/2008/11/msg00004.html\"></ulink>."
+msgstr ""

diff --git a/po4a/fr/tools.po b/po4a/fr/tools.po
index 78770554e0fced96cd978884dd1cd7fd05e62212..967efd2451a3e264cca994b2017b12af02f9a20a 100644 (file)
--- a/po4a/fr/tools.po
+++ b/po4a/fr/tools.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2009-01-22 23:51+0100\n"
+"POT-Creation-Date: 2010-01-04 00:20+0100\n"

 "PO-Revision-Date: 2007-07-01 23:19+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "PO-Revision-Date: 2007-07-01 23:19+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"


@@ -17,11 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 
 # type: Content of: <appendix><title>
 "Content-Transfer-Encoding: \n"
 
 # type: Content of: <appendix><title>

+#. type: Content of: <appendix><title>

 #: tools.dbk:7
 msgid "Overview of Debian Maintainer Tools"
 msgstr "Aperçu des outils du responsable Debian"
 
 # type: Content of: <appendix><para>
 #: tools.dbk:7
 msgid "Overview of Debian Maintainer Tools"
 msgstr "Aperçu des outils du responsable Debian"
 
 # type: Content of: <appendix><para>

+#. type: Content of: <appendix><para>

 #: tools.dbk:9
 msgid ""
 "This section contains a rough overview of the tools available to "
 #: tools.dbk:9
 msgid ""
 "This section contains a rough overview of the tools available to "


@@ -33,6 +35,7 @@ msgstr ""
 "d'un guide des outils les plus utilisés."
 
 # type: Content of: <appendix><para>
 "d'un guide des outils les plus utilisés."
 
 # type: Content of: <appendix><para>

+#. type: Content of: <appendix><para>

 #: tools.dbk:14
 msgid ""
 "Debian maintainer tools are meant to aid developers and free their time for "
 #: tools.dbk:14
 msgid ""
 "Debian maintainer tools are meant to aid developers and free their time for "


@@ -43,6 +46,7 @@ msgstr ""
 "il y a plus d'une manière de le faire."
 
 # type: Content of: <appendix><para>
 "il y a plus d'une manière de le faire."
 
 # type: Content of: <appendix><para>

+#. type: Content of: <appendix><para>

 #: tools.dbk:18
 msgid ""
 "Some people prefer to use high-level package maintenance tools and some do "
 #: tools.dbk:18
 msgid ""
 "Some people prefer to use high-level package maintenance tools and some do "


@@ -60,6 +64,7 @@ msgstr ""
 "non plus destinéeà favoriser l'utilisation d'un outil aux dépens d'un autre."
 
 # type: Content of: <appendix><para>
 "non plus destinéeà favoriser l'utilisation d'un outil aux dépens d'un autre."
 
 # type: Content of: <appendix><para>

+#. type: Content of: <appendix><para>

 #: tools.dbk:26
 msgid ""
 "Most of the descriptions of these packages come from the actual package "
 #: tools.dbk:26
 msgid ""
 "Most of the descriptions of these packages come from the actual package "


@@ -73,21 +78,25 @@ msgstr ""
 "<literal>apt-cache show&lt;nom_paquet&gt;</literal>."
 
 # type: Content of: <appendix><section><title>
 "<literal>apt-cache show&lt;nom_paquet&gt;</literal>."
 
 # type: Content of: <appendix><section><title>

+#. type: Content of: <appendix><section><title>

 #: tools.dbk:32
 msgid "Core tools"
 msgstr "Outils de base"
 
 # type: Content of: <appendix><section><para>
 #: tools.dbk:32
 msgid "Core tools"
 msgstr "Outils de base"
 
 # type: Content of: <appendix><section><para>

+#. type: Content of: <appendix><section><para>

 #: tools.dbk:34
 msgid "The following tools are pretty much required for any maintainer."
 msgstr "Les outils suivants sont pratiquement nécessaires à tout responsable."
 
 # type: Content of: <appendix><section><section><title>
 #: tools.dbk:34
 msgid "The following tools are pretty much required for any maintainer."
 msgstr "Les outils suivants sont pratiquement nécessaires à tout responsable."
 
 # type: Content of: <appendix><section><section><title>

+#. type: Content of: <appendix><section><section><title>

 #: tools.dbk:37
 msgid "<systemitem role=\"package\">dpkg-dev</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #: tools.dbk:37
 msgid "<systemitem role=\"package\">dpkg-dev</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:39
 msgid ""
 "<systemitem role=\"package\">dpkg-dev</systemitem> contains the tools "
 #: tools.dbk:39
 msgid ""
 "<systemitem role=\"package\">dpkg-dev</systemitem> contains the tools "


@@ -98,11 +107,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

+#. type: Content of: <appendix><section><section><title>

 #: tools.dbk:48
 msgid "<systemitem role=\"package\">debconf</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #: tools.dbk:48
 msgid "<systemitem role=\"package\">debconf</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:50
 msgid ""
 "<systemitem role=\"package\">debconf</systemitem> provides a consistent "
 #: tools.dbk:50
 msgid ""
 "<systemitem role=\"package\">debconf</systemitem> provides a consistent "


@@ -113,6 +124,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:56
 msgid ""
 "You can find documentation for this package in the <systemitem role=\"package"
 #: tools.dbk:56
 msgid ""
 "You can find documentation for this package in the <systemitem role=\"package"


@@ -120,6 +132,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:60
 msgid ""
 "Many feel that this system should be used for all packages which require "
 #: tools.dbk:60
 msgid ""
 "Many feel that this system should be used for all packages which require "


@@ -129,11 +142,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

+#. type: Content of: <appendix><section><section><title>

 #: tools.dbk:68
 msgid "<systemitem role=\"package\">fakeroot</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #: tools.dbk:68
 msgid "<systemitem role=\"package\">fakeroot</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:70
 msgid ""
 "<systemitem role=\"package\">fakeroot</systemitem> simulates root "
 #: tools.dbk:70
 msgid ""
 "<systemitem role=\"package\">fakeroot</systemitem> simulates root "


@@ -144,11 +159,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><title>

+#. type: Content of: <appendix><section><title>

 #: tools.dbk:81
 msgid "Package lint tools"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 #: tools.dbk:81
 msgid "Package lint tools"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

+#. type: Content of: <appendix><section><para>

 #: tools.dbk:83
 msgid ""
 "According to the Free On-line Dictionary of Computing (FOLDOC), `lint' is a "
 #: tools.dbk:83
 msgid ""
 "According to the Free On-line Dictionary of Computing (FOLDOC), `lint' is a "


@@ -159,11 +176,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

+#. type: Content of: <appendix><section><section><title>

 #: tools.dbk:89
 msgid "<systemitem role=\"package\">lintian</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #: tools.dbk:89
 msgid "<systemitem role=\"package\">lintian</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:91
 msgid ""
 "<systemitem role=\"package\">lintian</systemitem> dissects Debian packages "
 #: tools.dbk:91
 msgid ""
 "<systemitem role=\"package\">lintian</systemitem> dissects Debian packages "


@@ -173,6 +192,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:97
 msgid ""
 "You should periodically get the newest <systemitem role=\"package\">lintian</"
 #: tools.dbk:97
 msgid ""
 "You should periodically get the newest <systemitem role=\"package\">lintian</"


@@ -183,6 +203,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:104
 msgid ""
 "Refer to <xref linkend=\"sanitycheck\"/> for more information on how and "
 #: tools.dbk:104
 msgid ""
 "Refer to <xref linkend=\"sanitycheck\"/> for more information on how and "


@@ -190,6 +211,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:108
 msgid ""
 "You can also see a summary of all problems reported by Lintian on your "
 #: tools.dbk:108
 msgid ""
 "You can also see a summary of all problems reported by Lintian on your "


@@ -199,11 +221,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

+#. type: Content of: <appendix><section><section><title>

 #: tools.dbk:116
 msgid "<systemitem role=\"package\">debdiff</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #: tools.dbk:116
 msgid "<systemitem role=\"package\">debdiff</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:118
 msgid ""
 "<command>debdiff</command> (from the <systemitem role=\"package"
 #: tools.dbk:118
 msgid ""
 "<command>debdiff</command> (from the <systemitem role=\"package"


@@ -216,32 +240,31 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:127
 msgid "You can run it over a pair of binary packages:"
 msgstr ""
 
 #: tools.dbk:127
 msgid "You can run it over a pair of binary packages:"
 msgstr ""
 

-# type: Content of: <appendix><section><section><screen>
-#: tools.dbk:129
+#. type: Content of: <appendix><section><section><screen>
+#: tools.dbk:130

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"debdiff package_1-1_arch.deb package_2-1_arch.deb\n"
+msgid "debdiff package_1-1_arch.deb package_2-1_arch.deb\n"

 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:133
 msgid "Or even a pair of changes files:"
 msgstr ""
 
 #: tools.dbk:133
 msgid "Or even a pair of changes files:"
 msgstr ""
 

-# type: Content of: <appendix><section><section><screen>
-#: tools.dbk:135
+#. type: Content of: <appendix><section><section><screen>
+#: tools.dbk:136

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"debdiff package_1-1_arch.changes package_2-1_arch.changes\n"
+msgid "debdiff package_1-1_arch.changes package_2-1_arch.changes\n"

 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:139
 msgid ""
 "For more information please see <citerefentry> <refentrytitle>debdiff</"
 #: tools.dbk:139
 msgid ""
 "For more information please see <citerefentry> <refentrytitle>debdiff</"


@@ -249,11 +272,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><title>

+#. type: Content of: <appendix><section><title>

 #: tools.dbk:148
 msgid "Helpers for <filename>debian/rules</filename>"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 #: tools.dbk:148
 msgid "Helpers for <filename>debian/rules</filename>"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

+#. type: Content of: <appendix><section><para>

 #: tools.dbk:150
 msgid ""
 "Package building tools make the process of writing <filename>debian/rules</"
 #: tools.dbk:150
 msgid ""
 "Package building tools make the process of writing <filename>debian/rules</"


@@ -262,11 +287,13 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

+#. type: Content of: <appendix><section><section><title>

 #: tools.dbk:156
 msgid "<systemitem role=\"package\">debhelper</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #: tools.dbk:156
 msgid "<systemitem role=\"package\">debhelper</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:158
 msgid ""
 "<systemitem role=\"package\">debhelper</systemitem> is a collection of "
 #: tools.dbk:158
 msgid ""
 "<systemitem role=\"package\">debhelper</systemitem> is a collection of "


@@ -278,6 +305,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:166
 msgid ""
 "Unlike some approaches, <systemitem role=\"package\">debhelper</systemitem> "
 #: tools.dbk:166
 msgid ""
 "Unlike some approaches, <systemitem role=\"package\">debhelper</systemitem> "


@@ -287,6 +315,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:172
 msgid ""
 "There are a number of little <systemitem role=\"package\">debhelper</"
 #: tools.dbk:172
 msgid ""
 "There are a number of little <systemitem role=\"package\">debhelper</"


@@ -295,40 +324,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

+#. type: Content of: <appendix><section><section><title>

 #: tools.dbk:179
 #: tools.dbk:179

-msgid "<systemitem role=\"package\">debmake</systemitem>"
-msgstr ""
-
-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:181
-msgid ""
-"<systemitem role=\"package\">debmake</systemitem>, a precursor to "
-"<systemitem role=\"package\">debhelper</systemitem>, is a more coarse-"
-"grained <filename>debian/rules</filename> assistant.  It includes two main "
-"programs: <command>deb-make</command>, which can be used to help a "
-"maintainer convert a regular (non-Debian) source archive into a Debian "
-"source package; and <command>debstd</command>, which incorporates in one big "
-"shot the same sort of automated functions that one finds in <systemitem role="
-"\"package\">debhelper</systemitem>."
-msgstr ""
-
-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:191
-msgid ""
-"The consensus is that <systemitem role=\"package\">debmake</systemitem> is "
-"now deprecated in favor of <systemitem role=\"package\">debhelper</"
-"systemitem>.  It is a bug to use <systemitem role=\"package\">debmake</"
-"systemitem> in new packages.  New packages using <systemitem role=\"package"
-"\">debmake</systemitem> will be rejected from the archive."
-msgstr ""
-
-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:200

 msgid "<systemitem role=\"package\">dh-make</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dh-make</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:202
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:181

 msgid ""
 "The <systemitem role=\"package\">dh-make</systemitem> package contains "
 "<command>dh_make</command>, a program that creates a skeleton of files "
 msgid ""
 "The <systemitem role=\"package\">dh-make</systemitem> package contains "
 "<command>dh_make</command>, a program that creates a skeleton of files "


@@ -339,7 +342,8 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:210
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:189

 msgid ""
 "While the rules files generated by <command>dh_make</command> are in general "
 "a sufficient basis for a working package, they are still just the "
 msgid ""
 "While the rules files generated by <command>dh_make</command> are in general "
 "a sufficient basis for a working package, they are still just the "


@@ -349,12 +353,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:218
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:197

 msgid "<systemitem role=\"package\">yada</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">yada</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:220
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:199

 msgid ""
 "<systemitem role=\"package\">yada</systemitem> is another packaging helper "
 "tool.  It uses a <filename>debian/packages</filename> file to auto-generate "
 msgid ""
 "<systemitem role=\"package\">yada</systemitem> is another packaging helper "
 "tool.  It uses a <filename>debian/packages</filename> file to auto-generate "


@@ -367,19 +373,22 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:230
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:209

 msgid ""
 "For more informations see <literal><ulink url=\"http://yada.alioth.debian."
 "org/\">YADA site</ulink></literal>."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgid ""
 "For more informations see <literal><ulink url=\"http://yada.alioth.debian."
 "org/\">YADA site</ulink></literal>."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:236
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:215

 msgid "<systemitem role=\"package\">equivs</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">equivs</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:238
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:217

 msgid ""
 "<systemitem role=\"package\">equivs</systemitem> is another package for "
 "making packages.  It is often suggested for local use if you need to make a "
 msgid ""
 "<systemitem role=\"package\">equivs</systemitem> is another package for "
 "making packages.  It is often suggested for local use if you need to make a "


@@ -389,12 +398,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:249
+#. type: Content of: <appendix><section><title>
+#: tools.dbk:228

 msgid "Package builders"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Package builders"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:251
+#. type: Content of: <appendix><section><para>
+#: tools.dbk:230

 msgid ""
 "The following packages help with the package building process, general "
 "driving <command>dpkg-buildpackage</command> as well as handling supporting "
 msgid ""
 "The following packages help with the package building process, general "
 "driving <command>dpkg-buildpackage</command> as well as handling supporting "


@@ -402,12 +413,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:255
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:234

 msgid "<systemitem role=\"package\">cvs-buildpackage</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">cvs-buildpackage</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:257
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:236

 msgid ""
 "<systemitem role=\"package\">cvs-buildpackage</systemitem> provides the "
 "capability to inject or import Debian source packages into a CVS repository, "
 msgid ""
 "<systemitem role=\"package\">cvs-buildpackage</systemitem> provides the "
 "capability to inject or import Debian source packages into a CVS repository, "


@@ -416,7 +429,8 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:263
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:242

 msgid ""
 "These utilities provide an infrastructure to facilitate the use of CVS by "
 "Debian maintainers.  This allows one to keep separate CVS branches of a "
 msgid ""
 "These utilities provide an infrastructure to facilitate the use of CVS by "
 "Debian maintainers.  This allows one to keep separate CVS branches of a "


@@ -426,12 +440,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:272
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:251

 msgid "<systemitem role=\"package\">debootstrap</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">debootstrap</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:274
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:253

 msgid ""
 "The <systemitem role=\"package\">debootstrap</systemitem> package and script "
 "allows you to bootstrap a Debian base system into any part of your "
 msgid ""
 "The <systemitem role=\"package\">debootstrap</systemitem> package and script "
 "allows you to bootstrap a Debian base system into any part of your "


@@ -440,7 +456,8 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:280
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:259

 msgid ""
 "Having a system like this can be useful in many ways.  For instance, you can "
 "<command>chroot</command> into it if you want to test your build "
 msgid ""
 "Having a system like this can be useful in many ways.  For instance, you can "
 "<command>chroot</command> into it if you want to test your build "


@@ -449,12 +466,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:288
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:267

 msgid "<systemitem role=\"package\">pbuilder</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">pbuilder</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:290
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:269

 msgid ""
 "<systemitem role=\"package\">pbuilder</systemitem> constructs a chrooted "
 "system, and builds a package inside the chroot.  It is very useful to check "
 msgid ""
 "<systemitem role=\"package\">pbuilder</systemitem> constructs a chrooted "
 "system, and builds a package inside the chroot.  It is very useful to check "


@@ -464,7 +483,8 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:296
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:275

 msgid ""
 "A related package is <systemitem role=\"package\">pbuilder-uml</systemitem>, "
 "which goes even further by doing the build within a User Mode Linux "
 msgid ""
 "A related package is <systemitem role=\"package\">pbuilder-uml</systemitem>, "
 "which goes even further by doing the build within a User Mode Linux "


@@ -472,12 +492,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:303
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:282

 msgid "<systemitem role=\"package\">sbuild</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">sbuild</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:305
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:284

 msgid ""
 "<systemitem role=\"package\">sbuild</systemitem> is another automated "
 "builder.  It can use chrooted environments as well.  It can be used stand-"
 msgid ""
 "<systemitem role=\"package\">sbuild</systemitem> is another automated "
 "builder.  It can use chrooted environments as well.  It can be used stand-"


@@ -489,24 +511,28 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:317
+#. type: Content of: <appendix><section><title>
+#: tools.dbk:296

 msgid "Package uploaders"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Package uploaders"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:319
+#. type: Content of: <appendix><section><para>
+#: tools.dbk:298

 msgid ""
 "The following packages help automate or simplify the process of uploading "
 "packages into the official archive."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgid ""
 "The following packages help automate or simplify the process of uploading "
 "packages into the official archive."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:323
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:302

 msgid "<systemitem role=\"package\">dupload</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dupload</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:325
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:304

 msgid ""
 "<systemitem role=\"package\">dupload</systemitem> is a package and a script "
 "to automatically upload Debian packages to the Debian archive, to log the "
 msgid ""
 "<systemitem role=\"package\">dupload</systemitem> is a package and a script "
 "to automatically upload Debian packages to the Debian archive, to log the "


@@ -515,12 +541,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:333
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:312

 msgid "<systemitem role=\"package\">dput</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dput</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:335
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:314

 msgid ""
 "The <systemitem role=\"package\">dput</systemitem> package and script does "
 "much the same thing as <systemitem role=\"package\">dupload</systemitem>, "
 msgid ""
 "The <systemitem role=\"package\">dput</systemitem> package and script does "
 "much the same thing as <systemitem role=\"package\">dupload</systemitem>, "


@@ -531,12 +559,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:345
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:324

 msgid "<systemitem role=\"package\">dcut</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dcut</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:347
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:326

 msgid ""
 "The <systemitem role=\"package\">dcut</systemitem> script (part of the "
 "package <xref linkend=\"dput\"/> ) helps in removing files from the ftp "
 msgid ""
 "The <systemitem role=\"package\">dcut</systemitem> script (part of the "
 "package <xref linkend=\"dput\"/> ) helps in removing files from the ftp "


@@ -544,12 +574,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:355
+#. type: Content of: <appendix><section><title>
+#: tools.dbk:334

 msgid "Maintenance automation"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Maintenance automation"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:357
+#. type: Content of: <appendix><section><para>
+#: tools.dbk:336

 msgid ""
 "The following tools help automate different maintenance tasks, from adding "
 "changelog entries or signature lines and looking up bugs in Emacs to making "
 msgid ""
 "The following tools help automate different maintenance tasks, from adding "
 "changelog entries or signature lines and looking up bugs in Emacs to making "


@@ -557,12 +589,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:362
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:341

 msgid "<systemitem role=\"package\">devscripts</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">devscripts</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:364
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:343

 msgid ""
 "<systemitem role=\"package\">devscripts</systemitem> is a package containing "
 "wrappers and tools which are very helpful for maintaining your Debian "
 msgid ""
 "<systemitem role=\"package\">devscripts</systemitem> is a package containing "
 "wrappers and tools which are very helpful for maintaining your Debian "


@@ -578,7 +612,8 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:378
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:357

 msgid ""
 "See the <citerefentry> <refentrytitle>devscripts</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> manual page for a complete list of "
 msgid ""
 "See the <citerefentry> <refentrytitle>devscripts</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> manual page for a complete list of "


@@ -586,12 +621,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:385
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:364

 msgid "<systemitem role=\"package\">autotools-dev</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">autotools-dev</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:387
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:366

 msgid ""
 "<systemitem role=\"package\">autotools-dev</systemitem> contains best "
 "practices for people who maintain packages which use <command>autoconf</"
 msgid ""
 "<systemitem role=\"package\">autotools-dev</systemitem> contains best "
 "practices for people who maintain packages which use <command>autoconf</"


@@ -601,12 +638,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:396
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:375

 msgid "<systemitem role=\"package\">dpkg-repack</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dpkg-repack</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:398
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:377

 msgid ""
 "<command>dpkg-repack</command> creates Debian package file out of a package "
 "that has already been installed.  If any changes have been made to the "
 msgid ""
 "<command>dpkg-repack</command> creates Debian package file out of a package "
 "that has already been installed.  If any changes have been made to the "


@@ -615,7 +654,8 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:404
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:383

 msgid ""
 "This utility can make it easy to copy packages from one computer to another, "
 "or to recreate packages which are installed on your system but no longer "
 msgid ""
 "This utility can make it easy to copy packages from one computer to another, "
 "or to recreate packages which are installed on your system but no longer "


@@ -624,12 +664,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:411
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:390

 msgid "<systemitem role=\"package\">alien</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">alien</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:413
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:392

 msgid ""
 "<command>alien</command> converts binary packages between various packaging "
 "formats, including Debian, RPM (RedHat), LSB (Linux Standard Base), Solaris, "
 msgid ""
 "<command>alien</command> converts binary packages between various packaging "
 "formats, including Debian, RPM (RedHat), LSB (Linux Standard Base), Solaris, "


@@ -637,12 +679,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:420
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:399

 msgid "<systemitem role=\"package\">debsums</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">debsums</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:422
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:401

 msgid ""
 "<command>debsums</command> checks installed packages against their MD5 "
 "sums.  Note that not all packages have MD5 sums, since they aren't required "
 msgid ""
 "<command>debsums</command> checks installed packages against their MD5 "
 "sums.  Note that not all packages have MD5 sums, since they aren't required "


@@ -650,12 +694,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:428
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:407

 msgid "<systemitem role=\"package\">dpkg-dev-el</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dpkg-dev-el</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:430
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:409

 msgid ""
 "<systemitem role=\"package\">dpkg-dev-el</systemitem> is an Emacs lisp "
 "package which provides assistance when editing some of the files in the "
 msgid ""
 "<systemitem role=\"package\">dpkg-dev-el</systemitem> is an Emacs lisp "
 "package which provides assistance when editing some of the files in the "


@@ -665,12 +711,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:439
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:418

 msgid "<systemitem role=\"package\">dpkg-depcheck</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dpkg-depcheck</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:441
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:420

 msgid ""
 "<command>dpkg-depcheck</command> (from the <systemitem role=\"package"
 "\">devscripts</systemitem> package, <xref linkend=\"devscripts\"/> )  runs a "
 msgid ""
 "<command>dpkg-depcheck</command> (from the <systemitem role=\"package"
 "\">devscripts</systemitem> package, <xref linkend=\"devscripts\"/> )  runs a "


@@ -679,7 +727,8 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:447
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:426

 msgid ""
 "For Debian packages, this is useful when you have to compose a "
 "<literal>Build-Depends</literal> line for your new package: running the "
 msgid ""
 "For Debian packages, this is useful when you have to compose a "
 "<literal>Build-Depends</literal> line for your new package: running the "


@@ -687,45 +736,49 @@ msgid ""
 "a good first approximation of the build-dependencies.  For example:"
 msgstr ""
 
 "a good first approximation of the build-dependencies.  For example:"
 msgstr ""
 

-# type: Content of: <appendix><section><section><screen>
-#: tools.dbk:452
+#. type: Content of: <appendix><section><section><screen>
+#: tools.dbk:432

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"dpkg-depcheck -b debian/rules build\n"
+msgid "dpkg-depcheck -b debian/rules build\n"

 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:456
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:435

 msgid ""
 "<command>dpkg-depcheck</command> can also be used to check for run-time "
 "dependencies, especially if your package uses exec(2) to run other programs."
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid ""
 "<command>dpkg-depcheck</command> can also be used to check for run-time "
 "dependencies, especially if your package uses exec(2) to run other programs."
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:460
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:439

 msgid ""
 "For more information please see <citerefentry> <refentrytitle>dpkg-depcheck</"
 "refentrytitle> <manvolnum>1</manvolnum> </citerefentry>."
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgid ""
 "For more information please see <citerefentry> <refentrytitle>dpkg-depcheck</"
 "refentrytitle> <manvolnum>1</manvolnum> </citerefentry>."
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:469
+#. type: Content of: <appendix><section><title>
+#: tools.dbk:448

 msgid "Porting tools"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Porting tools"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:471
+#. type: Content of: <appendix><section><para>
+#: tools.dbk:450

 msgid "The following tools are helpful for porters and for cross-compilation."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgid "The following tools are helpful for porters and for cross-compilation."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:474
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:453

 msgid "<systemitem role=\"package\">quinn-diff</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">quinn-diff</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:476
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:455

 msgid ""
 "<systemitem role=\"package\">quinn-diff</systemitem> is used to locate the "
 "differences from one architecture to another.  For instance, it could tell "
 msgid ""
 "<systemitem role=\"package\">quinn-diff</systemitem> is used to locate the "
 "differences from one architecture to another.  For instance, it could tell "


@@ -734,12 +787,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:484
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:463

 msgid "<systemitem role=\"package\">dpkg-cross</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dpkg-cross</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:486
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:465

 msgid ""
 "<systemitem role=\"package\">dpkg-cross</systemitem> is a tool for "
 "installing libraries and headers for cross-compiling in a way similar to "
 msgid ""
 "<systemitem role=\"package\">dpkg-cross</systemitem> is a tool for "
 "installing libraries and headers for cross-compiling in a way similar to "


@@ -749,24 +804,28 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:497
+#. type: Content of: <appendix><section><title>
+#: tools.dbk:476

 msgid "Documentation and information"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Documentation and information"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:499
+#. type: Content of: <appendix><section><para>
+#: tools.dbk:478

 msgid ""
 "The following packages provide information for maintainers or help with "
 "building documentation."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgid ""
 "The following packages provide information for maintainers or help with "
 "building documentation."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:504
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:483

 msgid "<systemitem role=\"package\">docbook-xml</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">docbook-xml</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:506
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:485

 msgid ""
 "<systemitem role=\"package\">docbook-xml</systemitem> provides the DocBook "
 "XML DTDs, which are commonly used for Debian documentation (as is the older "
 msgid ""
 "<systemitem role=\"package\">docbook-xml</systemitem> provides the DocBook "
 "XML DTDs, which are commonly used for Debian documentation (as is the older "


@@ -774,7 +833,8 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:512
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:491

 msgid ""
 "The <systemitem role=\"package\">docbook-xsl</systemitem> package provides "
 "the XSL files for building and styling the source to various output formats. "
 msgid ""
 "The <systemitem role=\"package\">docbook-xsl</systemitem> package provides "
 "the XSL files for building and styling the source to various output formats. "


@@ -785,7 +845,8 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:520
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:499

 msgid ""
 "To produce PDF from FO, you need an FO processor, such as <systemitem role="
 "\"package\">xmlroff</systemitem> or <systemitem role=\"package\">fop</"
 msgid ""
 "To produce PDF from FO, you need an FO processor, such as <systemitem role="
 "\"package\">xmlroff</systemitem> or <systemitem role=\"package\">fop</"


@@ -794,12 +855,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:528
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:507

 msgid "<systemitem role=\"package\">debiandoc-sgml</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">debiandoc-sgml</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:530
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:509

 msgid ""
 "<systemitem role=\"package\">debiandoc-sgml</systemitem> provides the "
 "DebianDoc SGML DTD, which is commonly used for Debian documentation, but is "
 msgid ""
 "<systemitem role=\"package\">debiandoc-sgml</systemitem> provides the "
 "DebianDoc SGML DTD, which is commonly used for Debian documentation, but is "


@@ -809,43 +872,50 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:539
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:518

 msgid ""
 "Documentation for the DTD can be found in the <systemitem role=\"package"
 "\">debiandoc-sgml-doc</systemitem> package."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgid ""
 "Documentation for the DTD can be found in the <systemitem role=\"package"
 "\">debiandoc-sgml-doc</systemitem> package."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:545
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:524

 msgid "<systemitem role=\"package\">debian-keyring</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">debian-keyring</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:547
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:526

 msgid ""
 "Contains the public GPG and PGP keys of Debian developers.  See <xref "
 "linkend=\"key-maint\"/> and the package documentation for more information."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgid ""
 "Contains the public GPG and PGP keys of Debian developers.  See <xref "
 "linkend=\"key-maint\"/> and the package documentation for more information."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:553
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:532

 msgid "<systemitem role=\"package\">debian-maintainers</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">debian-maintainers</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:555
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:534

 msgid ""
 "Contains the public GPG keys of Debian Maintainers.  See <ulink url=\"&url-"
 "wiki-dm;\"></ulink> for more information."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgid ""
 "Contains the public GPG keys of Debian Maintainers.  See <ulink url=\"&url-"
 "wiki-dm;\"></ulink> for more information."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:561
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:540

 msgid "<systemitem role=\"package\">debview</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">debview</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:563
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:542

 msgid ""
 "<systemitem role=\"package\">debview</systemitem> provides an Emacs mode for "
 "viewing Debian binary packages.  This lets you examine a package without "
 msgid ""
 "<systemitem role=\"package\">debview</systemitem> provides an Emacs mode for "
 "viewing Debian binary packages.  This lets you examine a package without "

diff --git a/po4a/ja/best-pkging-practices.po b/po4a/ja/best-pkging-practices.po
index 7072c6eb931b95fbf0fa37e5ae61fdfe991686b1..ce3f8dc332625d53c3454b19430c4bdfc86f4c5c 100644 (file)
--- a/po4a/ja/best-pkging-practices.po
+++ b/po4a/ja/best-pkging-practices.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.4.1\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.4.1\n"

-"POT-Creation-Date: 2009-09-06 02:31+0900\n"
+"POT-Creation-Date: 2010-01-04 00:20+0100\n"

 "PO-Revision-Date: 2008-03-05 18:30+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
 "PO-Revision-Date: 2008-03-05 18:30+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"


@@ -162,20 +162,30 @@ msgstr ""
 #. type: Content of: <chapter><section><section><para>
 #: best-pkging-practices.dbk:99
 msgid ""
 #. type: Content of: <chapter><section><section><para>
 #: best-pkging-practices.dbk:99
 msgid ""

-"Unfortunately, the packaging system as such currently doesn't provide for "
-"separating the patches into several files.  Nevertheless, there are ways to "
-"separate patches: the patch files are shipped within the Debian patch file "
-"(<filename>.diff.gz</filename>), usually within the <filename>debian/</"
-"filename> directory.  The only difference is that they aren't applied "
-"immediately by dpkg-source, but by the <literal>build</literal> rule of "
-"<filename>debian/rules</filename>, through a dependency on the "
-"<literal>patch</literal> rule.  Conversely, they are reverted in the "
-"<literal>clean</literal> rule, through a dependency on the <literal>unpatch</"
-"literal> rule."
+"Fortunately, with the source format “3.0 (quilt)” it is now possible to keep "
+"patches separate without having to modify <filename>debian/rules</filename> "
+"to setup a patch system. Patches are stored in <filename>debian/patches/</"
+"filename> and when the source package is unpacked patches listed in "
+"<filename>debian/patches/series</filename> are automatically applied.  As "
+"the name implies, patches can be managed with <command>quilt</command>."

 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:113
+#: best-pkging-practices.dbk:107
+msgid ""
+"When using the older source “1.0”, it's also possible to separate patches "
+"but a dedicated patch system must be used: the patch files are shipped "
+"within the Debian patch file (<filename>.diff.gz</filename>), usually within "
+"the <filename>debian/</filename> directory. The only difference is that they "
+"aren't applied immediately by <command>dpkg-source</command>, but by the "
+"<literal>build</literal> rule of <filename>debian/rules</filename>, through "
+"a dependency on the <literal>patch</literal> rule.  Conversely, they are "
+"reverted in the <literal>clean</literal> rule, through a dependency on the "
+"<literal>unpatch</literal> rule."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:119

 msgid ""
 "<command>quilt</command> is the recommended tool for this.  It does all of "
 "the above, and also allows to manage patch series.  See the <systemitem role="
 msgid ""
 "<command>quilt</command> is the recommended tool for this.  It does all of "
 "the above, and also allows to manage patch series.  See the <systemitem role="


@@ -183,7 +193,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:119
+#: best-pkging-practices.dbk:125

 msgid ""
 "There are other tools to manage patches, like <command>dpatch</command>, and "
 "the patch system integrated with <systemitem role=\"package\">cdbs</"
 msgid ""
 "There are other tools to manage patches, like <command>dpatch</command>, and "
 "the patch system integrated with <systemitem role=\"package\">cdbs</"


@@ -192,13 +202,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:126
+#: best-pkging-practices.dbk:132

 msgid "Multiple binary packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Multiple binary packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:128
+#: best-pkging-practices.dbk:134

 msgid ""
 "A single source package will often build several binary packages, either to "
 "provide several flavors of the same software (e.g., the <systemitem role="
 msgid ""
 "A single source package will often build several binary packages, either to "
 "provide several flavors of the same software (e.g., the <systemitem role="


@@ -209,7 +219,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:135
+#: best-pkging-practices.dbk:141

 msgid ""
 "The second case can be easily managed in <filename>debian/rules</filename>.  "
 "You just need to move the appropriate files from the build directory into "
 msgid ""
 "The second case can be easily managed in <filename>debian/rules</filename>.  "
 "You just need to move the appropriate files from the build directory into "


@@ -222,7 +232,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:144
+#: best-pkging-practices.dbk:150

 msgid ""
 "The first case is a bit more difficult since it involves multiple recompiles "
 "of the same software but with different configuration options.  The "
 msgid ""
 "The first case is a bit more difficult since it involves multiple recompiles "
 "of the same software but with different configuration options.  The "


@@ -233,13 +243,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: best-pkging-practices.dbk:156
+#: best-pkging-practices.dbk:162

 msgid "Best practices for <filename>debian/control</filename>"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Best practices for <filename>debian/control</filename>"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:158
+#: best-pkging-practices.dbk:164

 msgid ""
 "The following practices are relevant to the <filename>debian/control</"
 "filename> file.  They supplement the <ulink url=\"&url-debian-policy;ch-"
 msgid ""
 "The following practices are relevant to the <filename>debian/control</"
 "filename> file.  They supplement the <ulink url=\"&url-debian-policy;ch-"


@@ -248,7 +258,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:164
+#: best-pkging-practices.dbk:170

 msgid ""
 "The description of the package, as defined by the corresponding field in the "
 "<filename>control</filename> file, contains both the package synopsis and "
 msgid ""
 "The description of the package, as defined by the corresponding field in the "
 "<filename>control</filename> file, contains both the package synopsis and "


@@ -261,13 +271,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:173
+#: best-pkging-practices.dbk:179

 msgid "General guidelines for package descriptions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "General guidelines for package descriptions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:175
+#: best-pkging-practices.dbk:181

 msgid ""
 "The package description should be written for the average likely user, the "
 "average person who will use and benefit from the package.  For instance, "
 msgid ""
 "The package description should be written for the average likely user, the "
 "average person who will use and benefit from the package.  For instance, "


@@ -278,7 +288,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:182
+#: best-pkging-practices.dbk:188

 msgid ""
 "Our review of package descriptions lead us to conclude that most package "
 "descriptions are technical, that is, are not written to make sense for non-"
 msgid ""
 "Our review of package descriptions lead us to conclude that most package "
 "descriptions are technical, that is, are not written to make sense for non-"


@@ -288,7 +298,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:188
+#: best-pkging-practices.dbk:194

 msgid ""
 "How do you write for non-technical users? Avoid jargon.  Avoid referring to "
 "other applications or frameworks that the user might not be familiar with — "
 msgid ""
 "How do you write for non-technical users? Avoid jargon.  Avoid referring to "
 "other applications or frameworks that the user might not be familiar with — "


@@ -299,7 +309,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:195
+#: best-pkging-practices.dbk:201

 msgid ""
 "Be objective.  Package descriptions are not the place for advocating your "
 "package, no matter how much you love it.  Remember that the reader may not "
 msgid ""
 "Be objective.  Package descriptions are not the place for advocating your "
 "package, no matter how much you love it.  Remember that the reader may not "


@@ -308,7 +318,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:200
+#: best-pkging-practices.dbk:206

 msgid ""
 "References to the names of any other software packages, protocol names, "
 "standards, or specifications should use their canonical forms, if one "
 msgid ""
 "References to the names of any other software packages, protocol names, "
 "standards, or specifications should use their canonical forms, if one "


@@ -319,7 +329,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:207
+#: best-pkging-practices.dbk:213

 msgid ""
 "If you are having problems writing your description, you may wish to send it "
 "along to &email-debian-l10n-english; and request feedback."
 msgid ""
 "If you are having problems writing your description, you may wish to send it "
 "along to &email-debian-l10n-english; and request feedback."


@@ -327,19 +337,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:213
+#: best-pkging-practices.dbk:219

 msgid "The package synopsis, or short description"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "The package synopsis, or short description"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:215
+#: best-pkging-practices.dbk:221

 msgid ""
 "Policy says the synopsis line (the short description) must be concise, not "
 "repeating the package name, but also informative."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid ""
 "Policy says the synopsis line (the short description) must be concise, not "
 "repeating the package name, but also informative."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:219
+#: best-pkging-practices.dbk:225

 msgid ""
 "The synopsis functions as a phrase describing the package, not a complete "
 "sentence, so sentential punctuation is inappropriate: it does not need extra "
 msgid ""
 "The synopsis functions as a phrase describing the package, not a complete "
 "sentence, so sentential punctuation is inappropriate: it does not need extra "


@@ -349,7 +359,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:225
+#: best-pkging-practices.dbk:231

 #, no-wrap
 msgid ""
 "Package: libeg0\n"
 #, no-wrap
 msgid ""
 "Package: libeg0\n"


@@ -357,7 +367,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:229
+#: best-pkging-practices.dbk:235

 msgid ""
 "Technically this is a noun phrase minus articles, as opposed to a verb "
 "phrase.  A good heuristic is that it should be possible to substitute the "
 msgid ""
 "Technically this is a noun phrase minus articles, as opposed to a verb "
 "phrase.  A good heuristic is that it should be possible to substitute the "


@@ -365,14 +375,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:234
+#: best-pkging-practices.dbk:240

 msgid ""
 "The package <replaceable>name</replaceable> provides {a,an,the,some} "
 "<replaceable>synopsis</replaceable>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid ""
 "The package <replaceable>name</replaceable> provides {a,an,the,some} "
 "<replaceable>synopsis</replaceable>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:238
+#: best-pkging-practices.dbk:244

 msgid ""
 "Sets of related packages may use an alternative scheme that divides the "
 "synopsis into two parts, the first a description of the whole suite and the "
 msgid ""
 "Sets of related packages may use an alternative scheme that divides the "
 "synopsis into two parts, the first a description of the whole suite and the "


@@ -380,7 +390,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:243
+#: best-pkging-practices.dbk:249

 #, no-wrap
 msgid ""
 "Package: eg-tools\n"
 #, no-wrap
 msgid ""
 "Package: eg-tools\n"


@@ -391,7 +401,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:250
+#: best-pkging-practices.dbk:256

 msgid ""
 "These synopses follow a modified formula. Where a package "
 "\"<replaceable>name</replaceable>\" has a synopsis \"<replaceable>suite</"
 msgid ""
 "These synopses follow a modified formula. Where a package "
 "\"<replaceable>name</replaceable>\" has a synopsis \"<replaceable>suite</"


@@ -401,7 +411,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:257
+#: best-pkging-practices.dbk:263

 msgid ""
 "The package <replaceable>name</replaceable> provides {a,an,the} "
 "<replaceable>role</replaceable> for the <replaceable>suite</replaceable>."
 msgid ""
 "The package <replaceable>name</replaceable> provides {a,an,the} "
 "<replaceable>role</replaceable> for the <replaceable>suite</replaceable>."


@@ -409,13 +419,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:263
+#: best-pkging-practices.dbk:269

 msgid "The long description"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The long description"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:265
+#: best-pkging-practices.dbk:271

 msgid ""
 "The long description is the primary information available to the user about "
 "a package before they install it.  It should provide all the information "
 msgid ""
 "The long description is the primary information available to the user about "
 "a package before they install it.  It should provide all the information "


@@ -425,13 +435,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:271
+#: best-pkging-practices.dbk:277

 msgid "The long description should consist of full and complete sentences."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The long description should consist of full and complete sentences."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:274
+#: best-pkging-practices.dbk:280

 msgid ""
 "The first paragraph of the long description should answer the following "
 "questions: what does the package do? what task does it help the user "
 msgid ""
 "The first paragraph of the long description should answer the following "
 "questions: what does the package do? what task does it help the user "


@@ -441,7 +451,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:280
+#: best-pkging-practices.dbk:286

 msgid ""
 "The following paragraphs should answer the following questions: Why do I as "
 "a user need this package? What other features does the package have? What "
 msgid ""
 "The following paragraphs should answer the following questions: Why do I as "
 "a user need this package? What other features does the package have? What "


@@ -453,7 +463,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:288
+#: best-pkging-practices.dbk:294

 msgid ""
 "Be careful to avoid spelling and grammar mistakes.  Ensure that you spell-"
 "check it.  Both <command>ispell</command> and <command>aspell</command> have "
 msgid ""
 "Be careful to avoid spelling and grammar mistakes.  Ensure that you spell-"
 "check it.  Both <command>ispell</command> and <command>aspell</command> have "


@@ -461,20 +471,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:293
+#: best-pkging-practices.dbk:299

 #, no-wrap
 msgid "ispell -d american -g debian/control\n"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 #, no-wrap
 msgid "ispell -d american -g debian/control\n"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:296
+#: best-pkging-practices.dbk:302

 #, no-wrap
 msgid "aspell -d en -D -c debian/control\n"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 #, no-wrap
 msgid "aspell -d en -D -c debian/control\n"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:299
+#: best-pkging-practices.dbk:305

 msgid ""
 "Users usually expect these questions to be answered in the package "
 "description:"
 msgid ""
 "Users usually expect these questions to be answered in the package "
 "description:"


@@ -482,7 +492,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:304
+#: best-pkging-practices.dbk:310

 msgid ""
 "What does the package do? If it is an add-on to another package, then the "
 "short description of the package we are an add-on to should be put in here."
 msgid ""
 "What does the package do? If it is an add-on to another package, then the "
 "short description of the package we are an add-on to should be put in here."


@@ -490,7 +500,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:310
+#: best-pkging-practices.dbk:316

 msgid ""
 "Why should I want this package? This is related to the above, but not the "
 "same (this is a mail user agent; this is cool, fast, interfaces with PGP and "
 msgid ""
 "Why should I want this package? This is related to the above, but not the "
 "same (this is a mail user agent; this is cool, fast, interfaces with PGP and "


@@ -499,7 +509,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:317
+#: best-pkging-practices.dbk:323

 msgid ""
 "If this package should not be installed directly, but is pulled in by "
 "another package, this should be mentioned."
 msgid ""
 "If this package should not be installed directly, but is pulled in by "
 "another package, this should be mentioned."


@@ -507,7 +517,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:323
+#: best-pkging-practices.dbk:329

 msgid ""
 "If the package is <literal>experimental</literal>, or there are other "
 "reasons it should not be used, if there are other packages that should be "
 msgid ""
 "If the package is <literal>experimental</literal>, or there are other "
 "reasons it should not be used, if there are other packages that should be "


@@ -516,7 +526,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:330
+#: best-pkging-practices.dbk:336

 msgid ""
 "How is this package different from the competition? Is it a better "
 "implementation? more features? different features? Why should I choose this "
 msgid ""
 "How is this package different from the competition? Is it a better "
 "implementation? more features? different features? Why should I choose this "


@@ -525,13 +535,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:343
+#: best-pkging-practices.dbk:349

 msgid "Upstream home page"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Upstream home page"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:345
+#: best-pkging-practices.dbk:351

 msgid ""
 "We recommend that you add the URL for the package's home page in the "
 "<literal>Homepage</literal> field of the <literal>Source</literal> section "
 msgid ""
 "We recommend that you add the URL for the package's home page in the "
 "<literal>Homepage</literal> field of the <literal>Source</literal> section "


@@ -541,13 +551,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:353
+#: best-pkging-practices.dbk:359

 msgid "Version Control System location"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Version Control System location"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:355
+#: best-pkging-practices.dbk:361

 msgid ""
 "There are additional fields for the location of the Version Control System "
 "in <filename>debian/control</filename>."
 msgid ""
 "There are additional fields for the location of the Version Control System "
 "in <filename>debian/control</filename>."


@@ -555,13 +565,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:359
+#: best-pkging-practices.dbk:365

 msgid "Vcs-Browser"
 msgstr "Vcs-Browser"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Vcs-Browser"
 msgstr "Vcs-Browser"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:361
+#: best-pkging-practices.dbk:367

 msgid ""
 "Value of this field should be a <literal>http://</literal> URL pointing to a "
 "web-browsable copy of the Version Control System repository used to maintain "
 msgid ""
 "Value of this field should be a <literal>http://</literal> URL pointing to a "
 "web-browsable copy of the Version Control System repository used to maintain "


@@ -570,7 +580,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:366
+#: best-pkging-practices.dbk:372

 msgid ""
 "The information is meant to be useful for the final user, willing to browse "
 "the latest work done on the package (e.g.  when looking for the patch fixing "
 msgid ""
 "The information is meant to be useful for the final user, willing to browse "
 "the latest work done on the package (e.g.  when looking for the patch fixing "


@@ -579,13 +589,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:373
+#: best-pkging-practices.dbk:379

 msgid "Vcs-*"
 msgstr "Vcs-*"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Vcs-*"
 msgstr "Vcs-*"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:375
+#: best-pkging-practices.dbk:381

 msgid ""
 "Value of this field should be a string identifying unequivocally the "
 "location of the Version Control System repository used to maintain the given "
 msgid ""
 "Value of this field should be a string identifying unequivocally the "
 "location of the Version Control System repository used to maintain the given "


@@ -600,7 +610,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:386
+#: best-pkging-practices.dbk:392

 msgid ""
 "The information is meant to be useful for a user knowledgeable in the given "
 "Version Control System and willing to build the current version of a package "
 msgid ""
 "The information is meant to be useful for a user knowledgeable in the given "
 "Version Control System and willing to build the current version of a package "


@@ -615,7 +625,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:397
+#: best-pkging-practices.dbk:403

 msgid ""
 "In the following example, an instance of the field for a Subversion "
 "repository of the <systemitem role=\"package\">vim</systemitem> package is "
 msgid ""
 "In the following example, an instance of the field for a Subversion "
 "repository of the <systemitem role=\"package\">vim</systemitem> package is "


@@ -627,7 +637,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><screen>
 #. type: Content of: <chapter><section><section><section><screen>
 
 # type: Content of: <chapter><section><section><section><screen>
 #. type: Content of: <chapter><section><section><section><screen>

-#: best-pkging-practices.dbk:406
+#: best-pkging-practices.dbk:412

 #, fuzzy, no-wrap
 msgid ""
 "  Source: vim\n"
 #, fuzzy, no-wrap
 msgid ""
 "  Source: vim\n"


@@ -649,13 +659,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: best-pkging-practices.dbk:421
+#: best-pkging-practices.dbk:427

 msgid "Best practices for <filename>debian/changelog</filename>"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Best practices for <filename>debian/changelog</filename>"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:423
+#: best-pkging-practices.dbk:429

 msgid ""
 "The following practices supplement the <ulink url=\"&url-debian-policy;ch-"
 "docs.html#s-changelogs\">Policy on changelog files</ulink>."
 msgid ""
 "The following practices supplement the <ulink url=\"&url-debian-policy;ch-"
 "docs.html#s-changelogs\">Policy on changelog files</ulink>."


@@ -663,13 +673,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:428
+#: best-pkging-practices.dbk:434

 msgid "Writing useful changelog entries"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Writing useful changelog entries"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:430
+#: best-pkging-practices.dbk:436

 msgid ""
 "The changelog entry for a package revision documents changes in that "
 "revision, and only them.  Concentrate on describing significant and user-"
 msgid ""
 "The changelog entry for a package revision documents changes in that "
 "revision, and only them.  Concentrate on describing significant and user-"


@@ -678,7 +688,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:435
+#: best-pkging-practices.dbk:441

 msgid ""
 "Focus on <emphasis>what</emphasis> was changed — who, how and when are "
 "usually less important.  Having said that, remember to politely attribute "
 msgid ""
 "Focus on <emphasis>what</emphasis> was changed — who, how and when are "
 "usually less important.  Having said that, remember to politely attribute "


@@ -688,7 +698,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:441
+#: best-pkging-practices.dbk:447

 msgid ""
 "There's no need to elaborate the trivial and obvious changes.  You can also "
 "aggregate several changes in one entry.  On the other hand, don't be overly "
 msgid ""
 "There's no need to elaborate the trivial and obvious changes.  You can also "
 "aggregate several changes in one entry.  On the other hand, don't be overly "


@@ -699,7 +709,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:448
+#: best-pkging-practices.dbk:454

 msgid ""
 "Use common English so that the majority of readers can comprehend it.  Avoid "
 "abbreviations, tech-speak and jargon when explaining changes that close "
 msgid ""
 "Use common English so that the majority of readers can comprehend it.  Avoid "
 "abbreviations, tech-speak and jargon when explaining changes that close "


@@ -709,7 +719,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:454
+#: best-pkging-practices.dbk:460

 msgid ""
 "It is sometimes desirable to prefix changelog entries with the names of the "
 "files that were changed.  However, there's no need to explicitly list each "
 msgid ""
 "It is sometimes desirable to prefix changelog entries with the names of the "
 "files that were changed.  However, there's no need to explicitly list each "


@@ -719,7 +729,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:460
+#: best-pkging-practices.dbk:466

 msgid ""
 "When referring to bugs, don't assume anything.  Say what the problem was, "
 "how it was fixed, and append the closes: #nnnnn string.  See <xref linkend="
 msgid ""
 "When referring to bugs, don't assume anything.  Say what the problem was, "
 "how it was fixed, and append the closes: #nnnnn string.  See <xref linkend="


@@ -728,13 +738,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:467
+#: best-pkging-practices.dbk:473

 msgid "Common misconceptions about changelog entries"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Common misconceptions about changelog entries"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:469
+#: best-pkging-practices.dbk:475

 msgid ""
 "The changelog entries should <emphasis role=\"strong\">not</emphasis> "
 "document generic packaging issues (Hey, if you're looking for foo.conf, it's "
 msgid ""
 "The changelog entries should <emphasis role=\"strong\">not</emphasis> "
 "document generic packaging issues (Hey, if you're looking for foo.conf, it's "


@@ -746,7 +756,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:477
+#: best-pkging-practices.dbk:483

 msgid ""
 "The only bugs closed with a changelog entry should be those that are "
 "actually fixed in the same package revision.  Closing unrelated bugs in the "
 msgid ""
 "The only bugs closed with a changelog entry should be those that are "
 "actually fixed in the same package revision.  Closing unrelated bugs in the "


@@ -755,7 +765,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:482
+#: best-pkging-practices.dbk:488

 msgid ""
 "The changelog entries should <emphasis role=\"strong\">not</emphasis> be "
 "used for random discussion with bug reporters (I don't see segfaults when "
 msgid ""
 "The changelog entries should <emphasis role=\"strong\">not</emphasis> be "
 "used for random discussion with bug reporters (I don't see segfaults when "


@@ -770,7 +780,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:493
+#: best-pkging-practices.dbk:499

 msgid ""
 "It is an old tradition to acknowledge bugs fixed in non-maintainer uploads "
 "in the first changelog entry of the proper maintainer upload.  As we have "
 msgid ""
 "It is an old tradition to acknowledge bugs fixed in non-maintainer uploads "
 "in the first changelog entry of the proper maintainer upload.  As we have "


@@ -780,13 +790,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:501
+#: best-pkging-practices.dbk:507

 msgid "Common errors in changelog entries"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Common errors in changelog entries"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:503
+#: best-pkging-practices.dbk:509

 msgid ""
 "The following examples demonstrate some common errors or examples of bad "
 "style in changelog entries."
 msgid ""
 "The following examples demonstrate some common errors or examples of bad "
 "style in changelog entries."


@@ -794,7 +804,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:507
+#: best-pkging-practices.dbk:513

 #, fuzzy, no-wrap
 msgid "  * Fixed all outstanding bugs.\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "  * Fixed all outstanding bugs.\n"
 msgstr ""


@@ -803,13 +813,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:510
+#: best-pkging-practices.dbk:516

 msgid "This doesn't tell readers anything too useful, obviously."
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 msgid "This doesn't tell readers anything too useful, obviously."
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:513
+#: best-pkging-practices.dbk:519

 #, fuzzy, no-wrap
 msgid "  * Applied patch from Jane Random.\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "  * Applied patch from Jane Random.\n"
 msgstr ""


@@ -818,13 +828,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:516
+#: best-pkging-practices.dbk:522

 msgid "What was the patch about?"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 msgid "What was the patch about?"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:519
+#: best-pkging-practices.dbk:525

 #, fuzzy, no-wrap
 msgid "  * Late night install target overhaul.\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "  * Late night install target overhaul.\n"
 msgstr ""


@@ -833,7 +843,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:522
+#: best-pkging-practices.dbk:528

 msgid ""
 "Overhaul which accomplished what? Is the mention of late night supposed to "
 "remind us that we shouldn't trust that code?"
 msgid ""
 "Overhaul which accomplished what? Is the mention of late night supposed to "
 "remind us that we shouldn't trust that code?"


@@ -841,7 +851,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:526
+#: best-pkging-practices.dbk:532

 #, fuzzy, no-wrap
 msgid "  * Fix vsync FU w/ ancient CRTs.\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "  * Fix vsync FU w/ ancient CRTs.\n"
 msgstr ""


@@ -850,7 +860,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:529
+#: best-pkging-practices.dbk:535

 msgid ""
 "Too many acronyms, and it's not overly clear what the, uh, fsckup (oops, a "
 "curse word!) was actually about, or how it was fixed."
 msgid ""
 "Too many acronyms, and it's not overly clear what the, uh, fsckup (oops, a "
 "curse word!) was actually about, or how it was fixed."


@@ -858,7 +868,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:533
+#: best-pkging-practices.dbk:539

 #, fuzzy, no-wrap
 msgid "  * This is not a bug, closes: #nnnnnn.\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "  * This is not a bug, closes: #nnnnnn.\n"
 msgstr ""


@@ -867,7 +877,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:536
+#: best-pkging-practices.dbk:542

 msgid ""
 "First of all, there's absolutely no need to upload the package to convey "
 "this information; instead, use the bug tracking system.  Secondly, there's "
 msgid ""
 "First of all, there's absolutely no need to upload the package to convey "
 "this information; instead, use the bug tracking system.  Secondly, there's "


@@ -876,7 +886,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:541
+#: best-pkging-practices.dbk:547

 #, fuzzy, no-wrap
 msgid "  * Has been fixed for ages, but I forgot to close; closes: #54321.\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "  * Has been fixed for ages, but I forgot to close; closes: #54321.\n"
 msgstr ""


@@ -885,7 +895,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:544
+#: best-pkging-practices.dbk:550

 msgid ""
 "If for some reason you didn't mention the bug number in a previous changelog "
 "entry, there's no problem, just close the bug normally in the BTS.  There's "
 msgid ""
 "If for some reason you didn't mention the bug number in a previous changelog "
 "entry, there's no problem, just close the bug normally in the BTS.  There's "


@@ -897,7 +907,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:551
+#: best-pkging-practices.dbk:557

 #, fuzzy, no-wrap
 msgid "  * Closes: #12345, #12346, #15432\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "  * Closes: #12345, #12346, #15432\n"
 msgstr ""


@@ -906,7 +916,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:554
+#: best-pkging-practices.dbk:560

 msgid ""
 "Where's the description? If you can't think of a descriptive message, start "
 "by inserting the title of each different bug."
 msgid ""
 "Where's the description? If you can't think of a descriptive message, start "
 "by inserting the title of each different bug."


@@ -914,13 +924,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:560
+#: best-pkging-practices.dbk:566

 msgid "Supplementing changelogs with NEWS.Debian files"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Supplementing changelogs with NEWS.Debian files"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:562
+#: best-pkging-practices.dbk:568

 msgid ""
 "Important news about changes in a package can also be put in <filename> NEWS."
 "Debian</filename> files.  The news will be displayed by tools like apt-"
 msgid ""
 "Important news about changes in a package can also be put in <filename> NEWS."
 "Debian</filename> files.  The news will be displayed by tools like apt-"


@@ -934,7 +944,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:573
+#: best-pkging-practices.dbk:579

 msgid ""
 "The file format is the same as a debian changelog file, but leave off the "
 "asterisks and describe each news item with a full paragraph when necessary "
 msgid ""
 "The file format is the same as a debian changelog file, but leave off the "
 "asterisks and describe each news item with a full paragraph when necessary "


@@ -947,7 +957,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:582
+#: best-pkging-practices.dbk:588

 #, fuzzy, no-wrap
 msgid ""
 "cron (3.0pl1-74) unstable; urgency=low\n"
 #, fuzzy, no-wrap
 msgid ""
 "cron (3.0pl1-74) unstable; urgency=low\n"


@@ -971,7 +981,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:592
+#: best-pkging-practices.dbk:598

 msgid ""
 "The <filename>NEWS.Debian</filename> file is installed as <filename> /usr/"
 "share/doc/<replaceable>package</replaceable>/NEWS.Debian.gz</filename>.  It "
 msgid ""
 "The <filename>NEWS.Debian</filename> file is installed as <filename> /usr/"
 "share/doc/<replaceable>package</replaceable>/NEWS.Debian.gz</filename>.  It "


@@ -982,7 +992,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:599
+#: best-pkging-practices.dbk:605

 msgid ""
 "Unlike changelog files, you need not update <filename>NEWS.Debian</filename> "
 "files with every release.  Only update them if you have something "
 msgid ""
 "Unlike changelog files, you need not update <filename>NEWS.Debian</filename> "
 "files with every release.  Only update them if you have something "


@@ -993,13 +1003,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: best-pkging-practices.dbk:621
+#: best-pkging-practices.dbk:627

 msgid "Best practices for maintainer scripts"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Best practices for maintainer scripts"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:623
+#: best-pkging-practices.dbk:629

 msgid ""
 "Maintainer scripts include the files <filename>debian/postinst</filename>, "
 "<filename>debian/preinst</filename>, <filename>debian/prerm</filename> and "
 msgid ""
 "Maintainer scripts include the files <filename>debian/postinst</filename>, "
 "<filename>debian/preinst</filename>, <filename>debian/prerm</filename> and "


@@ -1011,7 +1021,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:631
+#: best-pkging-practices.dbk:637

 msgid ""
 "Maintainer scripts must be idempotent.  That means that you need to make "
 "sure nothing bad will happen if the script is called twice where it would "
 msgid ""
 "Maintainer scripts must be idempotent.  That means that you need to make "
 "sure nothing bad will happen if the script is called twice where it would "


@@ -1020,7 +1030,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:636
+#: best-pkging-practices.dbk:642

 msgid ""
 "Standard input and output may be redirected (e.g.  into pipes) for logging "
 "purposes, so don't rely on them being a tty."
 msgid ""
 "Standard input and output may be redirected (e.g.  into pipes) for logging "
 "purposes, so don't rely on them being a tty."


@@ -1028,7 +1038,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:640
+#: best-pkging-practices.dbk:646

 msgid ""
 "All prompting or interactive configuration should be kept to a minimum.  "
 "When it is necessary, you should use the <systemitem role=\"package"
 msgid ""
 "All prompting or interactive configuration should be kept to a minimum.  "
 "When it is necessary, you should use the <systemitem role=\"package"


@@ -1039,7 +1049,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:647
+#: best-pkging-practices.dbk:653

 msgid ""
 "Keep the maintainer scripts as simple as possible.  We suggest you use pure "
 "POSIX shell scripts.  Remember, if you do need any bash features, the "
 msgid ""
 "Keep the maintainer scripts as simple as possible.  We suggest you use pure "
 "POSIX shell scripts.  Remember, if you do need any bash features, the "


@@ -1050,7 +1060,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:654
+#: best-pkging-practices.dbk:660

 msgid ""
 "If you change your maintainer scripts, be sure to test package removal, "
 "double installation, and purging.  Be sure that a purged package is "
 msgid ""
 "If you change your maintainer scripts, be sure to test package removal, "
 "double installation, and purging.  Be sure that a purged package is "


@@ -1060,7 +1070,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:660
+#: best-pkging-practices.dbk:666

 msgid ""
 "If you need to check for the existence of a command, you should use "
 "something like"
 msgid ""
 "If you need to check for the existence of a command, you should use "
 "something like"


@@ -1068,14 +1078,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><programlisting>
 #. type: Content of: <chapter><section><programlisting>
 
 # type: Content of: <chapter><section><programlisting>
 #. type: Content of: <chapter><section><programlisting>

-#: best-pkging-practices.dbk:663
+#: best-pkging-practices.dbk:669

 #, no-wrap
 msgid "if [ -x /usr/sbin/install-docs ]; then ..."
 msgstr "if [ -x /usr/sbin/install-docs ]; then ..."
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 #, no-wrap
 msgid "if [ -x /usr/sbin/install-docs ]; then ..."
 msgstr "if [ -x /usr/sbin/install-docs ]; then ..."
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:665
+#: best-pkging-practices.dbk:671

 msgid ""
 "If you don't wish to hard-code the path of a command in your maintainer "
 "script, the following POSIX-compliant shell function may help:"
 msgid ""
 "If you don't wish to hard-code the path of a command in your maintainer "
 "script, the following POSIX-compliant shell function may help:"


@@ -1083,7 +1093,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:670
+#: best-pkging-practices.dbk:676

 msgid ""
 "You can use this function to search <literal>$PATH</literal> for a command "
 "name, passed as an argument.  It returns true (zero) if the command was "
 msgid ""
 "You can use this function to search <literal>$PATH</literal> for a command "
 "name, passed as an argument.  It returns true (zero) if the command was "


@@ -1094,7 +1104,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:677
+#: best-pkging-practices.dbk:683

 msgid ""
 "While <command>which</command> is an acceptable alternative, since it is "
 "from the required <systemitem role=\"package\">debianutils</systemitem> "
 msgid ""
 "While <command>which</command> is an acceptable alternative, since it is "
 "from the required <systemitem role=\"package\">debianutils</systemitem> "


@@ -1106,7 +1116,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: best-pkging-practices.dbk:687
+#: best-pkging-practices.dbk:693

 msgid ""
 "Configuration management with <systemitem role=\"package\">debconf</"
 "systemitem>"
 msgid ""
 "Configuration management with <systemitem role=\"package\">debconf</"
 "systemitem>"


@@ -1114,7 +1124,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:689
+#: best-pkging-practices.dbk:695

 msgid ""
 "<systemitem role=\"package\">Debconf</systemitem> is a configuration "
 "management system which can be used by all the various packaging scripts "
 msgid ""
 "<systemitem role=\"package\">Debconf</systemitem> is a configuration "
 "management system which can be used by all the various packaging scripts "


@@ -1126,7 +1136,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:697
+#: best-pkging-practices.dbk:703

 msgid ""
 "Debconf is a great tool but it is often poorly used.  Many common mistakes "
 "are listed in the <citerefentry> <refentrytitle>debconf-devel</"
 msgid ""
 "Debconf is a great tool but it is often poorly used.  Many common mistakes "
 "are listed in the <citerefentry> <refentrytitle>debconf-devel</"


@@ -1137,7 +1147,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:704
+#: best-pkging-practices.dbk:710

 msgid ""
 "These guidelines include some writing style and typography recommendations, "
 "general considerations about debconf usage as well as more specific "
 msgid ""
 "These guidelines include some writing style and typography recommendations, "
 "general considerations about debconf usage as well as more specific "


@@ -1147,13 +1157,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:710
+#: best-pkging-practices.dbk:716

 msgid "Do not abuse debconf"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Do not abuse debconf"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:712
+#: best-pkging-practices.dbk:718

 msgid ""
 "Since debconf appeared in Debian, it has been widely abused and several "
 "criticisms received by the Debian distribution come from debconf abuse with "
 msgid ""
 "Since debconf appeared in Debian, it has been widely abused and several "
 "criticisms received by the Debian distribution come from debconf abuse with "


@@ -1163,7 +1173,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:718
+#: best-pkging-practices.dbk:724

 msgid ""
 "Keep usage notes to what they belong: the NEWS.Debian, or README.Debian "
 "file.  Only use notes for important notes which may directly affect the "
 msgid ""
 "Keep usage notes to what they belong: the NEWS.Debian, or README.Debian "
 "file.  Only use notes for important notes which may directly affect the "


@@ -1173,7 +1183,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:724
+#: best-pkging-practices.dbk:730

 msgid ""
 "Carefully choose the questions priorities in maintainer scripts.  See "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> <manvolnum>7</"
 msgid ""
 "Carefully choose the questions priorities in maintainer scripts.  See "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> <manvolnum>7</"


@@ -1183,19 +1193,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:732
+#: best-pkging-practices.dbk:738

 msgid "General recommendations for authors and translators"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 msgid "General recommendations for authors and translators"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:734
+#: best-pkging-practices.dbk:740

 msgid "Write correct English"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Write correct English"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:736
+#: best-pkging-practices.dbk:742

 msgid ""
 "Most Debian package maintainers are not native English speakers.  So, "
 "writing properly phrased templates may not be easy for them."
 msgid ""
 "Most Debian package maintainers are not native English speakers.  So, "
 "writing properly phrased templates may not be easy for them."


@@ -1203,7 +1213,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:740
+#: best-pkging-practices.dbk:746

 msgid ""
 "Please use (and abuse) &email-debian-l10n-english; mailing list.  Have your "
 "templates proofread."
 msgid ""
 "Please use (and abuse) &email-debian-l10n-english; mailing list.  Have your "
 "templates proofread."


@@ -1211,7 +1221,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:744
+#: best-pkging-practices.dbk:750

 msgid ""
 "Badly written templates give a poor image of your package, of your work...or "
 "even of Debian itself."
 msgid ""
 "Badly written templates give a poor image of your package, of your work...or "
 "even of Debian itself."


@@ -1219,7 +1229,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:748
+#: best-pkging-practices.dbk:754

 msgid ""
 "Avoid technical jargon as much as possible.  If some terms sound common to "
 "you, they may be impossible to understand for others.  If you cannot avoid "
 msgid ""
 "Avoid technical jargon as much as possible.  If some terms sound common to "
 "you, they may be impossible to understand for others.  If you cannot avoid "


@@ -1229,13 +1239,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:756
+#: best-pkging-practices.dbk:762

 msgid "Be kind to translators"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Be kind to translators"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:758
+#: best-pkging-practices.dbk:764

 msgid ""
 "Debconf templates may be translated.  Debconf, along with its sister package "
 "<command>po-debconf</command> offers a simple framework for getting "
 msgid ""
 "Debconf templates may be translated.  Debconf, along with its sister package "
 "<command>po-debconf</command> offers a simple framework for getting "


@@ -1244,7 +1254,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:763
+#: best-pkging-practices.dbk:769

 msgid ""
 "Please use gettext-based templates.  Install <systemitem role=\"package\">po-"
 "debconf</systemitem> on your development system and read its documentation "
 msgid ""
 "Please use gettext-based templates.  Install <systemitem role=\"package\">po-"
 "debconf</systemitem> on your development system and read its documentation "


@@ -1252,7 +1262,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:768
+#: best-pkging-practices.dbk:774

 msgid ""
 "Avoid changing templates too often.  Changing templates text induces more "
 "work to translators which will get their translation fuzzied.  A fuzzy "
 msgid ""
 "Avoid changing templates too often.  Changing templates text induces more "
 "work to translators which will get their translation fuzzied.  A fuzzy "


@@ -1263,7 +1273,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:776
+#: best-pkging-practices.dbk:782

 msgid ""
 "If you plan to do changes to your original templates, please use the "
 "notification system provided with the <systemitem role=\"package\">po-"
 msgid ""
 "If you plan to do changes to your original templates, please use the "
 "notification system provided with the <systemitem role=\"package\">po-"


@@ -1276,18 +1286,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:788
+#: best-pkging-practices.dbk:794

 msgid "A recommended use of that utility is:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><programlisting>
 msgid "A recommended use of that utility is:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><programlisting>

-#: best-pkging-practices.dbk:790
+#: best-pkging-practices.dbk:796

 #, no-wrap
 msgid "cd debian/po &amp;&amp; podebconf-report-po --languageteam --withtranslators --call --deadline=\"+10 days\""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 #, no-wrap
 msgid "cd debian/po &amp;&amp; podebconf-report-po --languageteam --withtranslators --call --deadline=\"+10 days\""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:792
+#: best-pkging-practices.dbk:798

 msgid ""
 "This command will first synchronize the PO and POT files in debian/po with "
 "the templates files listed in <filename>debian/po/POTFILES.in</filename>.  "
 msgid ""
 "This command will first synchronize the PO and POT files in debian/po with "
 "the templates files listed in <filename>debian/po/POTFILES.in</filename>.  "


@@ -1299,7 +1309,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:801
+#: best-pkging-practices.dbk:807

 msgid ""
 "Giving a deadline to translators is always appreciated, so that they can "
 "organize their work. Please remember that some translation teams have a "
 msgid ""
 "Giving a deadline to translators is always appreciated, so that they can "
 "organize their work. Please remember that some translation teams have a "


@@ -1310,7 +1320,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:808
+#: best-pkging-practices.dbk:814

 msgid ""
 "If in doubt, you may also contact the translation team for a given language "
 "(debian-l10n-xxxxx@&lists-host;), or the &email-debian-i18n; mailing list."
 msgid ""
 "If in doubt, you may also contact the translation team for a given language "
 "(debian-l10n-xxxxx@&lists-host;), or the &email-debian-i18n; mailing list."


@@ -1318,12 +1328,12 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:815
+#: best-pkging-practices.dbk:821

 msgid "Unfuzzy complete translations when correcting typos and spelling"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Unfuzzy complete translations when correcting typos and spelling"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:817
+#: best-pkging-practices.dbk:823

 msgid ""
 "When the text of a debconf template is corrected and you are <emphasis role="
 "\"strong\">sure</emphasis> that the change does <emphasis role=\"strong"
 msgid ""
 "When the text of a debconf template is corrected and you are <emphasis role="
 "\"strong\">sure</emphasis> that the change does <emphasis role=\"strong"


@@ -1333,14 +1343,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:823
+#: best-pkging-practices.dbk:829

 msgid ""
 "If you don't do so, the whole template will not be translated as long as a "
 "translator will send you an update."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgid ""
 "If you don't do so, the whole template will not be translated as long as a "
 "translator will send you an update."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:827
+#: best-pkging-practices.dbk:833

 msgid ""
 "To <emphasis>unfuzzy</emphasis> translations, you can use two methods. The "
 "first method does <emphasis>preventive</emphasis> search and replace actions "
 msgid ""
 "To <emphasis>unfuzzy</emphasis> translations, you can use two methods. The "
 "first method does <emphasis>preventive</emphasis> search and replace actions "


@@ -1349,12 +1359,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:833
+#: best-pkging-practices.dbk:839

 msgid "<emphasis>Preventive unfuzzy</emphasis> method:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgid "<emphasis>Preventive unfuzzy</emphasis> method:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:838
+#: best-pkging-practices.dbk:844

 msgid ""
 "Try finding a complete translation file <emphasis role=\"strong\"> before</"
 "emphasis> the change:"
 msgid ""
 "Try finding a complete translation file <emphasis role=\"strong\"> before</"
 "emphasis> the change:"


@@ -1362,7 +1372,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>

-#: best-pkging-practices.dbk:841 best-pkging-practices.dbk:911
+#: best-pkging-practices.dbk:847 best-pkging-practices.dbk:917

 #, no-wrap
 msgid ""
 "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null\n"
 #, no-wrap
 msgid ""
 "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null\n"


@@ -1370,7 +1380,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:844
+#: best-pkging-practices.dbk:850

 msgid ""
 "The file only showing <emphasis>translated</emphasis> items will be used as "
 "the reference file. If there is none (which should not happen if you take "
 msgid ""
 "The file only showing <emphasis>translated</emphasis> items will be used as "
 "the reference file. If there is none (which should not happen if you take "


@@ -1379,7 +1389,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:852
+#: best-pkging-practices.dbk:858

 msgid ""
 "Identify the needed change. In this example, let's assume the change is "
 "about fixing a typo in the word <literal>typo</literal> which was "
 msgid ""
 "Identify the needed change. In this example, let's assume the change is "
 "about fixing a typo in the word <literal>typo</literal> which was "


@@ -1388,7 +1398,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:860
+#: best-pkging-practices.dbk:866

 msgid ""
 "Check that this change is only applied to the place where you really intend "
 "to make it and <emphasis role=\"strong\">not</emphasis> in any other place "
 msgid ""
 "Check that this change is only applied to the place where you really intend "
 "to make it and <emphasis role=\"strong\">not</emphasis> in any other place "


@@ -1397,7 +1407,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:868
+#: best-pkging-practices.dbk:874

 msgid ""
 "Modify all PO files by using <command>sed</command>. The use of that command "
 "is recommended over any text editor to guarantee that the files encoding "
 msgid ""
 "Modify all PO files by using <command>sed</command>. The use of that command "
 "is recommended over any text editor to guarantee that the files encoding "


@@ -1406,7 +1416,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>

-#: best-pkging-practices.dbk:873
+#: best-pkging-practices.dbk:879

 #, fuzzy, no-wrap
 msgid ""
 "cd debian/po\n"
 #, fuzzy, no-wrap
 msgid ""
 "cd debian/po\n"


@@ -1417,36 +1427,36 @@ msgstr ""
 "for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 "for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:879
+#: best-pkging-practices.dbk:885

 msgid "Change the debconf template file to fix the typo."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgid "Change the debconf template file to fix the typo."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:884
+#: best-pkging-practices.dbk:890

 msgid "Run <command>debconf-updatepo</command>"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgid "Run <command>debconf-updatepo</command>"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:889
+#: best-pkging-practices.dbk:895

 msgid ""
 "Check the <filename>foo.po</filename> reference file. Its statistics should "
 "not be changed:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 msgid ""
 "Check the <filename>foo.po</filename> reference file. Its statistics should "
 "not be changed:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>

-#: best-pkging-practices.dbk:893
+#: best-pkging-practices.dbk:899

 #, no-wrap
 msgid "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 #, no-wrap
 msgid "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:902
+#: best-pkging-practices.dbk:908

 msgid "Gettext utilities method:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgid "Gettext utilities method:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:907
+#: best-pkging-practices.dbk:913

 msgid ""
 "Put all incomplete PO files out of the way.  You can check the completeness "
 "by using (needs the <systemitem role=\"package\">gettext</systemitem> "
 msgid ""
 "Put all incomplete PO files out of the way.  You can check the completeness "
 "by using (needs the <systemitem role=\"package\">gettext</systemitem> "


@@ -1455,7 +1465,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:916
+#: best-pkging-practices.dbk:922

 msgid ""
 "move all files which report either fuzzy strings to a temporary place.  "
 "Files which report no fuzzy strings (only translated and untranslated) will "
 msgid ""
 "move all files which report either fuzzy strings to a temporary place.  "
 "Files which report no fuzzy strings (only translated and untranslated) will "


@@ -1464,7 +1474,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:923
+#: best-pkging-practices.dbk:929

 msgid ""
 "now <emphasis role=\"strong\">and now only</emphasis>, modify the template "
 "for the typos and check again that translation are not impacted (typos, "
 msgid ""
 "now <emphasis role=\"strong\">and now only</emphasis>, modify the template "
 "for the typos and check again that translation are not impacted (typos, "


@@ -1473,7 +1483,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:930
+#: best-pkging-practices.dbk:936

 msgid ""
 "run <command>debconf-updatepo</command>.  This will fuzzy all strings you "
 "modified in translations.  You can see this by running the above again"
 msgid ""
 "run <command>debconf-updatepo</command>.  This will fuzzy all strings you "
 "modified in translations.  You can see this by running the above again"


@@ -1481,38 +1491,38 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:936
+#: best-pkging-practices.dbk:942

 msgid "use the following command:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 msgid "use the following command:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>

-#: best-pkging-practices.dbk:938
+#: best-pkging-practices.dbk:944

 #, no-wrap
 msgid "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #, no-wrap
 msgid "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:942
+#: best-pkging-practices.dbk:948

 msgid ""
 "move back to debian/po the files which showed fuzzy strings in the first step"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgid ""
 "move back to debian/po the files which showed fuzzy strings in the first step"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:947
+#: best-pkging-practices.dbk:953

 msgid "run <command>debconf-updatepo</command> again"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 msgid "run <command>debconf-updatepo</command> again"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:954
+#: best-pkging-practices.dbk:960

 msgid "Do not make assumptions about interfaces"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Do not make assumptions about interfaces"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:956
+#: best-pkging-practices.dbk:962

 msgid ""
 "Templates text should not make reference to widgets belonging to some "
 "debconf interfaces.  Sentences like <emphasis>If you answer Yes...</"
 msgid ""
 "Templates text should not make reference to widgets belonging to some "
 "debconf interfaces.  Sentences like <emphasis>If you answer Yes...</"


@@ -1522,7 +1532,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:961
+#: best-pkging-practices.dbk:967

 msgid ""
 "String templates should also avoid mentioning the default values in their "
 "description.  First, because this is redundant with the values seen by the "
 msgid ""
 "String templates should also avoid mentioning the default values in their "
 "description.  First, because this is redundant with the values seen by the "


@@ -1532,7 +1542,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:967
+#: best-pkging-practices.dbk:973

 msgid ""
 "More generally speaking, try to avoid referring to user actions.  Just give "
 "facts."
 msgid ""
 "More generally speaking, try to avoid referring to user actions.  Just give "
 "facts."


@@ -1540,12 +1550,12 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:973
+#: best-pkging-practices.dbk:979

 msgid "Do not use first person"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Do not use first person"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:975
+#: best-pkging-practices.dbk:981

 msgid ""
 "You should avoid the use of first person (<emphasis>I will do this...</"
 "emphasis> or <emphasis>We recommend...</emphasis>).  The computer is not a "
 msgid ""
 "You should avoid the use of first person (<emphasis>I will do this...</"
 "emphasis> or <emphasis>We recommend...</emphasis>).  The computer is not a "


@@ -1559,13 +1569,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:985
+#: best-pkging-practices.dbk:991

 msgid "Be gender neutral"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Be gender neutral"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:987
+#: best-pkging-practices.dbk:993

 msgid ""
 "The world is made of men and women.  Please use gender-neutral constructions "
 "in your writing."
 msgid ""
 "The world is made of men and women.  Please use gender-neutral constructions "
 "in your writing."


@@ -1573,13 +1583,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:995
+#: best-pkging-practices.dbk:1001

 msgid "Templates fields definition"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Templates fields definition"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:997
+#: best-pkging-practices.dbk:1003

 msgid ""
 "This part gives some information which is mostly taken from the "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> <manvolnum>7</"
 msgid ""
 "This part gives some information which is mostly taken from the "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> <manvolnum>7</"


@@ -1588,32 +1598,32 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1002
+#: best-pkging-practices.dbk:1008

 msgid "Type"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 msgid "Type"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1004
+#: best-pkging-practices.dbk:1010

 msgid "string:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "string:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1006
+#: best-pkging-practices.dbk:1012

 msgid ""
 "Results in a free-form input field that the user can type any string into."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 msgid ""
 "Results in a free-form input field that the user can type any string into."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1011
+#: best-pkging-practices.dbk:1017

 msgid "password:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "password:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1013
+#: best-pkging-practices.dbk:1019

 msgid ""
 "Prompts the user for a password.  Use this with caution; be aware that the "
 "password the user enters will be written to debconf's database.  You should "
 msgid ""
 "Prompts the user for a password.  Use this with caution; be aware that the "
 "password the user enters will be written to debconf's database.  You should "


@@ -1622,13 +1632,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1020
+#: best-pkging-practices.dbk:1026

 msgid "boolean:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "boolean:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1022
+#: best-pkging-practices.dbk:1028

 msgid ""
 "A true/false choice.  Remember: true/false, <emphasis role=\"strong\">not "
 "yes/no</emphasis>..."
 msgid ""
 "A true/false choice.  Remember: true/false, <emphasis role=\"strong\">not "
 "yes/no</emphasis>..."


@@ -1636,12 +1646,12 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1028
+#: best-pkging-practices.dbk:1034

 msgid "select:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "select:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1030
+#: best-pkging-practices.dbk:1036

 msgid ""
 "A choice between one of a number of values.  The choices must be specified "
 "in a field named 'Choices'.  Separate the possible values with commas and "
 msgid ""
 "A choice between one of a number of values.  The choices must be specified "
 "in a field named 'Choices'.  Separate the possible values with commas and "


@@ -1649,7 +1659,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1035
+#: best-pkging-practices.dbk:1041

 msgid ""
 "If choices are translatable strings, the 'Choices' field may be marked as "
 "translatable by using <literal>__Choices</literal>. The double underscore "
 msgid ""
 "If choices are translatable strings, the 'Choices' field may be marked as "
 "translatable by using <literal>__Choices</literal>. The double underscore "


@@ -1657,7 +1667,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1040
+#: best-pkging-practices.dbk:1046

 msgid ""
 "The <command>po-debconf</command> system also offers interesting "
 "possibilities to only mark <emphasis role=\"strong\">some</emphasis> choices "
 msgid ""
 "The <command>po-debconf</command> system also offers interesting "
 "possibilities to only mark <emphasis role=\"strong\">some</emphasis> choices "


@@ -1665,7 +1675,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><programlisting>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><programlisting>

-#: best-pkging-practices.dbk:1045
+#: best-pkging-practices.dbk:1051

 #, no-wrap
 msgid ""
 "Template: foo/bar\n"
 #, no-wrap
 msgid ""
 "Template: foo/bar\n"


@@ -1677,7 +1687,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1053
+#: best-pkging-practices.dbk:1059

 msgid ""
 "In that example, only the 'Other' string is translatable while others are "
 "acronyms that should not be translated. The above allows only 'Other' to be "
 msgid ""
 "In that example, only the 'Other' string is translatable while others are "
 "acronyms that should not be translated. The above allows only 'Other' to be "


@@ -1685,7 +1695,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1058
+#: best-pkging-practices.dbk:1064

 msgid ""
 "The debconf templates flag system offers many such possibilities. The "
 "<citerefentry> <refentrytitle>po-debconf</refentrytitle> <manvolnum>7</"
 msgid ""
 "The debconf templates flag system offers many such possibilities. The "
 "<citerefentry> <refentrytitle>po-debconf</refentrytitle> <manvolnum>7</"


@@ -1694,13 +1704,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1066
+#: best-pkging-practices.dbk:1072

 msgid "multiselect:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "multiselect:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1068
+#: best-pkging-practices.dbk:1074

 msgid ""
 "Like the select data type, except the user can choose any number of items "
 "from the choices list (or chose none of them)."
 msgid ""
 "Like the select data type, except the user can choose any number of items "
 "from the choices list (or chose none of them)."


@@ -1708,13 +1718,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1074
+#: best-pkging-practices.dbk:1080

 msgid "note:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "note:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1076
+#: best-pkging-practices.dbk:1082

 msgid ""
 "Rather than being a question per se, this datatype indicates a note that can "
 "be displayed to the user.  It should be used only for important notes that "
 msgid ""
 "Rather than being a question per se, this datatype indicates a note that can "
 "be displayed to the user.  It should be used only for important notes that "


@@ -1725,25 +1735,25 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1085
+#: best-pkging-practices.dbk:1091

 msgid "text:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "text:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1087
+#: best-pkging-practices.dbk:1093

 msgid "This type is now considered obsolete: don't use it."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 msgid "This type is now considered obsolete: don't use it."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1092
+#: best-pkging-practices.dbk:1098

 msgid "error:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 msgid "error:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1094
+#: best-pkging-practices.dbk:1100

 msgid ""
 "This type is designed to handle error messages.  It is mostly similar to the "
 "note type.  Frontends may present it differently (for instance, the dialog "
 msgid ""
 "This type is designed to handle error messages.  It is mostly similar to the "
 "note type.  Frontends may present it differently (for instance, the dialog "


@@ -1752,7 +1762,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><section><para>

-#: best-pkging-practices.dbk:1099
+#: best-pkging-practices.dbk:1105

 msgid ""
 "It is recommended to use this type for any message that needs user attention "
 "for a correction of any kind."
 msgid ""
 "It is recommended to use this type for any message that needs user attention "
 "for a correction of any kind."


@@ -1760,13 +1770,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1107
+#: best-pkging-practices.dbk:1113

 msgid "Description: short and extended description"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Description: short and extended description"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1109
+#: best-pkging-practices.dbk:1115

 msgid ""
 "Template descriptions have two parts: short and extended.  The short "
 "description is in the Description: line of the template."
 msgid ""
 "Template descriptions have two parts: short and extended.  The short "
 "description is in the Description: line of the template."


@@ -1774,7 +1784,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1113
+#: best-pkging-practices.dbk:1119

 msgid ""
 "The short description should be kept short (50 characters or so) so that it "
 "may be accomodated by most debconf interfaces.  Keeping it short also helps "
 msgid ""
 "The short description should be kept short (50 characters or so) so that it "
 "may be accomodated by most debconf interfaces.  Keeping it short also helps "


@@ -1784,7 +1794,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1119
+#: best-pkging-practices.dbk:1125

 msgid ""
 "The short description should be able to stand on its own.  Some interfaces "
 "do not show the long description by default, or only if the user explicitely "
 msgid ""
 "The short description should be able to stand on its own.  Some interfaces "
 "do not show the long description by default, or only if the user explicitely "


@@ -1794,7 +1804,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1125
+#: best-pkging-practices.dbk:1131

 msgid ""
 "The short description does not necessarily have to be a full sentence.  This "
 "is part of the keep it short and efficient recommendation."
 msgid ""
 "The short description does not necessarily have to be a full sentence.  This "
 "is part of the keep it short and efficient recommendation."


@@ -1802,7 +1812,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1129
+#: best-pkging-practices.dbk:1135

 msgid ""
 "The extended description should not repeat the short description word for "
 "word.  If you can't think up a long description, then first, think some "
 msgid ""
 "The extended description should not repeat the short description word for "
 "word.  If you can't think up a long description, then first, think some "


@@ -1813,7 +1823,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1136
+#: best-pkging-practices.dbk:1142

 msgid ""
 "The extended description should use complete sentences.  Paragraphs should "
 "be kept short for improved readability.  Do not mix two ideas in the same "
 msgid ""
 "The extended description should use complete sentences.  Paragraphs should "
 "be kept short for improved readability.  Do not mix two ideas in the same "


@@ -1822,7 +1832,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1141
+#: best-pkging-practices.dbk:1147

 msgid ""
 "Don't be too verbose.  User tend to ignore too long screens.  20 lines are "
 "by experience a border you shouldn't cross, because that means that in the "
 msgid ""
 "Don't be too verbose.  User tend to ignore too long screens.  20 lines are "
 "by experience a border you shouldn't cross, because that means that in the "


@@ -1832,7 +1842,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1147
+#: best-pkging-practices.dbk:1153

 msgid ""
 "The extended description should <emphasis role=\"strong\">never</emphasis> "
 "include a question."
 msgid ""
 "The extended description should <emphasis role=\"strong\">never</emphasis> "
 "include a question."


@@ -1840,7 +1850,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1151
+#: best-pkging-practices.dbk:1157

 msgid ""
 "For specific rules depending on templates type (string, boolean, etc.), "
 "please read below."
 msgid ""
 "For specific rules depending on templates type (string, boolean, etc.), "
 "please read below."


@@ -1848,13 +1858,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1157
+#: best-pkging-practices.dbk:1163

 msgid "Choices"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Choices"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1159
+#: best-pkging-practices.dbk:1165

 msgid ""
 "This field should be used for Select and Multiselect types.  It contains the "
 "possible choices which will be presented to users.  These choices should be "
 msgid ""
 "This field should be used for Select and Multiselect types.  It contains the "
 "possible choices which will be presented to users.  These choices should be "


@@ -1863,13 +1873,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1166
+#: best-pkging-practices.dbk:1172

 msgid "Default"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Default"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1168
+#: best-pkging-practices.dbk:1174

 msgid ""
 "This field is optional.  It contains the default answer for string, select "
 "and multiselect templates.  For multiselect templates, it may contain a "
 msgid ""
 "This field is optional.  It contains the default answer for string, select "
 "and multiselect templates.  For multiselect templates, it may contain a "


@@ -1878,19 +1888,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1177
+#: best-pkging-practices.dbk:1183

 msgid "Templates fields specific style guide"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 msgid "Templates fields specific style guide"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1179
+#: best-pkging-practices.dbk:1185

 msgid "Type field"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Type field"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1181
+#: best-pkging-practices.dbk:1187

 msgid ""
 "No specific indication except: use the appropriate type by referring to the "
 "previous section."
 msgid ""
 "No specific indication except: use the appropriate type by referring to the "
 "previous section."


@@ -1898,13 +1908,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1187
+#: best-pkging-practices.dbk:1193

 msgid "Description field"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Description field"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1189
+#: best-pkging-practices.dbk:1195

 msgid ""
 "Below are specific instructions for properly writing the Description (short "
 "and extended) depending on the template type."
 msgid ""
 "Below are specific instructions for properly writing the Description (short "
 "and extended) depending on the template type."


@@ -1912,13 +1922,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1193
+#: best-pkging-practices.dbk:1199

 msgid "String/password templates"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 msgid "String/password templates"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1197
+#: best-pkging-practices.dbk:1203

 msgid ""
 "The short description is a prompt and <emphasis role=\"strong\">not</"
 "emphasis> a title.  Avoid question style prompts (IP Address?) in favour of "
 msgid ""
 "The short description is a prompt and <emphasis role=\"strong\">not</"
 "emphasis> a title.  Avoid question style prompts (IP Address?) in favour of "


@@ -1927,7 +1937,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1204
+#: best-pkging-practices.dbk:1210

 msgid ""
 "The extended description is a complement to the short description.  In the "
 "extended part, explain what is being asked, rather than ask the same "
 msgid ""
 "The extended description is a complement to the short description.  In the "
 "extended part, explain what is being asked, rather than ask the same "


@@ -1937,13 +1947,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1214
+#: best-pkging-practices.dbk:1220

 msgid "Boolean templates"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 msgid "Boolean templates"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1218
+#: best-pkging-practices.dbk:1224

 msgid ""
 "The short description should be phrased in the form of a question which "
 "should be kept short and should generally end with a question mark.  Terse "
 msgid ""
 "The short description should be phrased in the form of a question which "
 "should be kept short and should generally end with a question mark.  Terse "


@@ -1953,7 +1963,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1226
+#: best-pkging-practices.dbk:1232

 msgid ""
 "Again, please avoid referring to specific interface widgets.  A common "
 "mistake for such templates is if you answer Yes-type constructions."
 msgid ""
 "Again, please avoid referring to specific interface widgets.  A common "
 "mistake for such templates is if you answer Yes-type constructions."


@@ -1961,13 +1971,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1234
+#: best-pkging-practices.dbk:1240

 msgid "Select/Multiselect"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 msgid "Select/Multiselect"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1238
+#: best-pkging-practices.dbk:1244

 msgid ""
 "The short description is a prompt and <emphasis role=\"strong\">not</"
 "emphasis> a title.  Do <emphasis role=\"strong\">not</emphasis> use useless "
 msgid ""
 "The short description is a prompt and <emphasis role=\"strong\">not</"
 "emphasis> a title.  Do <emphasis role=\"strong\">not</emphasis> use useless "


@@ -1977,7 +1987,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1246
+#: best-pkging-practices.dbk:1252

 msgid ""
 "The extended description will complete the short description.  It may refer "
 "to the available choices.  It may also mention that the user may choose more "
 msgid ""
 "The extended description will complete the short description.  It may refer "
 "to the available choices.  It may also mention that the user may choose more "


@@ -1987,19 +1997,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1256
+#: best-pkging-practices.dbk:1262

 msgid "Notes"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 msgid "Notes"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1260
+#: best-pkging-practices.dbk:1266

 msgid "The short description should be considered to be a *title*."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 msgid "The short description should be considered to be a *title*."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1265
+#: best-pkging-practices.dbk:1271

 msgid ""
 "The extended description is what will be displayed as a more detailed "
 "explanation of the note.  Phrases, no terse writing style."
 msgid ""
 "The extended description is what will be displayed as a more detailed "
 "explanation of the note.  Phrases, no terse writing style."


@@ -2007,7 +2017,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1271
+#: best-pkging-practices.dbk:1277

 msgid ""
 "<emphasis role=\"strong\">Do not abuse debconf.</emphasis> Notes are the "
 "most common way to abuse debconf.  As written in debconf-devel manual page: "
 msgid ""
 "<emphasis role=\"strong\">Do not abuse debconf.</emphasis> Notes are the "
 "most common way to abuse debconf.  As written in debconf-devel manual page: "


@@ -2020,13 +2030,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1286
+#: best-pkging-practices.dbk:1292

 msgid "Choices field"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Choices field"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1288
+#: best-pkging-practices.dbk:1294

 msgid ""
 "If the Choices are likely to change often, please consider using the "
 "__Choices trick.  This will split each individual choice into a single "
 msgid ""
 "If the Choices are likely to change often, please consider using the "
 "__Choices trick.  This will split each individual choice into a single "


@@ -2035,13 +2045,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1295 best-pkging-practices.dbk:1333
+#: best-pkging-practices.dbk:1301 best-pkging-practices.dbk:1339

 msgid "Default field"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Default field"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1297
+#: best-pkging-practices.dbk:1303

 msgid ""
 "If the default value, for a select template, is likely to vary depending on "
 "the user language (for instance, if the choice is a language choice), please "
 msgid ""
 "If the default value, for a select template, is likely to vary depending on "
 "the user language (for instance, if the choice is a language choice), please "


@@ -2049,7 +2059,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1302
+#: best-pkging-practices.dbk:1308

 msgid ""
 "This special field allow translators to put the most appropriate choice "
 "according to their own language.  It will become the default choice when "
 msgid ""
 "This special field allow translators to put the most appropriate choice "
 "according to their own language.  It will become the default choice when "


@@ -2059,12 +2069,12 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1308
+#: best-pkging-practices.dbk:1314

 msgid "Example, taken from the geneweb package templates:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><screen>
 msgid "Example, taken from the geneweb package templates:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><screen>

-#: best-pkging-practices.dbk:1311
+#: best-pkging-practices.dbk:1317

 #, no-wrap
 msgid ""
 "Template: geneweb/lang\n"
 #, no-wrap
 msgid ""
 "Template: geneweb/lang\n"


@@ -2080,7 +2090,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1322
+#: best-pkging-practices.dbk:1328

 msgid ""
 "Note the use of brackets which allow internal comments in debconf fields.  "
 "Also note the use of comments which will show up in files the translators "
 msgid ""
 "Note the use of brackets which allow internal comments in debconf fields.  "
 "Also note the use of comments which will show up in files the translators "


@@ -2089,7 +2099,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1327
+#: best-pkging-practices.dbk:1333

 msgid ""
 "The comments are needed as the DefaultChoice trick is a bit confusing: the "
 "translators may put their own choice"
 msgid ""
 "The comments are needed as the DefaultChoice trick is a bit confusing: the "
 "translators may put their own choice"


@@ -2097,7 +2107,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1335
+#: best-pkging-practices.dbk:1341

 msgid ""
 "Do NOT use empty default field.  If you don't want to use default values, do "
 "not use Default at all."
 msgid ""
 "Do NOT use empty default field.  If you don't want to use default values, do "
 "not use Default at all."


@@ -2105,7 +2115,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1339
+#: best-pkging-practices.dbk:1345

 msgid ""
 "If you use po-debconf (and you <emphasis role=\"strong\">should</emphasis>, "
 "see 2.2), consider making this field translatable, if you think it may be "
 msgid ""
 "If you use po-debconf (and you <emphasis role=\"strong\">should</emphasis>, "
 "see 2.2), consider making this field translatable, if you think it may be "


@@ -2114,7 +2124,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1344
+#: best-pkging-practices.dbk:1350

 msgid ""
 "If the default value may vary depending on language/country (for instance "
 "the default value for a language choice), consider using the special "
 msgid ""
 "If the default value may vary depending on language/country (for instance "
 "the default value for a language choice), consider using the special "


@@ -2124,19 +2134,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: best-pkging-practices.dbk:1356
+#: best-pkging-practices.dbk:1362

 msgid "Internationalization"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgid "Internationalization"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1358
+#: best-pkging-practices.dbk:1364

 msgid "Handling debconf translations"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Handling debconf translations"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1360
+#: best-pkging-practices.dbk:1366

 msgid ""
 "Like porters, translators have a difficult task.  They work on many packages "
 "and must collaborate with many different maintainers.  Moreover, most of the "
 msgid ""
 "Like porters, translators have a difficult task.  They work on many packages "
 "and must collaborate with many different maintainers.  Moreover, most of the "


@@ -2146,7 +2156,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1366
+#: best-pkging-practices.dbk:1372

 msgid ""
 "The goal of <systemitem role=\"package\">debconf</systemitem> was to make "
 "packages configuration easier for maintainers and for users.  Originally, "
 msgid ""
 "The goal of <systemitem role=\"package\">debconf</systemitem> was to make "
 "packages configuration easier for maintainers and for users.  Originally, "


@@ -2160,7 +2170,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1376
+#: best-pkging-practices.dbk:1382

 msgid ""
 "Using <systemitem role=\"package\">po-debconf</systemitem>, the translation "
 "is stored in <filename>po</filename> files (drawing from <command>gettext</"
 msgid ""
 "Using <systemitem role=\"package\">po-debconf</systemitem>, the translation "
 "is stored in <filename>po</filename> files (drawing from <command>gettext</"


@@ -2177,13 +2187,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1392
+#: best-pkging-practices.dbk:1398

 msgid "Internationalized documentation"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Internationalized documentation"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1394
+#: best-pkging-practices.dbk:1400

 msgid ""
 "Internationalizing documentation is crucial for users, but a lot of labor.  "
 "There's no way to eliminate all that work, but you can make things easier "
 msgid ""
 "Internationalizing documentation is crucial for users, but a lot of labor.  "
 "There's no way to eliminate all that work, but you can make things easier "


@@ -2192,7 +2202,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1399
+#: best-pkging-practices.dbk:1405

 msgid ""
 "If you maintain documentation of any size, its easier for translators if "
 "they have access to a source control system.  That lets translators see the "
 msgid ""
 "If you maintain documentation of any size, its easier for translators if "
 "they have access to a source control system.  That lets translators see the "


@@ -2210,7 +2220,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1413
+#: best-pkging-practices.dbk:1419

 msgid ""
 "If you maintain XML or SGML documentation, we suggest that you isolate any "
 "language-independent information and define those as entities in a separate "
 msgid ""
 "If you maintain XML or SGML documentation, we suggest that you isolate any "
 "language-independent information and define those as entities in a separate "


@@ -2220,19 +2230,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: best-pkging-practices.dbk:1423
+#: best-pkging-practices.dbk:1429

 msgid "Common packaging situations"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgid "Common packaging situations"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1434
+#: best-pkging-practices.dbk:1440

 msgid "Packages using <command>autoconf</command>/<command>automake</command>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Packages using <command>autoconf</command>/<command>automake</command>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1436
+#: best-pkging-practices.dbk:1442

 msgid ""
 "Keeping <command>autoconf</command>'s <filename>config.sub</filename> and "
 "<filename>config.guess</filename> files up to date is critical for porters, "
 msgid ""
 "Keeping <command>autoconf</command>'s <filename>config.sub</filename> and "
 "<filename>config.guess</filename> files up to date is critical for porters, "


@@ -2246,13 +2256,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1448
+#: best-pkging-practices.dbk:1454

 msgid "Libraries"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Libraries"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1450
+#: best-pkging-practices.dbk:1456

 msgid ""
 "Libraries are always difficult to package for various reasons.  The policy "
 "imposes many constraints to ease their maintenance and to make sure upgrades "
 msgid ""
 "Libraries are always difficult to package for various reasons.  The policy "
 "imposes many constraints to ease their maintenance and to make sure upgrades "


@@ -2262,7 +2272,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1456
+#: best-pkging-practices.dbk:1462

 msgid ""
 "Good practices for library packaging have been grouped in <ulink url=\"&url-"
 "libpkg-guide;\">the library packaging guide</ulink>."
 msgid ""
 "Good practices for library packaging have been grouped in <ulink url=\"&url-"
 "libpkg-guide;\">the library packaging guide</ulink>."


@@ -2270,13 +2280,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1463
+#: best-pkging-practices.dbk:1469

 msgid "Documentation"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Documentation"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1465
+#: best-pkging-practices.dbk:1471

 msgid ""
 "Be sure to follow the <ulink url=\"&url-debian-policy;ch-docs.html\">Policy "
 "on documentation</ulink>."
 msgid ""
 "Be sure to follow the <ulink url=\"&url-debian-policy;ch-docs.html\">Policy "
 "on documentation</ulink>."


@@ -2284,7 +2294,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1470
+#: best-pkging-practices.dbk:1476

 msgid ""
 "If your package contains documentation built from XML or SGML, we recommend "
 "you not ship the XML or SGML source in the binary package(s).  If users want "
 msgid ""
 "If your package contains documentation built from XML or SGML, we recommend "
 "you not ship the XML or SGML source in the binary package(s).  If users want "


@@ -2293,7 +2303,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1475
+#: best-pkging-practices.dbk:1481

 msgid ""
 "Policy specifies that documentation should be shipped in HTML format.  We "
 "also recommend shipping documentation in PDF and plain text format if "
 msgid ""
 "Policy specifies that documentation should be shipped in HTML format.  We "
 "also recommend shipping documentation in PDF and plain text format if "


@@ -2304,22 +2314,42 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1482
+#: best-pkging-practices.dbk:1488

 msgid ""
 "Major shipped manuals should register themselves with <systemitem role="
 "\"package\">doc-base</systemitem> on installation.  See the <systemitem role="
 "\"package\">doc-base</systemitem> package documentation for more information."
 msgstr ""
 
 msgid ""
 "Major shipped manuals should register themselves with <systemitem role="
 "\"package\">doc-base</systemitem> on installation.  See the <systemitem role="
 "\"package\">doc-base</systemitem> package documentation for more information."
 msgstr ""
 

+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1494
+msgid ""
+"Debian policy (section 12.1) directs that manual pages should accompany "
+"every program, utility, and function, and suggests them for other objects "
+"like configuration files. If the work you are packaging does not have such "
+"manual pages, consider writing them for inclusion in your package, and "
+"submitting them upstream."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1501
+msgid ""
+"The manpages do not need to be written directly in the troff format.  "
+"Popular source formats are Docbook, POD and reST, which can be converted "
+"using <command>xsltproc</command>, <command>pod2man</command> and "
+"<command>rst2man</command> respectively. To a lesser extent, the <command> "
+"help2man</command>program can also be used to write a stub."
+msgstr ""
+

 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1490
+#: best-pkging-practices.dbk:1510

 msgid "Specific types of packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Specific types of packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1492
+#: best-pkging-practices.dbk:1512

 msgid ""
 "Several specific types of packages have special sub-policies and "
 "corresponding packaging rules and practices:"
 msgid ""
 "Several specific types of packages have special sub-policies and "
 "corresponding packaging rules and practices:"


@@ -2327,7 +2357,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1498
+#: best-pkging-practices.dbk:1518

 msgid ""
 "Perl related packages have a <ulink url=\"&url-perl-policy;\">Perl policy</"
 "ulink>, some examples of packages following that policy are <systemitem role="
 msgid ""
 "Perl related packages have a <ulink url=\"&url-perl-policy;\">Perl policy</"
 "ulink>, some examples of packages following that policy are <systemitem role="


@@ -2337,7 +2367,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1507
+#: best-pkging-practices.dbk:1527

 msgid ""
 "Python related packages have their python policy; see &file-python-policy; "
 "in the <systemitem role=\"package\">python</systemitem> package."
 msgid ""
 "Python related packages have their python policy; see &file-python-policy; "
 "in the <systemitem role=\"package\">python</systemitem> package."


@@ -2345,7 +2375,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1514
+#: best-pkging-practices.dbk:1534

 msgid ""
 "Emacs related packages have the <ulink url=\"&url-emacs-policy;\">emacs "
 "policy</ulink>."
 msgid ""
 "Emacs related packages have the <ulink url=\"&url-emacs-policy;\">emacs "
 "policy</ulink>."


@@ -2353,7 +2383,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1521
+#: best-pkging-practices.dbk:1541

 msgid ""
 "Java related packages have their <ulink url=\"&url-java-policy;\">java "
 "policy</ulink>."
 msgid ""
 "Java related packages have their <ulink url=\"&url-java-policy;\">java "
 "policy</ulink>."


@@ -2361,7 +2391,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1528
+#: best-pkging-practices.dbk:1548

 msgid ""
 "Ocaml related packages have their own policy, found in &file-ocaml-policy; "
 "from the <systemitem role=\"package\">ocaml</systemitem> package.  A good "
 msgid ""
 "Ocaml related packages have their own policy, found in &file-ocaml-policy; "
 "from the <systemitem role=\"package\">ocaml</systemitem> package.  A good "


@@ -2371,7 +2401,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1536
+#: best-pkging-practices.dbk:1556

 msgid ""
 "Packages providing XML or SGML DTDs should conform to the recommendations "
 "found in the <systemitem role=\"package\">sgml-base-doc</systemitem> package."
 msgid ""
 "Packages providing XML or SGML DTDs should conform to the recommendations "
 "found in the <systemitem role=\"package\">sgml-base-doc</systemitem> package."


@@ -2379,7 +2409,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1542
+#: best-pkging-practices.dbk:1562

 msgid ""
 "Lisp packages should register themselves with <systemitem role=\"package"
 "\">common-lisp-controller</systemitem>, about which see &file-lisp-"
 msgid ""
 "Lisp packages should register themselves with <systemitem role=\"package"
 "\">common-lisp-controller</systemitem>, about which see &file-lisp-"


@@ -2388,13 +2418,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1572
+#: best-pkging-practices.dbk:1592

 msgid "Architecture-independent data"
 msgstr "アーキテクチャ非依存のデータ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Architecture-independent data"
 msgstr "アーキテクチャ非依存のデータ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1574
+#: best-pkging-practices.dbk:1594

 msgid ""
 "It is not uncommon to have a large amount of architecture-independent data "
 "packaged with a program.  For example, audio files, a collection of icons, "
 msgid ""
 "It is not uncommon to have a large amount of architecture-independent data "
 "packaged with a program.  For example, audio files, a collection of icons, "


@@ -2405,7 +2435,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1581
+#: best-pkging-practices.dbk:1601

 msgid ""
 "However, if the size of the data is considerable, consider splitting it out "
 "into a separate, architecture-independent package (_all.deb).  By doing "
 msgid ""
 "However, if the size of the data is considerable, consider splitting it out "
 "into a separate, architecture-independent package (_all.deb).  By doing "


@@ -2419,13 +2449,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1593
+#: best-pkging-practices.dbk:1613

 msgid "Needing a certain locale during build"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Needing a certain locale during build"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1595
+#: best-pkging-practices.dbk:1615

 msgid ""
 "If you need a certain locale during build, you can create a temporary file "
 "via this trick:"
 msgid ""
 "If you need a certain locale during build, you can create a temporary file "
 "via this trick:"


@@ -2433,7 +2463,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1599
+#: best-pkging-practices.dbk:1619

 msgid ""
 "If you set <varname>LOCPATH</varname> to the equivalent of <filename>/usr/"
 "lib/locale</filename>, and <varname>LC_ALL</varname> to the name of the "
 msgid ""
 "If you set <varname>LOCPATH</varname> to the equivalent of <filename>/usr/"
 "lib/locale</filename>, and <varname>LC_ALL</varname> to the name of the "


@@ -2443,7 +2473,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:1604
+#: best-pkging-practices.dbk:1624

 #, fuzzy, no-wrap
 msgid ""
 "LOCALE_PATH=debian/tmpdir/usr/lib/locale\n"
 #, fuzzy, no-wrap
 msgid ""
 "LOCALE_PATH=debian/tmpdir/usr/lib/locale\n"


@@ -2469,13 +2499,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1617
+#: best-pkging-practices.dbk:1637

 msgid "Make transition packages deborphan compliant"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Make transition packages deborphan compliant"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1619
+#: best-pkging-practices.dbk:1639

 msgid ""
 "Deborphan is a program for helping users to detect which packages can safely "
 "be removed from the system, i.e.  the ones that have no packages depending "
 msgid ""
 "Deborphan is a program for helping users to detect which packages can safely "
 "be removed from the system, i.e.  the ones that have no packages depending "


@@ -2486,7 +2516,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1626
+#: best-pkging-practices.dbk:1646

 msgid ""
 "For example, with <literal>--guess-dummy</literal>, <command>deborphan</"
 "command> tries to search all transitional packages which were needed for "
 msgid ""
 "For example, with <literal>--guess-dummy</literal>, <command>deborphan</"
 "command> tries to search all transitional packages which were needed for "


@@ -2496,7 +2526,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1633
+#: best-pkging-practices.dbk:1653

 msgid ""
 "So, when you are creating such a package, please make sure to add this text "
 "to your short description.  If you are looking for examples, just run: "
 msgid ""
 "So, when you are creating such a package, please make sure to add this text "
 "to your short description.  If you are looking for examples, just run: "


@@ -2506,13 +2536,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1641
+#: best-pkging-practices.dbk:1661

 msgid "Best practices for <filename>orig.tar.gz</filename> files"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Best practices for <filename>orig.tar.gz</filename> files"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1643
+#: best-pkging-practices.dbk:1663

 msgid ""
 "There are two kinds of original source tarballs: Pristine source and "
 "repackaged upstream source."
 msgid ""
 "There are two kinds of original source tarballs: Pristine source and "
 "repackaged upstream source."


@@ -2520,12 +2550,12 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1647
+#: best-pkging-practices.dbk:1667

 msgid "Pristine source"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para><footnote><para>
 msgid "Pristine source"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para><footnote><para>

-#: best-pkging-practices.dbk:1651
+#: best-pkging-practices.dbk:1671

 msgid ""
 "We cannot prevent upstream authors from changing the tarball they distribute "
 "without also incrementing the version number, so there can be no guarantee "
 msgid ""
 "We cannot prevent upstream authors from changing the tarball they distribute "
 "without also incrementing the version number, so there can be no guarantee "


@@ -2535,27 +2565,27 @@ msgid ""
 "emphasis> distribute.  If a difference arises later (say, if upstream "
 "notices that he wasn't using maximal compression in his original "
 "distribution and then re-<command>gzip</command>s it), that's just too bad.  "
 "emphasis> distribute.  If a difference arises later (say, if upstream "
 "notices that he wasn't using maximal compression in his original "
 "distribution and then re-<command>gzip</command>s it), that's just too bad.  "

-"Since there is no good way to upload a new <literal>.orig.tar.gz</literal> "
-"for the same version, there is not even any point in treating this situation "
-"as a bug."
+"Since there is no good way to upload a new <literal>.orig.tar.{gz,bz2}</"
+"literal> for the same version, there is not even any point in treating this "
+"situation as a bug."

 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1649
+#: best-pkging-practices.dbk:1669

 msgid ""
 "The defining characteristic of a pristine source tarball is that the "
 msgid ""
 "The defining characteristic of a pristine source tarball is that the "

-"<literal>.orig.tar.gz</literal> file is byte-for-byte identical to a tarball "
-"officially distributed by the upstream author.  <placeholder type=\"footnote"
-"\" id=\"0\"/> This makes it possible to use checksums to easily verify that "
-"all changes between Debian's version and upstream's are contained in the "
-"Debian diff.  Also, if the original source is huge, upstream authors and "
-"others who already have the upstream tarball can save download time if they "
-"want to inspect your packaging in detail."
+"<literal>.orig.tar.{gz,bz2}</literal> file is byte-for-byte identical to a "
+"tarball officially distributed by the upstream author.  <placeholder type="
+"\"footnote\" id=\"0\"/> This makes it possible to use checksums to easily "
+"verify that all changes between Debian's version and upstream's are "
+"contained in the Debian diff.  Also, if the original source is huge, "
+"upstream authors and others who already have the upstream tarball can save "
+"download time if they want to inspect your packaging in detail."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1669
+#: best-pkging-practices.dbk:1689

 msgid ""
 "There is no universally accepted guidelines that upstream authors follow "
 "regarding to the directory structure inside their tarball, but <command>dpkg-"
 msgid ""
 "There is no universally accepted guidelines that upstream authors follow "
 "regarding to the directory structure inside their tarball, but <command>dpkg-"


@@ -2565,13 +2595,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1677
+#: best-pkging-practices.dbk:1697

 msgid "It unpacks the tarball in an empty temporary directory by doing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
 msgid "It unpacks the tarball in an empty temporary directory by doing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>

-#: best-pkging-practices.dbk:1680
+#: best-pkging-practices.dbk:1700

 #, fuzzy, no-wrap
 msgid "zcat path/to/&lt;packagename&gt;_&lt;upstream-version&gt;.orig.tar.gz | tar xf -\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "zcat path/to/&lt;packagename&gt;_&lt;upstream-version&gt;.orig.tar.gz | tar xf -\n"
 msgstr ""


@@ -2580,7 +2610,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1685
+#: best-pkging-practices.dbk:1705

 msgid ""
 "If, after this, the temporary directory contains nothing but one directory "
 "and no other files, <command>dpkg-source</command> renames that directory to "
 msgid ""
 "If, after this, the temporary directory contains nothing but one directory "
 "and no other files, <command>dpkg-source</command> renames that directory to "


@@ -2591,7 +2621,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1694
+#: best-pkging-practices.dbk:1714

 msgid ""
 "Otherwise, the upstream tarball must have been packaged without a common top-"
 "level directory (shame on the upstream author!).  In this case, "
 msgid ""
 "Otherwise, the upstream tarball must have been packaged without a common top-"
 "level directory (shame on the upstream author!).  In this case, "


@@ -2602,13 +2632,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1705
+#: best-pkging-practices.dbk:1725

 msgid "Repackaged upstream source"
 msgstr "upstream のソースをパッケージしなおす"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Repackaged upstream source"
 msgstr "upstream のソースをパッケージしなおす"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1707
+#: best-pkging-practices.dbk:1727

 msgid ""
 "You <emphasis role=\"strong\">should</emphasis> upload packages with a "
 "pristine source tarball if possible, but there are various reasons why it "
 msgid ""
 "You <emphasis role=\"strong\">should</emphasis> upload packages with a "
 "pristine source tarball if possible, but there are various reasons why it "


@@ -2617,22 +2647,22 @@ msgid ""
 "free material that you must remove before uploading."
 msgstr ""
 
 "free material that you must remove before uploading."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>

 #. type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1714
+#: best-pkging-practices.dbk:1734

 msgid ""
 msgid ""

-"In these cases the developer must construct a suitable <literal>.orig.tar.gz "
-"</literal> file himself.  We refer to such a tarball as a repackaged "
-"upstream source.  Note that a repackaged upstream source is different from a "
-"Debian-native package.  A repackaged source still comes with Debian-specific "
-"changes in a separate <literal>.diff.gz</literal> and still has a version "
-"number composed of <literal>&lt;upstream-version&gt;</literal> and "
-"<literal>&lt;debian-revision&gt;</literal>."
+"In these cases the developer must construct a suitable <literal>.orig.tar."
+"{gz,bz2} </literal> file himself.  We refer to such a tarball as a "
+"repackaged upstream source.  Note that a repackaged upstream source is "
+"different from a Debian-native package.  A repackaged source still comes "
+"with Debian-specific changes in a separate <literal>.diff.gz</literal> or "
+"<literal>.debian.tar.{gz,bz2}</literal> and still has a version number "
+"composed of <literal>&lt;upstream-version&gt;</literal> and <literal>&lt;"
+"debian-revision&gt;</literal>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1723
+#: best-pkging-practices.dbk:1743

 msgid ""
 "There may be cases where it is desirable to repackage the source even though "
 "upstream distributes a <literal>.tar.gz</literal> that could in principle be "
 msgid ""
 "There may be cases where it is desirable to repackage the source even though "
 "upstream distributes a <literal>.tar.gz</literal> that could in principle be "


@@ -2643,27 +2673,25 @@ msgid ""
 "source that could have been pristine."
 msgstr ""
 
 "source that could have been pristine."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>

 #. type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1732
-msgid "A repackaged <literal>.orig.tar.gz</literal>"
+#: best-pkging-practices.dbk:1752
+msgid "A repackaged <literal>.orig.tar.{gz,bz2}</literal>"

 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1737
+#: best-pkging-practices.dbk:1757

 msgid ""
 msgid ""

-"<emphasis role=\"strong\">must</emphasis> be documented in the resulting "
-"source package.  Detailed information on how the repackaged source was "
-"obtained, and on how this can be reproduced must be provided in "
-"<filename>debian/copyright</filename>.  It is also a good idea to provide a "
-"<literal>get-orig-source</literal> target in your <filename>debian/rules</"
-"filename> file that repeats the process, as described in the Policy Manual, "
-"<ulink url=\"&url-debian-policy;ch-source.html#s-debianrules\">Main building "
-"script: debian/rules</ulink>."
+"should be documented in the resulting source package.  Detailed information "
+"on how the repackaged source was obtained, and on how this can be reproduced "
+"should be provided in <filename>debian/copyright</filename>.  It is also a "
+"good idea to provide a <literal>get-orig-source</literal> target in your "
+"<filename>debian/rules</filename> file that repeats the process, as "
+"described in the Policy Manual, <ulink url=\"&url-debian-policy;ch-source."
+"html#s-debianrules\">Main building script: debian/rules</ulink>."

 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para><footnote><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para><footnote><para>

-#: best-pkging-practices.dbk:1752
+#: best-pkging-practices.dbk:1772

 msgid ""
 "As a special exception, if the omission of non-free files would lead to the "
 "source failing to build without assistance from the Debian diff, it might be "
 msgid ""
 "As a special exception, if the omission of non-free files would lead to the "
 "source failing to build without assistance from the Debian diff, it might be "


@@ -2674,7 +2702,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1750
+#: best-pkging-practices.dbk:1770

 msgid ""
 "<emphasis role=\"strong\">should not</emphasis> contain any file that does "
 "not come from the upstream author(s), or whose contents has been changed by "
 msgid ""
 "<emphasis role=\"strong\">should not</emphasis> contain any file that does "
 "not come from the upstream author(s), or whose contents has been changed by "


@@ -2683,7 +2711,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1763
+#: best-pkging-practices.dbk:1783

 msgid ""
 "<emphasis role=\"strong\">should</emphasis>, except where impossible for "
 "legal reasons, preserve the entire building and portablility infrastructure "
 msgid ""
 "<emphasis role=\"strong\">should</emphasis>, except where impossible for "
 "legal reasons, preserve the entire building and portablility infrastructure "


@@ -2696,7 +2724,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1772
+#: best-pkging-practices.dbk:1792

 msgid ""
 "(<emphasis>Rationale:</emphasis> It is common for Debian users who need to "
 "build software for non-Debian platforms to fetch the source from a Debian "
 msgid ""
 "(<emphasis>Rationale:</emphasis> It is common for Debian users who need to "
 "build software for non-Debian platforms to fetch the source from a Debian "


@@ -2705,7 +2733,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1779
+#: best-pkging-practices.dbk:1799

 msgid ""
 "<emphasis role=\"strong\">should</emphasis> use <literal>&lt;packagename&gt;-"
 "&lt;upstream-version&gt;.orig</literal> as the name of the top-level "
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> use <literal>&lt;packagename&gt;-"
 "&lt;upstream-version&gt;.orig</literal> as the name of the top-level "


@@ -2713,83 +2741,41 @@ msgid ""
 "tarballs from repackaged ones."
 msgstr ""
 
 "tarballs from repackaged ones."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1787
-msgid ""
-"<emphasis role=\"strong\">should</emphasis> be gzipped with maximal "
-"compression."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para>
-#. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1792
-msgid ""
-"The canonical way to meet the latter two points is to let <literal>dpkg-"
-"source -b</literal> construct the repackaged tarball from an unpacked "
-"directory."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><title>
-#. type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1798
-msgid "Changing binary files in <literal>diff.gz</literal>"
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para><footnote><para>
-#. type: Content of: <chapter><section><section><section><para><footnote><para>

 #: best-pkging-practices.dbk:1807
 msgid ""
 #: best-pkging-practices.dbk:1807
 msgid ""

-"The file should have a name that makes it clear which binary file it "
-"encodes.  Usually, some postfix indicating the encoding should be appended "
-"to the original filename.  Note that you don't need to depend on <systemitem "
-"role=\"package\">sharutils</systemitem> to get the <command>uudecode</"
-"command> program if you use <command>perl</command>'s <literal>pack</"
-"literal> function.  The code could look like"
+"<emphasis role=\"strong\">should</emphasis> be gzipped or bzipped with "
+"maximal compression."

 msgstr ""
 
 msgstr ""
 

-#. type: Content of: <chapter><section><section><section><para><footnote>
-#: best-pkging-practices.dbk:1815
-msgid "&example-uu;"
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:1814
+msgid "Changing binary files"

 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1800
+#: best-pkging-practices.dbk:1816

 msgid ""
 "Sometimes it is necessary to change binary files contained in the original "
 msgid ""
 "Sometimes it is necessary to change binary files contained in the original "

-"tarball, or to add binary files that are not in it.  If this is done by "
-"simply copying the files into the debianized source tree, <command>dpkg-"
-"source</command> will not be able to handle this.  On the other hand, "
-"according to the guidelines given above, you cannot include such a changed "
-"binary file in a repackaged <filename>orig.tar.gz</filename>.  Instead, "
-"include the file in the <filename>debian</filename> directory in "
-"<command>uuencode</command>d (or similar) form <placeholder type=\"footnote"
-"\" id=\"0\"/>.  The file would then be decoded and copied to its place "
-"during the build process.  Thus the change will be visible quite easy."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para>
-#. type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1821
-msgid ""
-"Some packages use <command>dbs</command> to manage patches to their upstream "
-"source, and always create a new <literal>orig.tar.gz</literal> file that "
-"contains the real <literal>orig.tar.gz</literal> in its toplevel directory.  "
-"This is questionable with respect to the preference for pristine source.  On "
-"the other hand, it is easy to modify or add binary files in this case: Just "
-"put them into the newly created <literal>orig.tar.gz</literal> file, besides "
-"the real one, and copy them to the right place during the build process."
+"tarball, or to add binary files that are not in it. This is fully supported "
+"when using source packages in “3.0 (quilt)” format, see the "
+"<citerefentry><refentrytitle>dpkg-source</refentrytitle><manvolnum>1</"
+"manvolnum></citerefentry> manual page for details. When using the older "
+"format “1.0”, binary files can't be stored in the <filename>.diff.gz</"
+"filename> so you must store an <command>uuencode</command>d (or similar) "
+"version of the file(s)  and decode it at build time in <filename>debian/"
+"rules</filename> (and move it in its official location)."

 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1834
+#: best-pkging-practices.dbk:1831

 msgid "Best practices for debug packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Best practices for debug packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1836
+#: best-pkging-practices.dbk:1833

 msgid ""
 "A debug package is a package with a name ending in -dbg, that contains "
 "additional information that gdb can use.  Since Debian binaries are stripped "
 msgid ""
 "A debug package is a package with a name ending in -dbg, that contains "
 "additional information that gdb can use.  Since Debian binaries are stripped "


@@ -2801,7 +2787,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1844
+#: best-pkging-practices.dbk:1841

 msgid ""
 "It is up to a package's maintainer whether to create a debug package or "
 "not.  Maintainers are encouraged to create debug packages for library "
 msgid ""
 "It is up to a package's maintainer whether to create a debug package or "
 "not.  Maintainers are encouraged to create debug packages for library "


@@ -2815,7 +2801,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1854
+#: best-pkging-practices.dbk:1851

 msgid ""
 "Some debug packages may contain an entire special debugging build of a "
 "library or other binary, but most of them can save space and build time by "
 msgid ""
 "Some debug packages may contain an entire special debugging build of a "
 "library or other binary, but most of them can save space and build time by "


@@ -2831,7 +2817,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1866
+#: best-pkging-practices.dbk:1863

 msgid ""
 "The debugging symbols can be extracted from an object file using <command> "
 "objcopy --only-keep-debug</command>.  Then the object file can be stripped, "
 msgid ""
 "The debugging symbols can be extracted from an object file using <command> "
 "objcopy --only-keep-debug</command>.  Then the object file can be stripped, "


@@ -2843,7 +2829,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1874
+#: best-pkging-practices.dbk:1871

 msgid ""
 "The <command>dh_strip</command> command in debhelper supports creating debug "
 "packages, and can take care of using <command>objcopy</command> to separate "
 msgid ""
 "The <command>dh_strip</command> command in debhelper supports creating debug "
 "packages, and can take care of using <command>objcopy</command> to separate "


@@ -2853,7 +2839,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1881
+#: best-pkging-practices.dbk:1878

 msgid ""
 "Note that the debug package should depend on the package that it provides "
 "debugging symbols for, and this dependency should be versioned.  For example:"
 msgid ""
 "Note that the debug package should depend on the package that it provides "
 "debugging symbols for, and this dependency should be versioned.  For example:"


@@ -2861,7 +2847,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:1885
+#: best-pkging-practices.dbk:1882

 #, fuzzy, no-wrap
 msgid "Depends: libfoo (= ${binary:Version})\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "Depends: libfoo (= ${binary:Version})\n"
 msgstr ""

diff --git a/po4a/ja/beyond-pkging.po b/po4a/ja/beyond-pkging.po
index 17e244038461daec3505485289f281323fcd7ef9..1855a8256cbfde42708db43f00be7c7f1a92cfd2 100644 (file)
--- a/po4a/ja/beyond-pkging.po
+++ b/po4a/ja/beyond-pkging.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.4.2\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.4.2\n"

-"POT-Creation-Date: 2009-09-06 02:31+0900\n"
+"POT-Creation-Date: 2010-01-04 00:20+0100\n"

 "PO-Revision-Date: 2009-09-06 09:21+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
 "PO-Revision-Date: 2009-09-06 09:21+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"


@@ -205,8 +205,9 @@ msgstr ""
 # FIXME program"m"s
 #. type: Content of: <chapter><section><section><para>
 #: beyond-pkging.dbk:87
 # FIXME program"m"s
 #. type: Content of: <chapter><section><section><para>
 #: beyond-pkging.dbk:87

+#, fuzzy

 msgid ""
 msgid ""

-"Please use the programms <command>dd-list</command> and if appropriate "
+"Please use the programs <command>dd-list</command> and if appropriate "

 "<command>whodepends</command> (from the package devscripts) to generate a "
 "list of all affected packages, and include the output in your mail to &email-"
 "debian-devel;."
 "<command>whodepends</command> (from the package devscripts) to generate a "
 "list of all affected packages, and include the output in your mail to &email-"
 "debian-devel;."


@@ -243,10 +244,10 @@ msgid ""
 "'usertag' the same bug in different ways without conflicting."
 msgstr ""
 "多数のパッケージに対するバグを登録する際に BTS の usertag を使いたくなるかも"
 "'usertag' the same bug in different ways without conflicting."
 msgstr ""
 "多数のパッケージに対するバグを登録する際に BTS の usertag を使いたくなるかも"

-"しれません。usertag は 'patch' や 'wishlist' のような通常のタグに似ていますが、"
-"ユーザが定義する事と特定のユーザに対して一意な名前空間を占めるという点で"
-"違っています。これによって、同じバグについて衝突する事無しに、開発者がそれぞれ"
-"別のやり方で複数の設定ができるようになります。"
+"しれません。usertag は 'patch' や 'wishlist' のような通常のタグに似ています"
+"ã\81\8cã\80\81ã\83¦ã\83¼ã\82¶ã\81\8cå®\9a義ã\81\99ã\82\8bäº\8bã\81¨ç\89¹å®\9aã\81®ã\83¦ã\83¼ã\82¶ã\81«å¯¾ã\81\97ã\81¦ä¸\80æ\84\8fã\81ªå\90\8då\89\8d空é\96\93ã\82\92å\8d ã\82\81ã\82\8bã\81¨ã\81\84ã\81\86ç\82¹ã\81§"
+"違っています。これによって、同じバグについて衝突する事無しに、開発者がそれぞ"
+"れ別のやり方で複数の設定ができるようになります。"

 
 #. type: Content of: <chapter><section><section><section><para>
 #: beyond-pkging.dbk:107
 
 #. type: Content of: <chapter><section><section><section><para>
 #: beyond-pkging.dbk:107


@@ -289,10 +290,10 @@ msgid ""
 "that you set the <literal>User</literal> to an appropriate mailing list "
 "after describing your intention there."
 msgstr ""
 "that you set the <literal>User</literal> to an appropriate mailing list "
 "after describing your intention there."
 msgstr ""

-"タグは空白で区切られ、アンダースコア (_) を含められない事に注意ください。"
-"特定のグループやチームについてのバグを登録する場合は、適切なメーリングリスト"
-"で注意を促した上で <literal>User</literal> をそのメーリングリストに設定する事"
-"をお勧めします。"
+"タグは空白で区切られ、アンダースコア (_) を含められない事に注意ください。特定"
+"のグループやチームについてのバグを登録する場合は、適切なメーリングリストで注"
+"意を促した上で <literal>User</literal> をそのメーリングリストに設定する事をお"
+"勧めします。"

 
 #. type: Content of: <chapter><section><section><section><para>
 #: beyond-pkging.dbk:128
 
 #. type: Content of: <chapter><section><section><section><para>
 #: beyond-pkging.dbk:128


@@ -301,7 +302,9 @@ msgid ""
 "host;/cgi-bin/pkgreport.cgi?users=<replaceable>&lt;email-addr&gt;</"
 "replaceable>&amp;tag=<replaceable>&lt;tag-name&gt;</replaceable></literal>."
 msgstr ""
 "host;/cgi-bin/pkgreport.cgi?users=<replaceable>&lt;email-addr&gt;</"
 "replaceable>&amp;tag=<replaceable>&lt;tag-name&gt;</replaceable></literal>."
 msgstr ""

-"特定の usertag でバグを参照する場合は <literal>http://&bugs-host;/cgi-bin/pkgreport.cgi?users=<replaceable>&lt;メールアドレス&gt;</replaceable>&amp;tag=<replaceable>&lt;タグ名&gt;</replaceable></literal> を指定してください。"
+"特定の usertag でバグを参照する場合は <literal>http://&bugs-host;/cgi-bin/"
+"pkgreport.cgi?users=<replaceable>&lt;メールアドレス&gt;</replaceable>&amp;"
+"tag=<replaceable>&lt;タグ名&gt;</replaceable></literal> を指定してください。"

 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>


@@ -622,10 +625,10 @@ msgid ""
 msgstr ""
 "ここに書かれた全てを収集したなら、&email-mia;に連絡しましょう。この名前のエリ"
 "アスを担当している人はあなたが供給した情報を使ってどう進めるかを判断します。"
 msgstr ""
 "ここに書かれた全てを収集したなら、&email-mia;に連絡しましょう。この名前のエリ"
 "アスを担当している人はあなたが供給した情報を使ってどう進めるかを判断します。"

-"例えば、そのメンテナのパッケージの一部または全てをみなしご化 (Orphan) するかも知れませ"
-"ã\82\93ã\80\82ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81\8cNMUã\81\95ã\82\8cã\81¦ã\81\84ã\81\9få ´å\90\88ã\81¯ã\80\81ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\82\92ã\81¿ã\81ªã\81\97ã\81\94å\8c\96 (Orphan) ã\81\99ã\82\8bå\89\8dã\81«NMUã\82\92ã\81\97ã\81\9f"
-"人に連絡する事を選ぶかもしれません — NMUをした人はきっとパッケージに関心があ"
-"るでしょうから。"
+"例えば、そのメンテナのパッケージの一部または全てをみなしご化 (Orphan) するか"
+"ã\82\82ç\9f¥ã\82\8cã\81¾ã\81\9bã\82\93ã\80\82ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81\8cNMUã\81\95ã\82\8cã\81¦ã\81\84ã\81\9få ´å\90\88ã\81¯ã\80\81ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\82\92ã\81¿ã\81ªã\81\97ã\81\94å\8c\96 "
+"(Orphan) する前にNMUをした人に連絡する事を選ぶかもしれません — NMUをした人は"
+"ã\81\8dã\81£ã\81¨ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81«é\96¢å¿\83ã\81\8cã\81\82ã\82\8bã\81§ã\81\97ã\82\87ã\81\86ã\81\8bã\82\89ã\80\82"

 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

diff --git a/po4a/ja/index.po b/po4a/ja/index.po
index 00b915d4d69c8752699260ec175bb59d55478007..9b0aaaeb1a17d5142bcfeecd4c920448a2882f5c 100644 (file)
--- a/po4a/ja/index.po
+++ b/po4a/ja/index.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.3.9\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: developers-reference 3.3.9\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-06-14 14:14+0900\n"
+"POT-Creation-Date: 2010-01-04 00:20+0100\n"

 "PO-Revision-Date: 2007-07-16 20:04+0000\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
 "PO-Revision-Date: 2007-07-16 20:04+0000\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"


@@ -16,22 +16,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # type: Attribute 'lang' of: <book>
 "Content-Transfer-Encoding: 8bit\n"
 
 # type: Attribute 'lang' of: <book>

+#. type: Attribute 'lang' of: <book>

 #: index.dbk:7
 msgid "en"
 msgstr "ja"
 
 # type: Content of: <book><title>
 #: index.dbk:7
 msgid "en"
 msgstr "ja"
 
 # type: Content of: <book><title>

+#. type: Content of: <book><title>

 #: index.dbk:9
 msgid "Debian Developer's Reference"
 msgstr "Debian 開発者リファレンス"
 
 # type: Content of: <book><bookinfo>
 #: index.dbk:9
 msgid "Debian Developer's Reference"
 msgstr "Debian 開発者リファレンス"
 
 # type: Content of: <book><bookinfo>

+#. type: Content of: <book><bookinfo>

 #: index.dbk:11
 #: index.dbk:11

+#, fuzzy

 msgid ""
 "<author> <othername>Developer's Reference Team</othername> &email-devel-ref; "
 "</author> <author> <firstname>Andreas</firstname> <surname>Barth</surname> </"
 "author> <author> <firstname>Adam</firstname> <surname>Di Carlo</surname> </"
 "author> <author> <firstname>Raphaël</firstname> <surname>Hertzog</surname> </"
 msgid ""
 "<author> <othername>Developer's Reference Team</othername> &email-devel-ref; "
 "</author> <author> <firstname>Andreas</firstname> <surname>Barth</surname> </"
 "author> <author> <firstname>Adam</firstname> <surname>Di Carlo</surname> </"
 "author> <author> <firstname>Raphaël</firstname> <surname>Hertzog</surname> </"

+"author> <author> <firstname>Lucas</firstname> <surname>Nussbaum</surname> </"

 "author> <author> <firstname>Christian</firstname> <surname>Schwarz</surname> "
 "</author> <author> <firstname>Ian</firstname> <surname>Jackson</surname> </"
 "author>"
 "author> <author> <firstname>Christian</firstname> <surname>Schwarz</surname> "
 "</author> <author> <firstname>Ian</firstname> <surname>Jackson</surname> </"
 "author>"


@@ -45,37 +50,28 @@ msgstr ""
 "author>"
 
 # type: Content of: <book><bookinfo><releaseinfo>
 "author>"
 
 # type: Content of: <book><bookinfo><releaseinfo>

-#: index.dbk:30
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: index.dbk:33

 msgid "ver. &version;"
 msgstr "ver. &version;"
 
 msgid "ver. &version;"
 msgstr "ver. &version;"
 

-# type: Content of: <book><bookinfo><pubdate>
-#: index.dbk:31
-msgid "&pubdate;"
-msgstr "&pubdate;"
-
-# type: Content of: <book><bookinfo><copyright><holder>
-#: index.dbk:37
-msgid "Andreas Barth"
-msgstr "Andreas Barth"
-
-# type: Content of: <book><bookinfo><copyright><holder>
-#: index.dbk:46
-msgid "Adam Di Carlo"
-msgstr "Adam Di Carlo"
-
-# type: Content of: <book><bookinfo><copyright><holder>
-#: index.dbk:51
-msgid "Raphaël Hertzog"
-msgstr "Raphaël Hertzog"
-
-# type: Content of: <book><bookinfo><copyright><holder>
-#: index.dbk:56
-msgid "Christian Schwarz"
-msgstr "Christian Schwarz"
+#. type: Content of: <book><bookinfo>
+#: index.dbk:34
+msgid ""
+"<pubdate>&pubdate;</pubdate> <copyright> <year>2004</year> <year>2005</year> "
+"<year>2006</year> <year>2007</year> <holder>Andreas Barth</holder> </"
+"copyright> <copyright> <year>1998</year> <year>1999</year> <year>2000</year> "
+"<year>2001</year> <year>2002</year> <year>2003</year> <holder>Adam Di Carlo</"
+"holder> </copyright> <copyright> <year>2002</year> <year>2003</year> "
+"<year>2008</year> <year>2009</year> <holder>Raphaël Hertzog</holder> </"
+"copyright> <copyright> <year>2008</year> <year>2009</year> <holder>Lucas "
+"Nussbaum</holder> </copyright> <copyright> <year>1997</year> <year>1998</"
+"year> <holder>Christian Schwarz</holder> </copyright>"
+msgstr ""

 
 # type: Content of: <book><bookinfo><legalnotice><para>
 
 # type: Content of: <book><bookinfo><legalnotice><para>

-#: index.dbk:60
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: index.dbk:70

 msgid ""
 "This manual is free software; you may redistribute it and/or modify it under "
 "the terms of the GNU General Public License as published by the Free "
 msgid ""
 "This manual is free software; you may redistribute it and/or modify it under "
 "the terms of the GNU General Public License as published by the Free "


@@ -86,7 +82,8 @@ msgstr ""
 "件に基づき、本文書の再配付および変更をすることができます。"
 
 # type: Content of: <book><bookinfo><legalnotice><para>
 "件に基づき、本文書の再配付および変更をすることができます。"
 
 # type: Content of: <book><bookinfo><legalnotice><para>

-#: index.dbk:65
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: index.dbk:75

 msgid ""
 "This is distributed in the hope that it will be useful, but "
 "<emphasis>without any warranty</emphasis>; without even the implied warranty "
 msgid ""
 "This is distributed in the hope that it will be useful, but "
 "<emphasis>without any warranty</emphasis>; without even the implied warranty "


@@ -98,7 +95,8 @@ msgstr ""
 "emphasis>。詳細については GNU 一般公衆利用許諾契約書をお読みください。"
 
 # type: Content of: <book><bookinfo><legalnotice><para>
 "emphasis>。詳細については GNU 一般公衆利用許諾契約書をお読みください。"
 
 # type: Content of: <book><bookinfo><legalnotice><para>

-#: index.dbk:71
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: index.dbk:81

 msgid ""
 "A copy of the GNU General Public License is available as &file-GPL; in the "
 "&debian-formal; distribution or on the World Wide Web at <ulink url=\"&url-"
 msgid ""
 "A copy of the GNU General Public License is available as &file-GPL; in the "
 "&debian-formal; distribution or on the World Wide Web at <ulink url=\"&url-"


@@ -113,7 +111,8 @@ msgstr ""
 # type: Content of: <book><bookinfo><legalnotice><para>
 #.  TODO: Maybe better: "This document has originally been written
 #. in English.  Translations into different languages are available." 
 # type: Content of: <book><bookinfo><legalnotice><para>
 #.  TODO: Maybe better: "This document has originally been written
 #. in English.  Translations into different languages are available." 

-#: index.dbk:78
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: index.dbk:88

 msgid ""
 "If you want to print this reference, you should use the <ulink url="
 "\"developers-reference.pdf\">pdf version</ulink>.  This page is also "
 msgid ""
 "If you want to print this reference, you should use the <ulink url="
 "\"developers-reference.pdf\">pdf version</ulink>.  This page is also "


@@ -122,3 +121,23 @@ msgstr ""
 "このリファレンスを印刷したい場合は、<ulink url=\"developers-reference.pdf"
 "\">PDF 版</ulink>を利用すると良いでしょう。このページは <ulink url=\"index."
 "fr.html\">フランス語</ulink> でも閲覧可能です。"
 "このリファレンスを印刷したい場合は、<ulink url=\"developers-reference.pdf"
 "\">PDF 版</ulink>を利用すると良いでしょう。このページは <ulink url=\"index."
 "fr.html\">フランス語</ulink> でも閲覧可能です。"

+
+# type: Content of: <book><bookinfo><pubdate>
+#~ msgid "&pubdate;"
+#~ msgstr "&pubdate;"
+
+# type: Content of: <book><bookinfo><copyright><holder>
+#~ msgid "Andreas Barth"
+#~ msgstr "Andreas Barth"
+
+# type: Content of: <book><bookinfo><copyright><holder>
+#~ msgid "Adam Di Carlo"
+#~ msgstr "Adam Di Carlo"
+
+# type: Content of: <book><bookinfo><copyright><holder>
+#~ msgid "Raphaël Hertzog"
+#~ msgstr "Raphaël Hertzog"
+
+# type: Content of: <book><bookinfo><copyright><holder>
+#~ msgid "Christian Schwarz"
+#~ msgstr "Christian Schwarz"

diff --git a/po4a/ja/pkgs.po b/po4a/ja/pkgs.po
index 91c7312538427403f8699dc55bd4bd7a9d95db3c..4328926815b46c50e54c3c3eb688cb13c25f373f 100644 (file)
--- a/po4a/ja/pkgs.po
+++ b/po4a/ja/pkgs.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.4.0\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.4.0\n"

-"POT-Creation-Date: 2009-09-06 02:31+0900\n"
+"POT-Creation-Date: 2010-01-04 00:20+0100\n"

 "PO-Revision-Date: 2008-03-05 18:30+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
 "PO-Revision-Date: 2008-03-05 18:30+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"


@@ -342,38 +342,38 @@ msgid ""
 "distinction between the original sources and the patches applied for Debian"
 msgstr ""
 
 "distinction between the original sources and the patches applied for Debian"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>

 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 #: pkgs.dbk:225
 msgid ""
 "the (more common) packages where there's an original source tarball file "
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 #: pkgs.dbk:225
 msgid ""
 "the (more common) packages where there's an original source tarball file "

-"accompanied by another file that contains the patches applied for Debian"
+"accompanied by another file that contains the changes made by Debian"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>

 #. type: Content of: <chapter><section><para>
 #: pkgs.dbk:231
 msgid ""
 "For the native packages, the source package includes a Debian source control "
 #. type: Content of: <chapter><section><para>
 #: pkgs.dbk:231
 msgid ""
 "For the native packages, the source package includes a Debian source control "

-"file (<literal>.dsc</literal>) and the source tarball (<literal>.tar.gz</"
-"literal>).  A source package of a non-native package includes a Debian "
-"source control file, the original source tarball (<literal>.orig.tar.gz</"
-"literal>) and the Debian patches (<literal>.diff.gz</literal>)."
+"file (<literal>.dsc</literal>) and the source tarball (<literal>.tar.{gz,bz2,"
+"lzma}</literal>). A source package of a non-native package includes a Debian "
+"source control file, the original source tarball (<literal>.orig.tar.{gz,bz2,"
+"lzma}</literal>) and the Debian changes (<literal>.diff.gz</literal> for the "
+"source format “1.0” or <literal>.debian.tar.{gz,bz2,lzma}</literal> for the "
+"source format “3.0 (quilt)”)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>

 #. type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:239
+#: pkgs.dbk:240

 msgid ""
 msgid ""

-"Whether a package is native or not is determined when it is built by "
-"<citerefentry> <refentrytitle>dpkg-buildpackage</refentrytitle> "
-"<manvolnum>1</manvolnum> </citerefentry>.  The rest of this section relates "
-"only to non-native packages."
+"With source format “1.0”, whether a package is native or not was determined "
+"by <command>dpkg-source</command> at build time. Nowadays it is recommended "
+"to be explicit about the desired source format by putting either “3.0 "
+"(quilt)” or “3.0 (native)” in <filename>debian/source/format</filename>.  "
+"The rest of this section relates only to non-native packages."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:245
+#: pkgs.dbk:247

 msgid ""
 "The first time a version is uploaded which corresponds to a particular "
 "upstream version, the original source tar file should be uploaded and "
 msgid ""
 "The first time a version is uploaded which corresponds to a particular "
 "upstream version, the original source tar file should be uploaded and "


@@ -382,21 +382,20 @@ msgid ""
 "filename> files, and will not need to be re-uploaded."
 msgstr ""
 
 "filename> files, and will not need to be re-uploaded."
 msgstr ""
 

-# type: Content of: <chapter><section><para>

 #. type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:252
+#: pkgs.dbk:254

 msgid ""
 "By default, <command>dpkg-genchanges</command> and <command>dpkg-"
 "buildpackage</command> will include the original source tar file if and only "
 msgid ""
 "By default, <command>dpkg-genchanges</command> and <command>dpkg-"
 "buildpackage</command> will include the original source tar file if and only "

-"if the Debian revision part of the source version number is 0 or 1, "
-"indicating a new upstream version.  This behavior may be modified by using "
-"<literal>-sa</literal> to always include it or <literal>-sd</literal> to "
-"always leave it out."
+"if the current changelog entry has a different upstream version from the "
+"preceding entry. This behavior may be modified by using <literal>-sa</"
+"literal> to always include it or <literal>-sd</literal> to always leave it "
+"out."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:260
+#: pkgs.dbk:262

 msgid ""
 "If no original source is included in the upload, the original source tar-"
 "file used by <command>dpkg-source</command> when constructing the <filename>."
 msgid ""
 "If no original source is included in the upload, the original source tar-"
 "file used by <command>dpkg-source</command> when constructing the <filename>."


@@ -404,24 +403,25 @@ msgid ""
 "byte-for-byte identical with the one already in the archive."
 msgstr ""
 
 "byte-for-byte identical with the one already in the archive."
 msgstr ""
 

-# type: Content of: <chapter><section><para>

 #. type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:267
+#: pkgs.dbk:269

 msgid ""
 "Please notice that, in non-native packages, permissions on files that are "
 msgid ""
 "Please notice that, in non-native packages, permissions on files that are "

-"not present in the .orig.tar.gz will not be preserved, as diff does not "
-"store file permissions in the patch."
+"not present in the .orig.tar.{gz,bz2} will not be preserved, as diff does "
+"not store file permissions in the patch. However when using source format "
+"“3.0 (quilt)”, permissions of files inside the <filename>debian</filename> "
+"directory are preserved since they are stored in a tar archive."

 msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:274
+#: pkgs.dbk:278

 msgid "Picking a distribution"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Picking a distribution"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:276
+#: pkgs.dbk:280

 msgid ""
 "Each upload needs to specify which distribution the package is intended "
 "for.  The package build process extracts this information from the first "
 msgid ""
 "Each upload needs to specify which distribution the package is intended "
 "for.  The package build process extracts this information from the first "


@@ -432,7 +432,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:282
+#: pkgs.dbk:286

 msgid ""
 "There are several possible values for this field: <literal>stable</literal>, "
 "<literal>unstable</literal>, <literal>testing-proposed-updates</literal> and "
 msgid ""
 "There are several possible values for this field: <literal>stable</literal>, "
 "<literal>unstable</literal>, <literal>testing-proposed-updates</literal> and "


@@ -442,7 +442,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:288
+#: pkgs.dbk:292

 msgid ""
 "Actually, there are two other possible distributions: <literal>stable-"
 "security </literal> and <literal>testing-security</literal>, but read <xref "
 msgid ""
 "Actually, there are two other possible distributions: <literal>stable-"
 "security </literal> and <literal>testing-security</literal>, but read <xref "


@@ -451,7 +451,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:293
+#: pkgs.dbk:297

 msgid ""
 "It is not possible to upload a package into several distributions at the "
 "same time."
 msgid ""
 "It is not possible to upload a package into several distributions at the "
 "same time."


@@ -459,18 +459,17 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:297
+#: pkgs.dbk:301

 msgid ""
 "Special case: uploads to the <literal>stable</literal> and "
 "<literal>oldstable</literal> distributions"
 msgstr ""
 
 msgid ""
 "Special case: uploads to the <literal>stable</literal> and "
 "<literal>oldstable</literal> distributions"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:300
+#: pkgs.dbk:304

 msgid ""
 "Uploading to <literal>stable</literal> means that the package will "
 msgid ""
 "Uploading to <literal>stable</literal> means that the package will "

-"transfered to the <literal>proposed-updates-new</literal> queue for review "
+"transferred to the <literal>proposed-updates-new</literal> queue for review "

 "by the stable release managers, and if approved will be installed in "
 "<filename>stable-proposed-updates</filename> directory of the Debian "
 "archive.  From there, it will be included in <literal>stable</literal> with "
 "by the stable release managers, and if approved will be installed in "
 "<filename>stable-proposed-updates</filename> directory of the Debian "
 "archive.  From there, it will be included in <literal>stable</literal> with "


@@ -479,7 +478,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:308
+#: pkgs.dbk:312

 msgid ""
 "To ensure that your upload will be accepted, you should discuss the changes "
 "with the stable release team before you upload. For that, send a mail to the "
 msgid ""
 "To ensure that your upload will be accepted, you should discuss the changes "
 "with the stable release team before you upload. For that, send a mail to the "


@@ -491,7 +490,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:316
+#: pkgs.dbk:320

 msgid ""
 "Extra care should be taken when uploading to <literal>stable</literal>.  "
 "Basically, a package should only be uploaded to <literal>stable</literal> if "
 msgid ""
 "Extra care should be taken when uploading to <literal>stable</literal>.  "
 "Basically, a package should only be uploaded to <literal>stable</literal> if "


@@ -500,25 +499,25 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:323
+#: pkgs.dbk:327

 msgid "a truly critical functionality problem"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "a truly critical functionality problem"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:328
+#: pkgs.dbk:332

 msgid "the package becomes uninstallable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "the package becomes uninstallable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:333
+#: pkgs.dbk:337

 msgid "a released architecture lacks the package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "a released architecture lacks the package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:338
+#: pkgs.dbk:342

 msgid ""
 "In the past, uploads to <literal>stable</literal> were used to address "
 "security problems as well.  However, this practice is deprecated, as uploads "
 msgid ""
 "In the past, uploads to <literal>stable</literal> were used to address "
 "security problems as well.  However, this practice is deprecated, as uploads "


@@ -533,7 +532,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:349
+#: pkgs.dbk:353

 msgid ""
 "Changing anything else in the package that isn't important is discouraged, "
 "because even trivial fixes can cause bugs later on."
 msgid ""
 "Changing anything else in the package that isn't important is discouraged, "
 "because even trivial fixes can cause bugs later on."


@@ -541,7 +540,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:353
+#: pkgs.dbk:357

 msgid ""
 "Packages uploaded to <literal>stable</literal> need to be compiled on "
 "systems running <literal>stable</literal>, so that their dependencies are "
 msgid ""
 "Packages uploaded to <literal>stable</literal> need to be compiled on "
 "systems running <literal>stable</literal>, so that their dependencies are "


@@ -556,7 +555,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:363
+#: pkgs.dbk:367

 msgid ""
 "Uploads to the <literal>oldstable</literal> distributions are possible as "
 "long as it hasn't been archived. The same rules as for <literal>stable </"
 msgid ""
 "Uploads to the <literal>oldstable</literal> distributions are possible as "
 "long as it hasn't been archived. The same rules as for <literal>stable </"


@@ -565,14 +564,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:370
+#: pkgs.dbk:374

 msgid ""
 "Special case: uploads to <literal>testing/testing-proposed-updates</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid ""
 "Special case: uploads to <literal>testing/testing-proposed-updates</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:372
+#: pkgs.dbk:376

 msgid ""
 "Please see the information in the <link linkend=\"t-p-u\">testing section</"
 "link> for details."
 msgid ""
 "Please see the information in the <link linkend=\"t-p-u\">testing section</"
 "link> for details."


@@ -580,23 +579,22 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:380
+#: pkgs.dbk:384

 msgid "Uploading a package"
 msgstr "パッケージをアップロードする"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgid "Uploading a package"
 msgstr "パッケージをアップロードする"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:382
+#: pkgs.dbk:386

 msgid "Uploading to <literal>ftp-master</literal>"
 msgstr "<literal>ftp-master</literal> にアップロードする"
 
 msgid "Uploading to <literal>ftp-master</literal>"
 msgstr "<literal>ftp-master</literal> にアップロードする"
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:384
+#: pkgs.dbk:388

 msgid ""
 "To upload a package, you should upload the files (including the signed "
 msgid ""
 "To upload a package, you should upload the files (including the signed "

-"changes and dsc-file) with anonymous ftp to <literal>&ftp-master-host;</"
-"literal> in the directory <ulink url=\"ftp://&ftp-master-host;&upload-queue;"
+"changes and dsc-file) with anonymous ftp to <literal>&ftp-upload-host;</"
+"literal> in the directory <ulink url=\"ftp://&ftp-upload-host;&upload-queue;"

 "\">&upload-queue;</ulink>.  To get the files processed there, they need to "
 "be signed with a key in the Debian Developers keyring or the Debian "
 "Maintainers keyring (see <ulink url=\"&url-wiki-dm;\"></ulink>)."
 "\">&upload-queue;</ulink>.  To get the files processed there, they need to "
 "be signed with a key in the Debian Developers keyring or the Debian "
 "Maintainers keyring (see <ulink url=\"&url-wiki-dm;\"></ulink>)."


@@ -604,7 +602,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:393
+#: pkgs.dbk:397

 msgid ""
 "Please note that you should transfer the changes file last.  Otherwise, your "
 "upload may be rejected because the archive maintenance software will parse "
 msgid ""
 "Please note that you should transfer the changes file last.  Otherwise, your "
 "upload may be rejected because the archive maintenance software will parse "


@@ -613,29 +611,28 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:398
+#: pkgs.dbk:402

 msgid ""
 "You may also find the Debian packages <xref linkend=\"dupload\"/> or <xref "
 "linkend=\"dput\"/> useful when uploading packages.  These handy programs "
 "help automate the process of uploading packages into Debian."
 msgstr ""
 
 msgid ""
 "You may also find the Debian packages <xref linkend=\"dupload\"/> or <xref "
 "linkend=\"dput\"/> useful when uploading packages.  These handy programs "
 "help automate the process of uploading packages into Debian."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:403
+#: pkgs.dbk:407

 msgid ""
 msgid ""

-"For removing packages, please see the README file in that ftp directory, and "
-"the Debian package <xref linkend=\"dcut\"/> ."
+"For removing packages, please see <ulink url=\"ftp://&ftp-upload-host;"
+"&upload-queue;/README\"/> and the Debian package <xref linkend=\"dcut\"/> ."

 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:409
+#: pkgs.dbk:414

 msgid "Delayed uploads"
 msgstr "遅延アップロード"
 
 #. type: Content of: <chapter><section><section><para>
 msgid "Delayed uploads"
 msgstr "遅延アップロード"
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:412
+#: pkgs.dbk:417

 msgid ""
 "It is sometimes useful to upload a package immediately, but to want this "
 "package to arrive in the archive only a few days later. For example, when "
 msgid ""
 "It is sometimes useful to upload a package immediately, but to want this "
 "package to arrive in the archive only a few days later. For example, when "


@@ -644,19 +641,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:419
+#: pkgs.dbk:424

 msgid ""
 "An upload to the delayed directory keeps the package in <ulink url=\"http://"
 "ftp-master.debian.org/deferred.html\"> the deferred uploads queue\"</"
 "ulink>.  When the specified waiting time is over, the package is moved into "
 "the regular incoming directory for processing.  This is done through "
 msgid ""
 "An upload to the delayed directory keeps the package in <ulink url=\"http://"
 "ftp-master.debian.org/deferred.html\"> the deferred uploads queue\"</"
 "ulink>.  When the specified waiting time is over, the package is moved into "
 "the regular incoming directory for processing.  This is done through "

-"automatic uploading to <literal>&ftp-master-host;</literal> in upload-"
+"automatic uploading to <literal>&ftp-upload-host;</literal> in upload-"

 "directory <literal>DELAYED/[012345678]-day</literal>. 0-day is uploaded "
 "directory <literal>DELAYED/[012345678]-day</literal>. 0-day is uploaded "

-"multiple times per day to <literal>&ftp-master-host;</literal>."
+"multiple times per day to <literal>&ftp-upload-host;</literal>."

 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:430
+#: pkgs.dbk:435

 msgid ""
 "With dput, you can use the <literal>--delayed <replaceable>DELAY</"
 "replaceable></literal> parameter to put the package into one of the queues."
 msgid ""
 "With dput, you can use the <literal>--delayed <replaceable>DELAY</"
 "replaceable></literal> parameter to put the package into one of the queues."


@@ -664,13 +661,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:436
+#: pkgs.dbk:441

 msgid "Security uploads"
 msgstr "セキュリティアップロード"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Security uploads"
 msgstr "セキュリティアップロード"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:438
+#: pkgs.dbk:443

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 "upload queue (<literal>oldstable-security</literal>, <literal>stable-"
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 "upload queue (<literal>oldstable-security</literal>, <literal>stable-"


@@ -682,46 +679,36 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:448
+#: pkgs.dbk:453

 msgid "Other upload queues"
 msgstr "他のアップロードキュー"
 
 msgid "Other upload queues"
 msgstr "他のアップロードキュー"
 

-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:450
-msgid ""
-"The scp queues on <literal>&ftp-master-host;</literal>, and <literal> "
-"security.debian.org</literal> are mostly unusable due to the login "
-"restrictions on those hosts."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:455
 msgid ""
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:455
 msgid ""

-"The anonymous queues on ftp.uni-erlangen.de and ftp.uk.debian.org are "
-"currently down.  Work is underway to resurrect them."
+"There is an alternative upload queue in Europe at <ulink url=\"ftp://&ftp-eu-"
+"upload-host;&upload-queue;\"/>. It operates in the same way as <literal>&ftp-"
+"upload-host;</literal>, but should be faster for European developers."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:459
+#: pkgs.dbk:461

 msgid ""
 msgid ""

-"The queues on master.debian.org, samosa.debian.org, master.debian.or.jp, and "
-"ftp.chiark.greenend.org.uk are down permanently, and will not be "
-"resurrected.  The queue in Japan will be replaced with a new queue on hp."
-"debian.or.jp some day."
+"Packages can also be uploaded via ssh to <literal>&ssh-upload-host;</"
+"literal>; files should be put <literal>/srv/upload.debian.org/UploadQueue</"
+"literal>. This queue does not support <xref linkend=\"delayed-incoming"
+"\">delayed uploads</xref>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:467
+#: pkgs.dbk:469

 msgid "Notification that a new package has been installed"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Notification that a new package has been installed"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:469
+#: pkgs.dbk:471

 msgid ""
 "The Debian archive maintainers are responsible for handling package "
 "uploads.  For the most part, uploads are automatically handled on a daily "
 msgid ""
 "The Debian archive maintainers are responsible for handling package "
 "uploads.  For the most part, uploads are automatically handled on a daily "


@@ -735,7 +722,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:479
+#: pkgs.dbk:481

 msgid ""
 "In any case, you will receive an email notification indicating that the "
 "package has been added to the archive, which also indicates which bugs will "
 msgid ""
 "In any case, you will receive an email notification indicating that the "
 "package has been added to the archive, which also indicates which bugs will "


@@ -745,7 +732,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:485
+#: pkgs.dbk:487

 msgid ""
 "The installation notification also includes information on what section the "
 "package was inserted into.  If there is a disparity, you will receive a "
 msgid ""
 "The installation notification also includes information on what section the "
 "package was inserted into.  If there is a disparity, you will receive a "


@@ -754,7 +741,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:490
+#: pkgs.dbk:492

 msgid ""
 "Note that if you upload via queues, the queue daemon software will also send "
 "you a notification by email."
 msgid ""
 "Note that if you upload via queues, the queue daemon software will also send "
 "you a notification by email."


@@ -762,13 +749,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:498
+#: pkgs.dbk:500

 msgid "Specifying the package section, subsection and priority"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Specifying the package section, subsection and priority"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:500
+#: pkgs.dbk:502

 msgid ""
 "The <filename>debian/control</filename> file's <literal>Section</literal> "
 "and <literal>Priority</literal> fields do not actually specify where the "
 msgid ""
 "The <filename>debian/control</filename> file's <literal>Section</literal> "
 "and <literal>Priority</literal> fields do not actually specify where the "


@@ -780,7 +767,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:508
+#: pkgs.dbk:510

 msgid ""
 "The archive maintainers keep track of the canonical sections and priorities "
 "for packages in the <literal>override file</literal>.  If there is a "
 msgid ""
 "The archive maintainers keep track of the canonical sections and priorities "
 "for packages in the <literal>override file</literal>.  If there is a "


@@ -792,21 +779,22 @@ msgid ""
 "in the <literal>override file</literal>."
 msgstr ""
 
 "in the <literal>override file</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>

 #. type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:518
+#: pkgs.dbk:520

 msgid ""
 "To alter the actual section that a package is put in, you need to first make "
 "sure that the <filename>debian/control</filename> file in your package is "
 msgid ""
 "To alter the actual section that a package is put in, you need to first make "
 "sure that the <filename>debian/control</filename> file in your package is "

-"accurate.  Next, send an email &email-override; or submit a bug against "
-"<systemitem role=\"package\">ftp.debian.org</systemitem> requesting that the "
-"section or priority for your package be changed from the old section or "
-"priority to the new one.  Be sure to explain your reasoning."
+"accurate.  Next, submit a bug against <systemitem role=\"package\">ftp."
+"debian.org</systemitem> requesting that the section or priority for your "
+"package be changed from the old section or priority to the new one. Use a "
+"Subject like <literal>override: PACKAGE1:section/priority, [...], PACKAGEX:"
+"section/priority</literal>, and include the justification for the change in "
+"the body of the bug report."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:526
+#: pkgs.dbk:531

 msgid ""
 "For more information about <literal>override files</literal>, see "
 "<citerefentry> <refentrytitle>dpkg-scanpackages</refentrytitle> "
 msgid ""
 "For more information about <literal>override files</literal>, see "
 "<citerefentry> <refentrytitle>dpkg-scanpackages</refentrytitle> "


@@ -816,7 +804,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:532
+#: pkgs.dbk:537

 msgid ""
 "Note that the <literal>Section</literal> field describes both the section as "
 "well as the subsection, which are described in <xref linkend=\"archive-"
 msgid ""
 "Note that the <literal>Section</literal> field describes both the section as "
 "well as the subsection, which are described in <xref linkend=\"archive-"


@@ -827,13 +815,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:541
+#: pkgs.dbk:546

 msgid "Handling bugs"
 msgstr "バグの取扱い"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Handling bugs"
 msgstr "バグの取扱い"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:543
+#: pkgs.dbk:548

 msgid ""
 "Every developer has to be able to work with the Debian <ulink url=\"&url-bts;"
 "\">bug tracking system</ulink>.  This includes knowing how to file bug "
 msgid ""
 "Every developer has to be able to work with the Debian <ulink url=\"&url-bts;"
 "\">bug tracking system</ulink>.  This includes knowing how to file bug "


@@ -843,7 +831,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:549
+#: pkgs.dbk:554

 msgid ""
 "The bug tracking system's features are described in the <ulink url=\"&url-"
 "bts-devel;\">BTS documentation for developers</ulink>.  This includes "
 msgid ""
 "The bug tracking system's features are described in the <ulink url=\"&url-"
 "bts-devel;\">BTS documentation for developers</ulink>.  This includes "


@@ -853,7 +841,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:555
+#: pkgs.dbk:560

 msgid ""
 "Operations such as reassigning bugs to other packages, merging separate bug "
 "reports about the same issue, or reopening bugs when they are prematurely "
 msgid ""
 "Operations such as reassigning bugs to other packages, merging separate bug "
 "reports about the same issue, or reopening bugs when they are prematurely "


@@ -864,13 +852,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:563
+#: pkgs.dbk:568

 msgid "Monitoring bugs"
 msgstr "バグの監視"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Monitoring bugs"
 msgstr "バグの監視"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:565
+#: pkgs.dbk:570

 msgid ""
 "If you want to be a good maintainer, you should periodically check the "
 "<ulink url=\"&url-bts;\">Debian bug tracking system (BTS)</ulink> for your "
 msgid ""
 "If you want to be a good maintainer, you should periodically check the "
 "<ulink url=\"&url-bts;\">Debian bug tracking system (BTS)</ulink> for your "


@@ -881,7 +869,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:572
+#: pkgs.dbk:577

 msgid ""
 "Maintainers interact with the BTS via email addresses at <literal>&bugs-host;"
 "</literal>.  Documentation on available commands can be found at <ulink url="
 msgid ""
 "Maintainers interact with the BTS via email addresses at <literal>&bugs-host;"
 "</literal>.  Documentation on available commands can be found at <ulink url="


@@ -892,7 +880,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:579
+#: pkgs.dbk:584

 msgid ""
 "Some find it useful to get periodic reports on open bugs.  You can add a "
 "cron job such as the following if you want to get a weekly email outlining "
 msgid ""
 "Some find it useful to get periodic reports on open bugs.  You can add a "
 "cron job such as the following if you want to get a weekly email outlining "


@@ -900,7 +888,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:584
+#: pkgs.dbk:589

 #, no-wrap
 msgid ""
 "# ask for weekly reports of bugs in my packages\n"
 #, no-wrap
 msgid ""
 "# ask for weekly reports of bugs in my packages\n"


@@ -909,7 +897,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:588
+#: pkgs.dbk:593

 msgid ""
 "Replace <replaceable>address</replaceable> with your official Debian "
 "maintainer address."
 msgid ""
 "Replace <replaceable>address</replaceable> with your official Debian "
 "maintainer address."


@@ -917,13 +905,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:594
+#: pkgs.dbk:599

 msgid "Responding to bugs"
 msgstr "バグへの対応"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Responding to bugs"
 msgstr "バグへの対応"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:596
+#: pkgs.dbk:601

 msgid ""
 "When responding to bugs, make sure that any discussion you have about bugs "
 "is sent both to the original submitter of the bug, and to the bug itself (e."
 msgid ""
 "When responding to bugs, make sure that any discussion you have about bugs "
 "is sent both to the original submitter of the bug, and to the bug itself (e."


@@ -936,7 +924,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:605
+#: pkgs.dbk:610

 msgid ""
 "If you get a bug which mentions FTBFS, this means Fails to build from "
 "source.  Porters frequently use this acronym."
 msgid ""
 "If you get a bug which mentions FTBFS, this means Fails to build from "
 "source.  Porters frequently use this acronym."


@@ -944,7 +932,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:609
+#: pkgs.dbk:614

 msgid ""
 "Once you've dealt with a bug report (e.g.  fixed it), mark it as "
 "<literal>done</literal> (close it) by sending an explanation message to "
 msgid ""
 "Once you've dealt with a bug report (e.g.  fixed it), mark it as "
 "<literal>done</literal> (close it) by sending an explanation message to "


@@ -955,7 +943,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:616
+#: pkgs.dbk:621

 msgid ""
 "You should <emphasis>never</emphasis> close bugs via the bug server "
 "<literal>close</literal> command sent to &email-bts-control;.  If you do so, "
 msgid ""
 "You should <emphasis>never</emphasis> close bugs via the bug server "
 "<literal>close</literal> command sent to &email-bts-control;.  If you do so, "


@@ -965,13 +953,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:624
+#: pkgs.dbk:629

 msgid "Bug housekeeping"
 msgstr "バグを掃除する"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Bug housekeeping"
 msgstr "バグを掃除する"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:626
+#: pkgs.dbk:631

 msgid ""
 "As a package maintainer, you will often find bugs in other packages or have "
 "bugs reported against your packages which are actually bugs in other "
 msgid ""
 "As a package maintainer, you will often find bugs in other packages or have "
 "bugs reported against your packages which are actually bugs in other "


@@ -985,7 +973,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:637
+#: pkgs.dbk:642

 msgid ""
 "Filing bugs for problems that you find in other packages is one of the civic "
 "obligations of maintainership, see <xref linkend=\"submit-bug\"/> for "
 msgid ""
 "Filing bugs for problems that you find in other packages is one of the civic "
 "obligations of maintainership, see <xref linkend=\"submit-bug\"/> for "


@@ -995,13 +983,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:642
+#: pkgs.dbk:647

 msgid "Here's a list of steps that you may follow to handle a bug report:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgid "Here's a list of steps that you may follow to handle a bug report:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:647
+#: pkgs.dbk:652

 msgid ""
 "Decide whether the report corresponds to a real bug or not.  Sometimes users "
 "are just calling a program in the wrong way because they haven't read the "
 msgid ""
 "Decide whether the report corresponds to a real bug or not.  Sometimes users "
 "are just calling a program in the wrong way because they haven't read the "


@@ -1015,7 +1003,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:657
+#: pkgs.dbk:662

 msgid ""
 "If the bug submitter disagrees with your decision to close the bug, they may "
 "reopen it until you find an agreement on how to handle it.  If you don't "
 msgid ""
 "If the bug submitter disagrees with your decision to close the bug, they may "
 "reopen it until you find an agreement on how to handle it.  If you don't "


@@ -1031,7 +1019,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:671
+#: pkgs.dbk:676

 msgid ""
 "If the bug is real but it's caused by another package, just reassign the bug "
 "to the right package.  If you don't know which package it should be "
 msgid ""
 "If the bug is real but it's caused by another package, just reassign the bug "
 "to the right package.  If you don't know which package it should be "


@@ -1047,7 +1035,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:683
+#: pkgs.dbk:688

 msgid ""
 "If the bug affects the operation of your package, please consider cloning "
 "the bug and reassigning the clone to the package that really causes the "
 msgid ""
 "If the bug affects the operation of your package, please consider cloning "
 "the bug and reassigning the clone to the package that really causes the "


@@ -1059,7 +1047,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:693
+#: pkgs.dbk:698

 msgid ""
 "Sometimes you also have to adjust the severity of the bug so that it matches "
 "our definition of the severity.  That's because people tend to inflate the "
 msgid ""
 "Sometimes you also have to adjust the severity of the bug so that it matches "
 "our definition of the severity.  That's because people tend to inflate the "


@@ -1070,7 +1058,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:701
+#: pkgs.dbk:706

 msgid ""
 "If the bug is real but the same problem has already been reported by someone "
 "else, then the two relevant bug reports should be merged into one using the "
 msgid ""
 "If the bug is real but the same problem has already been reported by someone "
 "else, then the two relevant bug reports should be merged into one using the "


@@ -1083,7 +1071,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:712
+#: pkgs.dbk:717

 msgid ""
 "The bug submitter may have forgotten to provide some information, in which "
 "case you have to ask them for the required information.  You may use the "
 msgid ""
 "The bug submitter may have forgotten to provide some information, in which "
 "case you have to ask them for the required information.  You may use the "


@@ -1096,7 +1084,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:723
+#: pkgs.dbk:728

 msgid ""
 "If the bug is related to the packaging, you just fix it.  If you are not "
 "able to fix it yourself, then tag the bug as <literal>help</literal>.  You "
 msgid ""
 "If the bug is related to the packaging, you just fix it.  If you are not "
 "able to fix it yourself, then tag the bug as <literal>help</literal>.  You "


@@ -1112,7 +1100,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:737
+#: pkgs.dbk:742

 msgid ""
 "If you have fixed a bug in your local copy, or if a fix has been committed "
 "to the CVS repository, you may tag the bug as <literal>pending</literal> to "
 msgid ""
 "If you have fixed a bug in your local copy, or if a fix has been committed "
 "to the CVS repository, you may tag the bug as <literal>pending</literal> to "


@@ -1124,7 +1112,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:747
+#: pkgs.dbk:752

 msgid ""
 "Once a corrected package is available in the archive, the bug should be "
 "closed indicating the version in which it was fixed. This can be done "
 msgid ""
 "Once a corrected package is available in the archive, the bug should be "
 "closed indicating the version in which it was fixed. This can be done "


@@ -1133,13 +1121,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:756
+#: pkgs.dbk:761

 msgid "When bugs are closed by new uploads"
 msgstr "新規アップロードでバグがクローズされる時"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "When bugs are closed by new uploads"
 msgstr "新規アップロードでバグがクローズされる時"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:758
+#: pkgs.dbk:763

 msgid ""
 "As bugs and problems are fixed in your packages, it is your responsibility "
 "as the package maintainer to close these bugs.  However, you should not "
 msgid ""
 "As bugs and problems are fixed in your packages, it is your responsibility "
 "as the package maintainer to close these bugs.  However, you should not "


@@ -1151,7 +1139,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:766
+#: pkgs.dbk:771

 msgid ""
 "However, it's possible to avoid having to manually close bugs after the "
 "upload — just list the fixed bugs in your <filename>debian/changelog</"
 msgid ""
 "However, it's possible to avoid having to manually close bugs after the "
 "upload — just list the fixed bugs in your <filename>debian/changelog</"


@@ -1161,7 +1149,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:772
+#: pkgs.dbk:777

 #, fuzzy, no-wrap
 msgid ""
 "acme-cannon (3.1415) unstable; urgency=low\n"
 #, fuzzy, no-wrap
 msgid ""
 "acme-cannon (3.1415) unstable; urgency=low\n"


@@ -1180,7 +1168,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:780
+#: pkgs.dbk:785

 msgid ""
 "Technically speaking, the following Perl regular expression describes how "
 "bug closing changelogs are identified:"
 msgid ""
 "Technically speaking, the following Perl regular expression describes how "
 "bug closing changelogs are identified:"


@@ -1188,14 +1176,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:784
+#: pkgs.dbk:789

 #, fuzzy, no-wrap
 msgid "  /closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig\n"
 msgstr "/closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 #, fuzzy, no-wrap
 msgid "  /closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig\n"
 msgstr "/closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:787
+#: pkgs.dbk:792

 msgid ""
 "We prefer the <literal>closes: #<replaceable>XXX</replaceable></literal> "
 "syntax, as it is the most concise entry and the easiest to integrate with "
 msgid ""
 "We prefer the <literal>closes: #<replaceable>XXX</replaceable></literal> "
 "syntax, as it is the most concise entry and the easiest to integrate with "


@@ -1208,7 +1196,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:796
+#: pkgs.dbk:801

 msgid ""
 "Historically, uploads identified as <link linkend=\"nmu\">Non-maintainer "
 "upload (NMU)</link> were tagged <literal>fixed</literal> instead of being "
 msgid ""
 "Historically, uploads identified as <link linkend=\"nmu\">Non-maintainer "
 "upload (NMU)</link> were tagged <literal>fixed</literal> instead of being "


@@ -1218,7 +1206,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:802
+#: pkgs.dbk:807

 msgid ""
 "If you happen to mistype a bug number or forget a bug in the changelog "
 "entries, don't hesitate to undo any damage the error caused.  To reopen "
 msgid ""
 "If you happen to mistype a bug number or forget a bug in the changelog "
 "entries, don't hesitate to undo any damage the error caused.  To reopen "


@@ -1234,7 +1222,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:814
+#: pkgs.dbk:819

 msgid ""
 "Bear in mind that it is not obligatory to close bugs using the changelog as "
 "described above.  If you simply want to close bugs that don't have anything "
 msgid ""
 "Bear in mind that it is not obligatory to close bugs using the changelog as "
 "described above.  If you simply want to close bugs that don't have anything "


@@ -1246,7 +1234,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:822
+#: pkgs.dbk:827

 msgid ""
 "For general information on how to write your changelog entries, see <xref "
 "linkend=\"bpp-debian-changelog\"/> ."
 msgid ""
 "For general information on how to write your changelog entries, see <xref "
 "linkend=\"bpp-debian-changelog\"/> ."


@@ -1254,13 +1242,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:828
+#: pkgs.dbk:833

 msgid "Handling security-related bugs"
 msgstr "セキュリティ関連バグの取扱い"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Handling security-related bugs"
 msgstr "セキュリティ関連バグの取扱い"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:830
+#: pkgs.dbk:835

 msgid ""
 "Due to their sensitive nature, security-related bugs must be handled "
 "carefully.  The Debian Security Team exists to coordinate this activity, "
 msgid ""
 "Due to their sensitive nature, security-related bugs must be handled "
 "carefully.  The Debian Security Team exists to coordinate this activity, "


@@ -1270,7 +1258,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:837
+#: pkgs.dbk:842

 msgid ""
 "When you become aware of a security-related bug in a Debian package, whether "
 "or not you are the maintainer, collect pertinent information about the "
 msgid ""
 "When you become aware of a security-related bug in a Debian package, whether "
 "or not you are the maintainer, collect pertinent information about the "


@@ -1282,7 +1270,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:847
+#: pkgs.dbk:852

 msgid ""
 "Which versions of the package are known to be affected by the bug.  Check "
 "each version that is present in a supported Debian release, as well as "
 msgid ""
 "Which versions of the package are known to be affected by the bug.  Check "
 "each version that is present in a supported Debian release, as well as "


@@ -1291,14 +1279,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:854
+#: pkgs.dbk:859

 msgid ""
 "The nature of the fix, if any is available (patches are especially helpful)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "The nature of the fix, if any is available (patches are especially helpful)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:859
+#: pkgs.dbk:864

 msgid ""
 "Any fixed packages that you have prepared yourself (send only the <literal>."
 "diff.gz</literal> and <literal>.dsc</literal> files and read <xref linkend="
 msgid ""
 "Any fixed packages that you have prepared yourself (send only the <literal>."
 "diff.gz</literal> and <literal>.dsc</literal> files and read <xref linkend="


@@ -1307,7 +1295,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:866
+#: pkgs.dbk:871

 msgid ""
 "Any assistance you can provide to help with testing (exploits, regression "
 "testing, etc.)"
 msgid ""
 "Any assistance you can provide to help with testing (exploits, regression "
 "testing, etc.)"


@@ -1315,14 +1303,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:872
+#: pkgs.dbk:877

 msgid ""
 "Any information needed for the advisory (see <xref linkend=\"bug-security-"
 "advisories\"/> )"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid ""
 "Any information needed for the advisory (see <xref linkend=\"bug-security-"
 "advisories\"/> )"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:877
+#: pkgs.dbk:882

 msgid ""
 "As the maintainer of the package, you have the responsibility to maintain "
 "it, even in the stable release. You are in the best position to evaluate "
 msgid ""
 "As the maintainer of the package, you have the responsibility to maintain "
 "it, even in the stable release. You are in the best position to evaluate "


@@ -1331,15 +1319,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:883
+#: pkgs.dbk:888

 msgid "The Security Tracker"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgid "The Security Tracker"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:885
+#: pkgs.dbk:890

 msgid ""
 "The security team maintains a central database, the <ulink url=\"http://"
 msgid ""
 "The security team maintains a central database, the <ulink url=\"http://"

-"security-tracker.debian.net/\">Debian Security Tracker</ulink>.  This "
+"security-tracker.debian.org/\">Debian Security Tracker</ulink>.  This "

 "contains all public information that is known about security issues: which "
 "packages and versions are affected or fixed, and thus whether stable, "
 "testing and/or unstable are vulnerable. Information that is still "
 "contains all public information that is known about security issues: which "
 "packages and versions are affected or fixed, and thus whether stable, "
 "testing and/or unstable are vulnerable. Information that is still "


@@ -1347,7 +1335,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:893
+#: pkgs.dbk:898

 msgid ""
 "You can search it for a specific issue, but also on package name. Look for "
 "your package to see which issues are still open. If you can, please provide "
 msgid ""
 "You can search it for a specific issue, but also on package name. Look for "
 "your package to see which issues are still open. If you can, please provide "


@@ -1357,13 +1345,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:901
+#: pkgs.dbk:906

 msgid "Confidentiality"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Confidentiality"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:903
+#: pkgs.dbk:908

 msgid ""
 "Unlike most other activities within Debian, information about security "
 "issues must sometimes be kept private for a time.  This allows software "
 msgid ""
 "Unlike most other activities within Debian, information about security "
 "issues must sometimes be kept private for a time.  This allows software "


@@ -1375,31 +1363,31 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:910
+#: pkgs.dbk:915

 msgid "There are several ways developers can learn of a security problem:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "There are several ways developers can learn of a security problem:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:915
+#: pkgs.dbk:920

 msgid "they notice it on a public forum (mailing list, web site, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "they notice it on a public forum (mailing list, web site, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:920
+#: pkgs.dbk:925

 msgid "someone files a bug report"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "someone files a bug report"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:925
+#: pkgs.dbk:930

 msgid "someone informs them via private email"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "someone informs them via private email"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:930
+#: pkgs.dbk:935

 msgid ""
 "In the first two cases, the information is public and it is important to "
 "have a fix as soon as possible.  In the last case, however, it might not be "
 msgid ""
 "In the first two cases, the information is public and it is important to "
 "have a fix as soon as possible.  In the last case, however, it might not be "


@@ -1409,7 +1397,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:938
+#: pkgs.dbk:943

 msgid ""
 "If the security exposure is minor, there is sometimes no need to keep the "
 "problem a secret and a fix should be made and released."
 msgid ""
 "If the security exposure is minor, there is sometimes no need to keep the "
 "problem a secret and a fix should be made and released."


@@ -1417,7 +1405,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:944
+#: pkgs.dbk:949

 msgid ""
 "If the problem is severe, it is preferable to share the information with "
 "other vendors and coordinate a release.  The security team keeps in contact "
 msgid ""
 "If the problem is severe, it is preferable to share the information with "
 "other vendors and coordinate a release.  The security team keeps in contact "


@@ -1426,7 +1414,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:951
+#: pkgs.dbk:956

 msgid ""
 "In all cases if the person who reports the problem asks that it not be "
 "disclosed, such requests should be honored, with the obvious exception of "
 msgid ""
 "In all cases if the person who reports the problem asks that it not be "
 "disclosed, such requests should be honored, with the obvious exception of "


@@ -1437,7 +1425,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:958
+#: pkgs.dbk:963

 msgid ""
 "Please note that if secrecy is needed you may not upload a fix to "
 "<literal>unstable</literal> (or anywhere else, such as a public CVS "
 msgid ""
 "Please note that if secrecy is needed you may not upload a fix to "
 "<literal>unstable</literal> (or anywhere else, such as a public CVS "


@@ -1448,7 +1436,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:965
+#: pkgs.dbk:970

 msgid ""
 "There are two reasons for releasing information even though secrecy is "
 "requested: the problem has been known for a while, or the problem or exploit "
 msgid ""
 "There are two reasons for releasing information even though secrecy is "
 "requested: the problem has been known for a while, or the problem or exploit "


@@ -1456,7 +1444,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:970
+#: pkgs.dbk:975

 msgid ""
 "The Security Team has a PGP-key to enable encrypted communication about "
 "sensitive issues. See the <ulink url=\"http://www.debian.org/security/faq.en."
 msgid ""
 "The Security Team has a PGP-key to enable encrypted communication about "
 "sensitive issues. See the <ulink url=\"http://www.debian.org/security/faq.en."


@@ -1465,13 +1453,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:976
+#: pkgs.dbk:981

 msgid "Security Advisories"
 msgstr "セキュリティ勧告"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Security Advisories"
 msgstr "セキュリティ勧告"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:978
+#: pkgs.dbk:983

 msgid ""
 "Security advisories are only issued for the current, released stable "
 "distribution, and <emphasis>not</emphasis> for <literal>testing</literal> or "
 msgid ""
 "Security advisories are only issued for the current, released stable "
 "distribution, and <emphasis>not</emphasis> for <literal>testing</literal> or "


@@ -1486,61 +1474,61 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:991
+#: pkgs.dbk:996

 msgid "A description of the problem and its scope, including:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "A description of the problem and its scope, including:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

-#: pkgs.dbk:996
+#: pkgs.dbk:1001

 msgid "The type of problem (privilege escalation, denial of service, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "The type of problem (privilege escalation, denial of service, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

-#: pkgs.dbk:1001
+#: pkgs.dbk:1006

 msgid "What privileges may be gained, and by whom (if any)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "What privileges may be gained, and by whom (if any)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

-#: pkgs.dbk:1006
+#: pkgs.dbk:1011

 msgid "How it can be exploited"
 msgstr "どのようにして攻撃が可能なのか"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "How it can be exploited"
 msgstr "どのようにして攻撃が可能なのか"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

-#: pkgs.dbk:1011
+#: pkgs.dbk:1016

 msgid "Whether it is remotely or locally exploitable"
 msgstr "攻撃はリモートから可能なのかそれともローカルから可能なのか"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Whether it is remotely or locally exploitable"
 msgstr "攻撃はリモートから可能なのかそれともローカルから可能なのか"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

-#: pkgs.dbk:1016
+#: pkgs.dbk:1021

 msgid "How the problem was fixed"
 msgstr "どのようにして問題が修正されたのか"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "How the problem was fixed"
 msgstr "どのようにして問題が修正されたのか"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1021
+#: pkgs.dbk:1026

 msgid "This information allows users to assess the threat to their systems."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "This information allows users to assess the threat to their systems."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1026
+#: pkgs.dbk:1031

 msgid "Version numbers of affected packages"
 msgstr "影響を受けるパッケージのバージョン番号"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "Version numbers of affected packages"
 msgstr "影響を受けるパッケージのバージョン番号"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1031
+#: pkgs.dbk:1036

 msgid "Version numbers of fixed packages"
 msgstr "修正されたパッケージのバージョン番号"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "Version numbers of fixed packages"
 msgstr "修正されたパッケージのバージョン番号"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1036
+#: pkgs.dbk:1041

 msgid ""
 "Information on where to obtain the updated packages (usually from the Debian "
 "security archive)"
 msgid ""
 "Information on where to obtain the updated packages (usually from the Debian "
 "security archive)"


@@ -1548,7 +1536,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1042
+#: pkgs.dbk:1047

 msgid ""
 "References to upstream advisories, <ulink url=\"http://cve.mitre.org\">CVE</"
 "ulink> identifiers, and any other information useful in cross-referencing "
 msgid ""
 "References to upstream advisories, <ulink url=\"http://cve.mitre.org\">CVE</"
 "ulink> identifiers, and any other information useful in cross-referencing "


@@ -1557,13 +1545,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1051
+#: pkgs.dbk:1056

 msgid "Preparing packages to address security issues"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Preparing packages to address security issues"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1053
+#: pkgs.dbk:1058

 msgid ""
 "One way that you can assist the security team in their duties is to provide "
 "them with fixed packages suitable for a security advisory for the stable "
 msgid ""
 "One way that you can assist the security team in their duties is to provide "
 "them with fixed packages suitable for a security advisory for the stable "


@@ -1572,7 +1560,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1058
+#: pkgs.dbk:1063

 msgid ""
 "When an update is made to the stable release, care must be taken to avoid "
 "changing system behavior or introducing new bugs.  In order to do this, make "
 msgid ""
 "When an update is made to the stable release, care must be taken to avoid "
 "changing system behavior or introducing new bugs.  In order to do this, make "


@@ -1584,7 +1572,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1066
+#: pkgs.dbk:1071

 msgid ""
 "This means that moving to a new upstream version is not a good solution.  "
 "Instead, the relevant changes should be back-ported to the version present "
 msgid ""
 "This means that moving to a new upstream version is not a good solution.  "
 "Instead, the relevant changes should be back-ported to the version present "


@@ -1595,7 +1583,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1072
+#: pkgs.dbk:1077

 msgid ""
 "In some cases, it is not possible to back-port a security fix, for example "
 "when large amounts of source code need to be modified or rewritten.  If this "
 msgid ""
 "In some cases, it is not possible to back-port a security fix, for example "
 "when large amounts of source code need to be modified or rewritten.  If this "


@@ -1606,7 +1594,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1079
+#: pkgs.dbk:1084

 msgid ""
 "Related to this is another important guideline: always test your changes.  "
 "If you have an exploit available, try it and see if it indeed succeeds on "
 msgid ""
 "Related to this is another important guideline: always test your changes.  "
 "If you have an exploit available, try it and see if it indeed succeeds on "


@@ -1617,7 +1605,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1086
+#: pkgs.dbk:1091

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> include any changes in your "
 "package which are not directly related to fixing the vulnerability.  These "
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> include any changes in your "
 "package which are not directly related to fixing the vulnerability.  These "


@@ -1631,7 +1619,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1096
+#: pkgs.dbk:1101

 msgid ""
 "Review and test your changes as much as possible.  Check the differences "
 "from the previous version repeatedly (<command>interdiff</command> from the "
 msgid ""
 "Review and test your changes as much as possible.  Check the differences "
 "from the previous version repeatedly (<command>interdiff</command> from the "


@@ -1642,12 +1630,12 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1104
+#: pkgs.dbk:1109

 msgid "Be sure to verify the following items:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "Be sure to verify the following items:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1109
+#: pkgs.dbk:1114

 msgid ""
 "<emphasis role=\"strong\">Target the right distribution</emphasis> in your "
 "<filename>debian/changelog</filename>.  For <literal>stable</literal> this "
 msgid ""
 "<emphasis role=\"strong\">Target the right distribution</emphasis> in your "
 "<filename>debian/changelog</filename>.  For <literal>stable</literal> this "


@@ -1660,14 +1648,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1120
+#: pkgs.dbk:1125

 #, fuzzy
 msgid ""
 "The upload should have <emphasis role=\"strong\">urgency=high</emphasis>."
 msgstr "アップロードは urgency=high で行う必要があります。"
 
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid ""
 "The upload should have <emphasis role=\"strong\">urgency=high</emphasis>."
 msgstr "アップロードは urgency=high で行う必要があります。"
 
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1125
+#: pkgs.dbk:1130

 msgid ""
 "Make descriptive, meaningful changelog entries.  Others will rely on them to "
 "determine whether a particular bug was fixed.  Add <literal>closes:</"
 msgid ""
 "Make descriptive, meaningful changelog entries.  Others will rely on them to "
 "determine whether a particular bug was fixed.  Add <literal>closes:</"


@@ -1679,7 +1667,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1136
+#: pkgs.dbk:1141

 msgid ""
 "Make sure the <emphasis role=\"strong\">version number</emphasis> is "
 "proper.  It must be greater than the current package, but less than package "
 msgid ""
 "Make sure the <emphasis role=\"strong\">version number</emphasis> is "
 "proper.  It must be greater than the current package, but less than package "


@@ -1693,7 +1681,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1149
+#: pkgs.dbk:1154

 msgid ""
 "Unless the upstream source has been uploaded to <literal>security.debian.org "
 "</literal> before (by a previous security update), build the upload "
 msgid ""
 "Unless the upstream source has been uploaded to <literal>security.debian.org "
 "</literal> before (by a previous security update), build the upload "


@@ -1705,15 +1693,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1159
+#: pkgs.dbk:1164

 msgid ""
 "Be sure to use the <emphasis role=\"strong\">exact same <filename>*.orig.tar."
 msgid ""
 "Be sure to use the <emphasis role=\"strong\">exact same <filename>*.orig.tar."

-"gz</filename></emphasis> as used in the normal archive, otherwise it is not "
-"possible to move the security fix into the main archives later."
+"{gz,bz2}</filename></emphasis> as used in the normal archive, otherwise it "
+"is not possible to move the security fix into the main archives later."

 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1167
+#: pkgs.dbk:1172

 msgid ""
 "Build the package on a <emphasis role=\"strong\">clean system</emphasis> "
 "which only has packages installed from the distribution you are building "
 msgid ""
 "Build the package on a <emphasis role=\"strong\">clean system</emphasis> "
 "which only has packages installed from the distribution you are building "


@@ -1724,13 +1712,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1178
+#: pkgs.dbk:1183

 msgid "Uploading the fixed package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Uploading the fixed package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1180
+#: pkgs.dbk:1185

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 "upload queue (<literal>oldstable-security</literal>, <literal>stable-"
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 "upload queue (<literal>oldstable-security</literal>, <literal>stable-"


@@ -1741,7 +1729,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1187
+#: pkgs.dbk:1192

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload your fix to <literal> "
 "proposed-updates</literal> without coordinating with the security team.  "
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload your fix to <literal> "
 "proposed-updates</literal> without coordinating with the security team.  "


@@ -1755,7 +1743,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1197
+#: pkgs.dbk:1202

 msgid ""
 "Once you have created and tested the new package and it has been approved by "
 "the security team, it needs to be uploaded so that it can be installed in "
 msgid ""
 "Once you have created and tested the new package and it has been approved by "
 "the security team, it needs to be uploaded so that it can be installed in "


@@ -1765,7 +1753,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1203
+#: pkgs.dbk:1208

 msgid ""
 "Once an upload to the security queue has been accepted, the package will "
 "automatically be built for all architectures and stored for verification by "
 msgid ""
 "Once an upload to the security queue has been accepted, the package will "
 "automatically be built for all architectures and stored for verification by "


@@ -1774,7 +1762,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1208
+#: pkgs.dbk:1213

 msgid ""
 "Uploads which are waiting for acceptance or verification are only accessible "
 "by the security team.  This is necessary since there might be fixes for "
 msgid ""
 "Uploads which are waiting for acceptance or verification are only accessible "
 "by the security team.  This is necessary since there might be fixes for "


@@ -1783,7 +1771,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1213
+#: pkgs.dbk:1218

 msgid ""
 "If a member of the security team accepts a package, it will be installed on "
 "<literal>security.debian.org</literal> as well as proposed for the proper "
 msgid ""
 "If a member of the security team accepts a package, it will be installed on "
 "<literal>security.debian.org</literal> as well as proposed for the proper "


@@ -1793,13 +1781,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:1225
+#: pkgs.dbk:1230

 msgid "Moving, removing, renaming, adopting, and orphaning packages"
 msgstr "パッケージの移動、削除、リネーム、変更、みなしご化"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Moving, removing, renaming, adopting, and orphaning packages"
 msgstr "パッケージの移動、削除、リネーム、変更、みなしご化"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:1227
+#: pkgs.dbk:1232

 msgid ""
 "Some archive manipulation operations are not automated in the Debian upload "
 "process.  These procedures should be manually followed by maintainers.  This "
 msgid ""
 "Some archive manipulation operations are not automated in the Debian upload "
 "process.  These procedures should be manually followed by maintainers.  This "


@@ -1808,20 +1796,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1232
+#: pkgs.dbk:1237

 msgid "Moving packages"
 msgstr "パッケージの移動"
 
 # type: Content of: <chapter><section><section><para><footnote><para>
 #. type: Content of: <chapter><section><section><para><footnote><para>
 msgid "Moving packages"
 msgstr "パッケージの移動"
 
 # type: Content of: <chapter><section><section><para><footnote><para>
 #. type: Content of: <chapter><section><section><para><footnote><para>

-#: pkgs.dbk:1236
+#: pkgs.dbk:1241

 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "guidelines on what section a package belongs in."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "guidelines on what section a package belongs in."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1234
+#: pkgs.dbk:1239

 msgid ""
 "Sometimes a package will change its section.  For instance, a package from "
 "the `non-free' section might be GPL'd in a later version, in which case the "
 msgid ""
 "Sometimes a package will change its section.  For instance, a package from "
 "the `non-free' section might be GPL'd in a later version, in which case the "


@@ -1829,15 +1817,14 @@ msgid ""
 "\" id=\"0\"/>"
 msgstr ""
 
 "\" id=\"0\"/>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1241
+#: pkgs.dbk:1246

 msgid ""
 "If you need to change the section for one of your packages, change the "
 "package control information to place the package in the desired section, and "
 "re-upload the package (see the <ulink url=\"&url-debian-policy;\">Debian "
 "Policy Manual</ulink> for details).  You must ensure that you include the "
 msgid ""
 "If you need to change the section for one of your packages, change the "
 "package control information to place the package in the desired section, and "
 "re-upload the package (see the <ulink url=\"&url-debian-policy;\">Debian "
 "Policy Manual</ulink> for details).  You must ensure that you include the "

-"<filename>.orig.tar.gz</filename> in your upload (even if you are not "
+"<filename>.orig.tar.{gz,bz2}</filename> in your upload (even if you are not "

 "uploading a new upstream version), or it will not appear in the new section "
 "together with the rest of the package.  If your new section is valid, it "
 "will be moved automatically.  If it does not, then contact the ftpmasters in "
 "uploading a new upstream version), or it will not appear in the new section "
 "together with the rest of the package.  If your new section is valid, it "
 "will be moved automatically.  If it does not, then contact the ftpmasters in "


@@ -1846,7 +1833,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1253
+#: pkgs.dbk:1258

 msgid ""
 "If, on the other hand, you need to change the <literal>subsection</literal> "
 "of one of your packages (e.g., ``devel'', ``admin''), the procedure is "
 msgid ""
 "If, on the other hand, you need to change the <literal>subsection</literal> "
 "of one of your packages (e.g., ``devel'', ``admin''), the procedure is "


@@ -1857,13 +1844,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1262
+#: pkgs.dbk:1267

 msgid "Removing packages"
 msgstr "パッケージの削除"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Removing packages"
 msgstr "パッケージの削除"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1264
+#: pkgs.dbk:1269

 msgid ""
 "If for some reason you want to completely remove a package (say, if it is an "
 "old compatibility library which is no longer required), you need to file a "
 msgid ""
 "If for some reason you want to completely remove a package (say, if it is an "
 "old compatibility library which is no longer required), you need to file a "


@@ -1883,7 +1870,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1281
+#: pkgs.dbk:1286

 msgid ""
 "If you want to remove a package you maintain, you should note this in the "
 "bug title by prepending <literal>ROM</literal> (Request Of Maintainer).  "
 msgid ""
 "If you want to remove a package you maintain, you should note this in the "
 "bug title by prepending <literal>ROM</literal> (Request Of Maintainer).  "


@@ -1895,7 +1882,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1290
+#: pkgs.dbk:1295

 msgid ""
 "Note that removals can only be done for the <literal>unstable </literal>, "
 "<literal>experimental</literal> and <literal>stable </literal> "
 msgid ""
 "Note that removals can only be done for the <literal>unstable </literal>, "
 "<literal>experimental</literal> and <literal>stable </literal> "


@@ -1907,7 +1894,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1299
+#: pkgs.dbk:1304

 msgid ""
 "There is one exception when an explicit removal request is not necessary: If "
 "a (source or binary) package is an orphan, it will be removed semi-"
 msgid ""
 "There is one exception when an explicit removal request is not necessary: If "
 "a (source or binary) package is an orphan, it will be removed semi-"


@@ -1920,7 +1907,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1308
+#: pkgs.dbk:1313

 msgid ""
 "In your removal request, you have to detail the reasons justifying the "
 "request.  This is to avoid unwanted removals and to keep a trace of why a "
 msgid ""
 "In your removal request, you have to detail the reasons justifying the "
 "request.  This is to avoid unwanted removals and to keep a trace of why a "


@@ -1930,7 +1917,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1314
+#: pkgs.dbk:1319

 msgid ""
 "Usually you only ask for the removal of a package maintained by yourself.  "
 "If you want to remove another package, you have to get the approval of its "
 msgid ""
 "Usually you only ask for the removal of a package maintained by yourself.  "
 "If you want to remove another package, you have to get the approval of its "


@@ -1943,7 +1930,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1324
+#: pkgs.dbk:1329

 msgid ""
 "Further information relating to these and other package removal related "
 "topics may be found at <ulink url=\"http://wiki.debian.org/ftpmaster_Removals"
 msgid ""
 "Further information relating to these and other package removal related "
 "topics may be found at <ulink url=\"http://wiki.debian.org/ftpmaster_Removals"


@@ -1952,7 +1939,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1329
+#: pkgs.dbk:1334

 msgid ""
 "If in doubt concerning whether a package is disposable, email &email-debian-"
 "devel; asking for opinions.  Also of interest is the <command>apt-cache</"
 msgid ""
 "If in doubt concerning whether a package is disposable, email &email-debian-"
 "devel; asking for opinions.  Also of interest is the <command>apt-cache</"


@@ -1966,26 +1953,28 @@ msgid ""
 "command>.  Removal of orphaned packages is discussed on &email-debian-qa;."
 msgstr ""
 
 "command>.  Removal of orphaned packages is discussed on &email-debian-qa;."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1342
+#: pkgs.dbk:1347

 msgid ""
 "Once the package has been removed, the package's bugs should be handled.  "
 "They should either be reassigned to another package in the case where the "
 "actual code has evolved into another package (e.g.  <literal>libfoo12</"
 "literal> was removed because <literal>libfoo13</literal> supersedes it) or "
 msgid ""
 "Once the package has been removed, the package's bugs should be handled.  "
 "They should either be reassigned to another package in the case where the "
 "actual code has evolved into another package (e.g.  <literal>libfoo12</"
 "literal> was removed because <literal>libfoo13</literal> supersedes it) or "

-"closed if the software is simply no longer part of Debian."
+"closed if the software is simply no longer part of Debian.  When closing the "
+"bugs, to avoid marking the bugs as fixed in versions of the packages in "
+"previous Debian releases, they should be marked as fixed in the version "
+"<literal>&lt;most-recent-version-ever-in-Debian&gt;+rm</literal>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1349
+#: pkgs.dbk:1358

 msgid "Removing packages from <filename>Incoming</filename>"
 msgstr "<filename>Incoming</filename> からパッケージを削除する"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Removing packages from <filename>Incoming</filename>"
 msgstr "<filename>Incoming</filename> からパッケージを削除する"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1351
+#: pkgs.dbk:1360

 msgid ""
 "In the past, it was possible to remove packages from <filename>incoming</"
 "filename>.  However, with the introduction of the new incoming system, this "
 msgid ""
 "In the past, it was possible to remove packages from <filename>incoming</"
 "filename>.  However, with the introduction of the new incoming system, this "


@@ -2000,13 +1989,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1366
+#: pkgs.dbk:1375

 msgid "Replacing or renaming packages"
 msgstr "パッケージをリプレースあるいはリネームする"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Replacing or renaming packages"
 msgstr "パッケージをリプレースあるいはリネームする"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1368
+#: pkgs.dbk:1377

 msgid ""
 "When the upstream maintainers for one of your packages chose to rename their "
 "software (or you made a mistake naming your package), you should follow a "
 msgid ""
 "When the upstream maintainers for one of your packages chose to rename their "
 "software (or you made a mistake naming your package), you should follow a "


@@ -2023,9 +2012,8 @@ msgid ""
 "package's bugs at the same time."
 msgstr ""
 
 "package's bugs at the same time."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1384
+#: pkgs.dbk:1393

 msgid ""
 "At other times, you may make a mistake in constructing your package and wish "
 "to replace it.  The only way to do this is to increase the version number "
 msgid ""
 "At other times, you may make a mistake in constructing your package and wish "
 "to replace it.  The only way to do this is to increase the version number "


@@ -2034,19 +2022,20 @@ msgid ""
 "sources: if you wish to replace the upstream source tarball of your package, "
 "you will need to upload it with a different version.  An easy possibility is "
 "to replace <filename>foo_1.00.orig.tar.gz</filename> with <filename>foo_1.00"
 "sources: if you wish to replace the upstream source tarball of your package, "
 "you will need to upload it with a different version.  An easy possibility is "
 "to replace <filename>foo_1.00.orig.tar.gz</filename> with <filename>foo_1.00"

-"+0.orig.tar.gz</filename>.  This restriction gives each file on the ftp site "
-"a unique name, which helps to ensure consistency across the mirror network."
+"+0.orig.tar.gz</filename> or <filename>foo_1.00.orig.tar.bz2</filename>.  "
+"This restriction gives each file on the ftp site a unique name, which helps "
+"to ensure consistency across the mirror network."

 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1398
+#: pkgs.dbk:1408

 msgid "Orphaning a package"
 msgstr "パッケージをみなしご化する"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Orphaning a package"
 msgstr "パッケージをみなしご化する"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1400
+#: pkgs.dbk:1410

 msgid ""
 "If you can no longer maintain a package, you need to inform others, and see "
 "that the package is marked as orphaned.  You should set the package "
 msgid ""
 "If you can no longer maintain a package, you need to inform others, and see "
 "that the package is marked as orphaned.  You should set the package "


@@ -2065,7 +2054,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1415
+#: pkgs.dbk:1425

 msgid ""
 "If you just intend to give the package away, but you can keep maintainership "
 "for the moment, then you should instead submit a bug against <systemitem "
 msgid ""
 "If you just intend to give the package away, but you can keep maintainership "
 "for the moment, then you should instead submit a bug against <systemitem "


@@ -2077,7 +2066,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1423
+#: pkgs.dbk:1433

 msgid ""
 "More information is on the <ulink url=\"&url-wnpp;\">WNPP web pages</ulink>."
 msgstr ""
 msgid ""
 "More information is on the <ulink url=\"&url-wnpp;\">WNPP web pages</ulink>."
 msgstr ""


@@ -2086,13 +2075,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1429
+#: pkgs.dbk:1439

 msgid "Adopting a package"
 msgstr "パッケージに変更を加える"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Adopting a package"
 msgstr "パッケージに変更を加える"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1431
+#: pkgs.dbk:1441

 msgid ""
 "A list of packages in need of a new maintainer is available in the <ulink "
 "url=\"&url-wnpp;\">Work-Needing and Prospective Packages list (WNPP)</"
 msgid ""
 "A list of packages in need of a new maintainer is available in the <ulink "
 "url=\"&url-wnpp;\">Work-Needing and Prospective Packages list (WNPP)</"


@@ -2103,7 +2092,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1438
+#: pkgs.dbk:1448

 msgid ""
 "It is not OK to simply take over a package that you feel is neglected — that "
 "would be package hijacking.  You can, of course, contact the current "
 msgid ""
 "It is not OK to simply take over a package that you feel is neglected — that "
 "would be package hijacking.  You can, of course, contact the current "


@@ -2114,7 +2103,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1444
+#: pkgs.dbk:1454

 msgid ""
 "Generally, you may not take over the package without the assent of the "
 "current maintainer.  Even if they ignore you, that is still not grounds to "
 msgid ""
 "Generally, you may not take over the package without the assent of the "
 "current maintainer.  Even if they ignore you, that is still not grounds to "


@@ -2127,7 +2116,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1454
+#: pkgs.dbk:1464

 msgid ""
 "If you take over an old package, you probably want to be listed as the "
 "package's official maintainer in the bug system.  This will happen "
 msgid ""
 "If you take over an old package, you probably want to be listed as the "
 "package's official maintainer in the bug system.  This will happen "


@@ -2141,13 +2130,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:1468
+#: pkgs.dbk:1478

 msgid "Porting and being ported"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Porting and being ported"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:1470
+#: pkgs.dbk:1480

 msgid ""
 "Debian supports an ever-increasing number of architectures.  Even if you are "
 "not a porter, and you don't use any architecture but one, it is part of your "
 msgid ""
 "Debian supports an ever-increasing number of architectures.  Even if you are "
 "not a porter, and you don't use any architecture but one, it is part of your "


@@ -2157,7 +2146,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:1476
+#: pkgs.dbk:1486

 msgid ""
 "Porting is the act of building Debian packages for architectures that are "
 "different from the original architecture of the package maintainer's binary "
 msgid ""
 "Porting is the act of building Debian packages for architectures that are "
 "different from the original architecture of the package maintainer's binary "


@@ -2170,13 +2159,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1485
+#: pkgs.dbk:1495

 msgid "Being kind to porters"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Being kind to porters"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1487
+#: pkgs.dbk:1497

 msgid ""
 "Porters have a difficult and unique task, since they are required to deal "
 "with a large volume of packages.  Ideally, every source package should build "
 msgid ""
 "Porters have a difficult and unique task, since they are required to deal "
 "with a large volume of packages.  Ideally, every source package should build "


@@ -2188,7 +2177,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1495
+#: pkgs.dbk:1505

 msgid ""
 "The first and most important thing is to respond quickly to bug or issues "
 "raised by porters.  Please treat porters with courtesy, as if they were in "
 msgid ""
 "The first and most important thing is to respond quickly to bug or issues "
 "raised by porters.  Please treat porters with courtesy, as if they were in "


@@ -2199,7 +2188,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1502
+#: pkgs.dbk:1512

 msgid ""
 "By far, most of the problems encountered by porters are caused by "
 "<emphasis>packaging bugs</emphasis> in the source packages.  Here is a "
 msgid ""
 "By far, most of the problems encountered by porters are caused by "
 "<emphasis>packaging bugs</emphasis> in the source packages.  Here is a "


@@ -2208,7 +2197,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1509
+#: pkgs.dbk:1519

 msgid ""
 "Make sure that your <literal>Build-Depends</literal> and <literal>Build-"
 "Depends-Indep</literal> settings in <filename>debian/control</filename> are "
 msgid ""
 "Make sure that your <literal>Build-Depends</literal> and <literal>Build-"
 "Depends-Indep</literal> settings in <filename>debian/control</filename> are "


@@ -2226,7 +2215,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1524
+#: pkgs.dbk:1534

 msgid ""
 "If you can't set up a proper chroot, <command>dpkg-depcheck</command> may be "
 "of assistance (see <xref linkend=\"dpkg-depcheck\"/> )."
 msgid ""
 "If you can't set up a proper chroot, <command>dpkg-depcheck</command> may be "
 "of assistance (see <xref linkend=\"dpkg-depcheck\"/> )."


@@ -2234,7 +2223,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1528
+#: pkgs.dbk:1538

 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "instructions on setting build dependencies."
 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "instructions on setting build dependencies."


@@ -2242,7 +2231,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1534
+#: pkgs.dbk:1544

 msgid ""
 "Don't set architecture to a value other than <literal>all</literal> or "
 "<literal>any</literal> unless you really mean it.  In too many cases, "
 msgid ""
 "Don't set architecture to a value other than <literal>all</literal> or "
 "<literal>any</literal> unless you really mean it.  In too many cases, "


@@ -2254,7 +2243,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1544
+#: pkgs.dbk:1554

 msgid ""
 "Make sure your source package is correct.  Do <literal>dpkg-source -x "
 "<replaceable>package</replaceable>.dsc</literal> to make sure your source "
 msgid ""
 "Make sure your source package is correct.  Do <literal>dpkg-source -x "
 "<replaceable>package</replaceable>.dsc</literal> to make sure your source "


@@ -2264,7 +2253,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1552
+#: pkgs.dbk:1562

 msgid ""
 "Make sure you don't ship your source package with the <filename>debian/"
 "files</filename> or <filename>debian/substvars</filename> files.  They "
 msgid ""
 "Make sure you don't ship your source package with the <filename>debian/"
 "files</filename> or <filename>debian/substvars</filename> files.  They "


@@ -2274,7 +2263,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1560
+#: pkgs.dbk:1570

 msgid ""
 "Make sure you don't rely on locally installed or hacked configurations or "
 "programs.  For instance, you should never be calling programs in <filename>/"
 msgid ""
 "Make sure you don't rely on locally installed or hacked configurations or "
 "programs.  For instance, you should never be calling programs in <filename>/"


@@ -2285,7 +2274,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1569
+#: pkgs.dbk:1579

 msgid ""
 "Don't depend on the package you're building being installed already (a sub-"
 "case of the above issue). There are, of course, exceptions to this rule, but "
 msgid ""
 "Don't depend on the package you're building being installed already (a sub-"
 "case of the above issue). There are, of course, exceptions to this rule, but "


@@ -2295,7 +2284,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1577
+#: pkgs.dbk:1587

 msgid ""
 "Don't rely on the compiler being a certain version, if possible.  If not, "
 "then make sure your build dependencies reflect the restrictions, although "
 msgid ""
 "Don't rely on the compiler being a certain version, if possible.  If not, "
 "then make sure your build dependencies reflect the restrictions, although "


@@ -2305,7 +2294,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1585
+#: pkgs.dbk:1595

 msgid ""
 "Make sure your debian/rules contains separate <literal>binary-arch</literal> "
 "and <literal>binary-indep</literal> targets, as the Debian Policy Manual "
 msgid ""
 "Make sure your debian/rules contains separate <literal>binary-arch</literal> "
 "and <literal>binary-indep</literal> targets, as the Debian Policy Manual "


@@ -2316,13 +2305,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1596
+#: pkgs.dbk:1606

 msgid "Guidelines for porter uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Guidelines for porter uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1598
+#: pkgs.dbk:1608

 msgid ""
 "If the package builds out of the box for the architecture to be ported to, "
 "you are in luck and your job is easy.  This section applies to that case; it "
 msgid ""
 "If the package builds out of the box for the architecture to be ported to, "
 "you are in luck and your job is easy.  This section applies to that case; it "


@@ -2334,7 +2323,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1606
+#: pkgs.dbk:1616

 msgid ""
 "For a porter upload, no changes are being made to the source.  You do not "
 "need to touch any of the files in the source package.  This includes "
 msgid ""
 "For a porter upload, no changes are being made to the source.  You do not "
 "need to touch any of the files in the source package.  This includes "


@@ -2343,7 +2332,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1611
+#: pkgs.dbk:1621

 msgid ""
 "The way to invoke <command>dpkg-buildpackage</command> is as <literal>dpkg-"
 "buildpackage -B -m<replaceable>porter-email</replaceable></literal>.  Of "
 msgid ""
 "The way to invoke <command>dpkg-buildpackage</command> is as <literal>dpkg-"
 "buildpackage -B -m<replaceable>porter-email</replaceable></literal>.  Of "


@@ -2355,7 +2344,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1620
+#: pkgs.dbk:1630

 msgid ""
 "If you are working on a Debian machine for your porting efforts and you need "
 "to sign your upload locally for its acceptance in the archive, you can run "
 msgid ""
 "If you are working on a Debian machine for your porting efforts and you need "
 "to sign your upload locally for its acceptance in the archive, you can run "


@@ -2366,13 +2355,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1627
+#: pkgs.dbk:1637

 msgid "Recompilation or binary-only NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Recompilation or binary-only NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1629
+#: pkgs.dbk:1639

 msgid ""
 "Sometimes the initial porter upload is problematic because the environment "
 "in which the package was built was not good enough (outdated or obsolete "
 msgid ""
 "Sometimes the initial porter upload is problematic because the environment "
 "in which the package was built was not good enough (outdated or obsolete "


@@ -2385,7 +2374,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1638
+#: pkgs.dbk:1648

 msgid ""
 "You have to make sure that your binary-only NMU doesn't render the package "
 "uninstallable.  This could happen when a source package generates arch-"
 msgid ""
 "You have to make sure that your binary-only NMU doesn't render the package "
 "uninstallable.  This could happen when a source package generates arch-"


@@ -2396,7 +2385,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1645
+#: pkgs.dbk:1655

 msgid ""
 "Despite the required modification of the changelog, these are called binary-"
 "only NMUs — there is no need in this case to trigger all other architectures "
 msgid ""
 "Despite the required modification of the changelog, these are called binary-"
 "only NMUs — there is no need in this case to trigger all other architectures "


@@ -2405,7 +2394,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1650
+#: pkgs.dbk:1660

 msgid ""
 "Such recompilations require special ``magic'' version numbering, so that the "
 "archive maintenance tools recognize that, even though there is a new Debian "
 msgid ""
 "Such recompilations require special ``magic'' version numbering, so that the "
 "archive maintenance tools recognize that, even though there is a new Debian "


@@ -2416,7 +2405,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para><footnote><para>
 #. type: Content of: <chapter><section><section><section><para><footnote><para>
 
 # type: Content of: <chapter><section><section><section><para><footnote><para>
 #. type: Content of: <chapter><section><section><section><para><footnote><para>

-#: pkgs.dbk:1665
+#: pkgs.dbk:1675

 msgid ""
 "In the past, such NMUs used the third-level number on the Debian part of the "
 "revision to denote their recompilation-only status; however, this syntax was "
 msgid ""
 "In the past, such NMUs used the third-level number on the Debian part of the "
 "revision to denote their recompilation-only status; however, this syntax was "


@@ -2426,7 +2415,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1657
+#: pkgs.dbk:1667

 msgid ""
 "The ``magic'' for a recompilation-only NMU is triggered by using a suffix "
 "appended to the package version number, following the form <literal> "
 msgid ""
 "The ``magic'' for a recompilation-only NMU is triggered by using a suffix "
 "appended to the package version number, following the form <literal> "


@@ -2441,7 +2430,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1673
+#: pkgs.dbk:1683

 msgid ""
 "Similar to initial porter uploads, the correct way of invoking <command>dpkg-"
 "buildpackage</command> is <literal>dpkg-buildpackage -B</literal> to only "
 msgid ""
 "Similar to initial porter uploads, the correct way of invoking <command>dpkg-"
 "buildpackage</command> is <literal>dpkg-buildpackage -B</literal> to only "


@@ -2450,13 +2439,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1680
+#: pkgs.dbk:1690

 msgid "When to do a source NMU if you are a porter"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "When to do a source NMU if you are a porter"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1682
+#: pkgs.dbk:1692

 msgid ""
 "Porters doing a source NMU generally follow the guidelines found in <xref "
 "linkend=\"nmu\"/> , just like non-porters.  However, it is expected that the "
 msgid ""
 "Porters doing a source NMU generally follow the guidelines found in <xref "
 "linkend=\"nmu\"/> , just like non-porters.  However, it is expected that the "


@@ -2470,7 +2459,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1691
+#: pkgs.dbk:1701

 msgid ""
 "If you are a porter doing an NMU for <literal>unstable</literal>, the above "
 "guidelines for porting should be followed, with two variations.  Firstly, "
 msgid ""
 "If you are a porter doing an NMU for <literal>unstable</literal>, the above "
 "guidelines for porting should be followed, with two variations.  Firstly, "


@@ -2486,7 +2475,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1703
+#: pkgs.dbk:1713

 msgid ""
 "Secondly, porters doing source NMUs should make sure that the bug they "
 "submit to the BTS should be of severity <literal>serious</literal> or "
 msgid ""
 "Secondly, porters doing source NMUs should make sure that the bug they "
 "submit to the BTS should be of severity <literal>serious</literal> or "


@@ -2498,7 +2487,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1711
+#: pkgs.dbk:1721

 msgid ""
 "Porters should try to avoid patches which simply kludge around bugs in the "
 "current version of the compile environment, kernel, or libc.  Sometimes such "
 msgid ""
 "Porters should try to avoid patches which simply kludge around bugs in the "
 "current version of the compile environment, kernel, or libc.  Sometimes such "


@@ -2510,7 +2499,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1719
+#: pkgs.dbk:1729

 msgid ""
 "Porters may also have an unofficial location where they can put the results "
 "of their work during the waiting period.  This helps others running the port "
 msgid ""
 "Porters may also have an unofficial location where they can put the results "
 "of their work during the waiting period.  This helps others running the port "


@@ -2520,13 +2509,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1729
+#: pkgs.dbk:1739

 msgid "Porting infrastructure and automation"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Porting infrastructure and automation"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1731
+#: pkgs.dbk:1741

 msgid ""
 "There is infrastructure and several tools to help automate package porting.  "
 "This section contains a brief overview of this automation and porting to "
 msgid ""
 "There is infrastructure and several tools to help automate package porting.  "
 "This section contains a brief overview of this automation and porting to "


@@ -2536,13 +2525,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1736
+#: pkgs.dbk:1746

 msgid "Mailing lists and web pages"
 msgstr "メーリングリストとウェブページ"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Mailing lists and web pages"
 msgstr "メーリングリストとウェブページ"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1738
+#: pkgs.dbk:1748

 msgid ""
 "Web pages containing the status of each port can be found at <ulink url="
 "\"&url-debian-ports;\"></ulink>."
 msgid ""
 "Web pages containing the status of each port can be found at <ulink url="
 "\"&url-debian-ports;\"></ulink>."


@@ -2550,7 +2539,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1742
+#: pkgs.dbk:1752

 msgid ""
 "Each port of Debian has a mailing list.  The list of porting mailing lists "
 "can be found at <ulink url=\"&url-debian-port-lists;\"></ulink>.  These "
 msgid ""
 "Each port of Debian has a mailing list.  The list of porting mailing lists "
 "can be found at <ulink url=\"&url-debian-port-lists;\"></ulink>.  These "


@@ -2560,13 +2549,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1750
+#: pkgs.dbk:1760

 msgid "Porter tools"
 msgstr "移植用ツール"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Porter tools"
 msgstr "移植用ツール"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1752
+#: pkgs.dbk:1762

 msgid ""
 "Descriptions of several porting tools can be found in <xref linkend=\"tools-"
 "porting\"/> ."
 msgid ""
 "Descriptions of several porting tools can be found in <xref linkend=\"tools-"
 "porting\"/> ."


@@ -2574,13 +2563,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1758
+#: pkgs.dbk:1768

 msgid "<systemitem role=\"package\">wanna-build</systemitem>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "<systemitem role=\"package\">wanna-build</systemitem>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1760
+#: pkgs.dbk:1770

 msgid ""
 "The <systemitem role=\"package\">wanna-build</systemitem> system is used as "
 "a distributed, client-server build distribution system.  It is usually used "
 msgid ""
 "The <systemitem role=\"package\">wanna-build</systemitem> system is used as "
 "a distributed, client-server build distribution system.  It is usually used "


@@ -2593,7 +2582,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1768
+#: pkgs.dbk:1778

 msgid ""
 "<systemitem role=\"package\">wanna-build</systemitem> is not yet available "
 "as a package; however, all Debian porting efforts are using it for automated "
 msgid ""
 "<systemitem role=\"package\">wanna-build</systemitem> is not yet available "
 "as a package; however, all Debian porting efforts are using it for automated "


@@ -2606,7 +2595,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1777
+#: pkgs.dbk:1787

 msgid ""
 "Most of the data produced by <systemitem role=\"package\">wanna-build </"
 "systemitem> which is generally useful to porters is available on the web at "
 msgid ""
 "Most of the data produced by <systemitem role=\"package\">wanna-build </"
 "systemitem> which is generally useful to porters is available on the web at "


@@ -2616,7 +2605,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1783
+#: pkgs.dbk:1793

 msgid ""
 "We are quite proud of this system, since it has so many possible uses.  "
 "Independent development groups can use the system for different sub-flavors "
 msgid ""
 "We are quite proud of this system, since it has so many possible uses.  "
 "Independent development groups can use the system for different sub-flavors "


@@ -2626,7 +2615,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1790
+#: pkgs.dbk:1800

 msgid ""
 "The wanna-build team, in charge of the buildds, can be reached at "
 "<literal>debian-wb-team@lists.debian.org</literal>.  To determine who (wanna-"
 msgid ""
 "The wanna-build team, in charge of the buildds, can be reached at "
 "<literal>debian-wb-team@lists.debian.org</literal>.  To determine who (wanna-"


@@ -2635,7 +2624,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1797
+#: pkgs.dbk:1807

 msgid ""
 "When requesting binNMUs or give-backs (retries after a failed build), please "
 "use the format described at <ulink url=\"&url-release-wb;\"/>."
 msgid ""
 "When requesting binNMUs or give-backs (retries after a failed build), please "
 "use the format described at <ulink url=\"&url-release-wb;\"/>."


@@ -2643,13 +2632,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1806
+#: pkgs.dbk:1816

 msgid "When your package is <emphasis>not</emphasis> portable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "When your package is <emphasis>not</emphasis> portable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1808
+#: pkgs.dbk:1818

 msgid ""
 "Some packages still have issues with building and/or working on some of the "
 "architectures supported by Debian, and cannot be ported at all, or not "
 msgid ""
 "Some packages still have issues with building and/or working on some of the "
 "architectures supported by Debian, and cannot be ported at all, or not "


@@ -2661,7 +2650,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1815
+#: pkgs.dbk:1825

 msgid ""
 "In order to prevent broken packages from being uploaded to the archive, and "
 "wasting buildd time, you need to do a few things:"
 msgid ""
 "In order to prevent broken packages from being uploaded to the archive, and "
 "wasting buildd time, you need to do a few things:"


@@ -2669,7 +2658,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1821
+#: pkgs.dbk:1831

 msgid ""
 "First, make sure your package <emphasis>does</emphasis> fail to build on "
 "architectures that it cannot support.  There are a few ways to achieve "
 msgid ""
 "First, make sure your package <emphasis>does</emphasis> fail to build on "
 "architectures that it cannot support.  There are a few ways to achieve "


@@ -2682,7 +2671,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1829
+#: pkgs.dbk:1839

 msgid ""
 "Additionally, if you believe the list of supported architectures is pretty "
 "constant, you should change <literal>any</literal> to a list of supported "
 msgid ""
 "Additionally, if you believe the list of supported architectures is pretty "
 "constant, you should change <literal>any</literal> to a list of supported "


@@ -2690,21 +2679,19 @@ msgid ""
 "will fail also, and indicate this to a human reader without actually trying."
 msgstr ""
 
 "will fail also, and indicate this to a human reader without actually trying."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>

 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1837
+#: pkgs.dbk:1847

 msgid ""
 "In order to prevent autobuilders from needlessly trying to build your "
 "package, it must be included in <filename>packages-arch-specific</filename>, "
 "a list used by the <command>wanna-build</command> script.  The current "
 msgid ""
 "In order to prevent autobuilders from needlessly trying to build your "
 "package, it must be included in <filename>packages-arch-specific</filename>, "
 "a list used by the <command>wanna-build</command> script.  The current "

-"version is available as <ulink url=\"&url-cvsweb;srcdep/Packages-arch-"
-"specific?cvsroot=dak\"></ulink>; please see the top of the file for whom to "
-"contact for changes."
+"version is available as <ulink url=\"&url-buildd-p-a-s;\"/>; please see the "
+"top of the file for whom to contact for changes."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1847
+#: pkgs.dbk:1856

 msgid ""
 "Please note that it is insufficient to only add your package to Packages-"
 "arch-specific without making it fail to build on unsupported architectures: "
 msgid ""
 "Please note that it is insufficient to only add your package to Packages-"
 "arch-specific without making it fail to build on unsupported architectures: "


@@ -2717,12 +2704,12 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:1860
+#: pkgs.dbk:1869

 msgid "Non-Maintainer Uploads (NMUs)"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
 msgid "Non-Maintainer Uploads (NMUs)"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:1862
+#: pkgs.dbk:1871

 msgid ""
 "Every package has one or more maintainers. Normally, these are the people "
 "who work on and upload new versions of the package. In some situations, it "
 msgid ""
 "Every package has one or more maintainers. Normally, these are the people "
 "who work on and upload new versions of the package. In some situations, it "


@@ -2734,25 +2721,25 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1871
+#: pkgs.dbk:1880

 #, fuzzy
 msgid "When and how to do an NMU"
 msgstr "誰が NMU 可能なのか"
 
 #. type: Content of: <chapter><section><section><para>
 #, fuzzy
 msgid "When and how to do an NMU"
 msgstr "誰が NMU 可能なのか"
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1874
+#: pkgs.dbk:1883

 msgid "Before doing an NMU, consider the following questions:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Before doing an NMU, consider the following questions:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1879
+#: pkgs.dbk:1888

 msgid ""
 "Does your NMU really fix bugs? Fixing cosmetic issues or changing the "
 "packaging style in NMUs is discouraged."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "Does your NMU really fix bugs? Fixing cosmetic issues or changing the "
 "packaging style in NMUs is discouraged."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1885
+#: pkgs.dbk:1894

 msgid ""
 "Did you give enough time to the maintainer? When was the bug reported to the "
 "BTS? Being busy for a week or two isn't unusual.  Is the bug so severe that "
 msgid ""
 "Did you give enough time to the maintainer? When was the bug reported to the "
 "BTS? Being busy for a week or two isn't unusual.  Is the bug so severe that "


@@ -2760,7 +2747,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1892
+#: pkgs.dbk:1901

 msgid ""
 "How confident are you about your changes? Please remember the Hippocratic "
 "Oath: \"Above all, do no harm.\" It is better to leave a package with an "
 msgid ""
 "How confident are you about your changes? Please remember the Hippocratic "
 "Oath: \"Above all, do no harm.\" It is better to leave a package with an "


@@ -2771,7 +2758,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1902
+#: pkgs.dbk:1911

 msgid ""
 "Have you clearly expressed your intention to NMU, at least in the BTS? It is "
 "also a good idea to try to contact the maintainer by other means (private "
 msgid ""
 "Have you clearly expressed your intention to NMU, at least in the BTS? It is "
 "also a good idea to try to contact the maintainer by other means (private "


@@ -2779,7 +2766,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1909
+#: pkgs.dbk:1918

 msgid ""
 "If the maintainer is usually active and responsive, have you tried to "
 "contact him? In general it should be considered preferable that a maintainer "
 msgid ""
 "If the maintainer is usually active and responsive, have you tried to "
 "contact him? In general it should be considered preferable that a maintainer "


@@ -2790,7 +2777,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1919
+#: pkgs.dbk:1928

 msgid ""
 "When doing an NMU, you must first make sure that your intention to NMU is "
 "clear.  Then, you must send a patch with the differences between the current "
 msgid ""
 "When doing an NMU, you must first make sure that your intention to NMU is "
 "clear.  Then, you must send a patch with the differences between the current "


@@ -2799,7 +2786,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1926
+#: pkgs.dbk:1935

 msgid ""
 "While preparing the patch, you should better be aware of any package-"
 "specific practices that the maintainer might be using. Taking them into "
 msgid ""
 "While preparing the patch, you should better be aware of any package-"
 "specific practices that the maintainer might be using. Taking them into "


@@ -2811,7 +2798,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1934
+#: pkgs.dbk:1943

 msgid ""
 "Unless you have an excellent reason not to do so, you must then give some "
 "time to the maintainer to react (for example, by uploading to the "
 msgid ""
 "Unless you have an excellent reason not to do so, you must then give some "
 "time to the maintainer to react (for example, by uploading to the "


@@ -2820,22 +2807,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1941
+#: pkgs.dbk:1950

 msgid "Upload fixing only release-critical bugs older than 7 days: 2 days"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Upload fixing only release-critical bugs older than 7 days: 2 days"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1946
+#: pkgs.dbk:1955

 msgid "Upload fixing only release-critical and important bugs: 5 days"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Upload fixing only release-critical and important bugs: 5 days"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1951
+#: pkgs.dbk:1960

 msgid "Other NMUs: 10 days"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "Other NMUs: 10 days"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1957
+#: pkgs.dbk:1966

 msgid ""
 "Those delays are only examples. In some cases, such as uploads fixing "
 "security issues, or fixes for trivial bugs that blocking a transition, it is "
 msgid ""
 "Those delays are only examples. In some cases, such as uploads fixing "
 "security issues, or fixes for trivial bugs that blocking a transition, it is "


@@ -2843,7 +2830,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1963
+#: pkgs.dbk:1972

 msgid ""
 "Sometimes, release managers decide to allow NMUs with shorter delays for a "
 "subset of bugs (e.g release-critical bugs older than 7 days). Also, some "
 msgid ""
 "Sometimes, release managers decide to allow NMUs with shorter delays for a "
 "subset of bugs (e.g release-critical bugs older than 7 days). Also, some "


@@ -2856,7 +2843,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1973
+#: pkgs.dbk:1982

 msgid ""
 "After you upload an NMU, you are responsible for the possible problems that "
 "you might have introduced. You must keep an eye on the package (subscribing "
 msgid ""
 "After you upload an NMU, you are responsible for the possible problems that "
 "you might have introduced. You must keep an eye on the package (subscribing "


@@ -2864,7 +2851,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1979
+#: pkgs.dbk:1988

 msgid ""
 "This is not a license to perform NMUs thoughtlessly.  If you NMU when it is "
 "clear that the maintainers are active and would have acknowledged a patch in "
 msgid ""
 "This is not a license to perform NMUs thoughtlessly.  If you NMU when it is "
 "clear that the maintainers are active and would have acknowledged a patch in "


@@ -2874,12 +2861,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1989
+#: pkgs.dbk:1998

 msgid "NMUs and debian/changelog"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "NMUs and debian/changelog"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1991
+#: pkgs.dbk:2000

 msgid ""
 "Just like any other (source) upload, NMUs must add an entry to "
 "<literal>debian/changelog</literal>, telling what has changed with this "
 msgid ""
 "Just like any other (source) upload, NMUs must add an entry to "
 "<literal>debian/changelog</literal>, telling what has changed with this "


@@ -2889,18 +2876,18 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:1996
+#: pkgs.dbk:2005

 #, fuzzy, no-wrap
 msgid "  * Non-maintainer upload.\n"
 msgstr "* Non-maintainer upload"
 
 #. type: Content of: <chapter><section><section><para>
 #, fuzzy, no-wrap
 msgid "  * Non-maintainer upload.\n"
 msgstr "* Non-maintainer upload"
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2000
+#: pkgs.dbk:2009

 msgid "The way to version NMUs differs for native and non-native packages."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "The way to version NMUs differs for native and non-native packages."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2003
+#: pkgs.dbk:2012

 msgid ""
 "If the package is a native package (without a debian revision in the version "
 "number), the version must be the version of the last maintainer upload, plus "
 msgid ""
 "If the package is a native package (without a debian revision in the version "
 "number), the version must be the version of the last maintainer upload, plus "


@@ -2912,7 +2899,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2013
+#: pkgs.dbk:2022

 msgid ""
 "If the package is a not a native package, you should add a minor version "
 "number to the debian revision part of the version number (the portion after "
 msgid ""
 "If the package is a not a native package, you should add a minor version "
 "number to the debian revision part of the version number (the portion after "


@@ -2924,7 +2911,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2022
+#: pkgs.dbk:2031

 msgid ""
 "In both cases, if the last upload was also an NMU, the counter should be "
 "increased. For example, if the current version is <literal>1.5+nmu3</"
 msgid ""
 "In both cases, if the last upload was also an NMU, the counter should be "
 "increased. For example, if the current version is <literal>1.5+nmu3</"


@@ -2933,7 +2920,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2028
+#: pkgs.dbk:2037

 msgid ""
 "A special versioning scheme is needed to avoid disrupting the maintainer's "
 "work, since using an integer for the Debian revision will potentially "
 msgid ""
 "A special versioning scheme is needed to avoid disrupting the maintainer's "
 "work, since using an integer for the Debian revision will potentially "


@@ -2944,7 +2931,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2038
+#: pkgs.dbk:2047

 msgid ""
 "If you upload a package to testing or stable, you sometimes need to \"fork\" "
 "the version number tree. This is the case for security uploads, for "
 msgid ""
 "If you upload a package to testing or stable, you sometimes need to \"fork\" "
 "the version number tree. This is the case for security uploads, for "


@@ -2967,13 +2954,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2060
+#: pkgs.dbk:2069

 #, fuzzy
 msgid "Using the <literal>DELAYED/</literal> queue"
 msgstr "<literal>ftp-master</literal> にアップロードする"
 
 #. type: Content of: <chapter><section><section><para>
 #, fuzzy
 msgid "Using the <literal>DELAYED/</literal> queue"
 msgstr "<literal>ftp-master</literal> にアップロードする"
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2063
+#: pkgs.dbk:2072

 msgid ""
 "Having to wait for a response after you request permission to NMU is "
 "inefficient, because it costs the NMUer a context switch to come back to the "
 msgid ""
 "Having to wait for a response after you request permission to NMU is "
 "inefficient, because it costs the NMUer a context switch to come back to the "


@@ -2987,7 +2974,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2077
+#: pkgs.dbk:2086

 msgid ""
 "The <literal>DELAYED</literal> queue should not be used to put additional "
 "pressure on the maintainer. In particular, it's important that you are "
 msgid ""
 "The <literal>DELAYED</literal> queue should not be used to put additional "
 "pressure on the maintainer. In particular, it's important that you are "


@@ -2996,7 +2983,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2084
+#: pkgs.dbk:2093

 msgid ""
 "If you make an NMU to <literal>DELAYED</literal> and the maintainer updates "
 "his package before the delay expires, your upload will be rejected because a "
 msgid ""
 "If you make an NMU to <literal>DELAYED</literal> and the maintainer updates "
 "his package before the delay expires, your upload will be rejected because a "


@@ -3006,12 +2993,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2094
+#: pkgs.dbk:2103

 msgid "NMUs from the maintainer's point of view"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "NMUs from the maintainer's point of view"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2097
+#: pkgs.dbk:2106

 msgid ""
 "When someone NMUs your package, this means they want to help you to keep it "
 "in good shape.  This gives users fixed packages faster.  You can consider "
 msgid ""
 "When someone NMUs your package, this means they want to help you to keep it "
 "in good shape.  This gives users fixed packages faster.  You can consider "


@@ -3021,7 +3008,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2106
+#: pkgs.dbk:2115

 msgid ""
 "To acknowledge an NMU, include its changes and changelog entry in your next "
 "maintainer upload.  If you do not acknowledge the NMU by including the NMU "
 msgid ""
 "To acknowledge an NMU, include its changes and changelog entry in your next "
 "maintainer upload.  If you do not acknowledge the NMU by including the NMU "


@@ -3030,12 +3017,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2115
+#: pkgs.dbk:2124

 msgid "Source NMUs vs Binary-only NMUs (binNMUs)"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "Source NMUs vs Binary-only NMUs (binNMUs)"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2118
+#: pkgs.dbk:2127

 msgid ""
 "The full name of an NMU is <emphasis>source NMU</emphasis>.  There is also "
 "another type, namely the <emphasis>binary-only NMU</emphasis>, or "
 msgid ""
 "The full name of an NMU is <emphasis>source NMU</emphasis>.  There is also "
 "another type, namely the <emphasis>binary-only NMU</emphasis>, or "


@@ -3044,7 +3031,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2125
+#: pkgs.dbk:2134

 msgid ""
 "When a library (or other dependency) is updated, the packages using it may "
 "need to be rebuilt.  Since no changes to the source are needed, the same "
 msgid ""
 "When a library (or other dependency) is updated, the packages using it may "
 "need to be rebuilt.  Since no changes to the source are needed, the same "


@@ -3052,7 +3039,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2131
+#: pkgs.dbk:2140

 msgid ""
 "BinNMUs are usually triggered on the buildds by wanna-build.  An entry is "
 "added to debian/changelog, explaining why the upload was needed and "
 msgid ""
 "BinNMUs are usually triggered on the buildds by wanna-build.  An entry is "
 "added to debian/changelog, explaining why the upload was needed and "


@@ -3061,7 +3048,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2139
+#: pkgs.dbk:2148

 msgid ""
 "Buildds upload packages for their architecture to the archive as binary-only "
 "uploads.  Strictly speaking, these are binNMUs.  However, they are not "
 msgid ""
 "Buildds upload packages for their architecture to the archive as binary-only "
 "uploads.  Strictly speaking, these are binNMUs.  However, they are not "


@@ -3069,12 +3056,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2147
+#: pkgs.dbk:2156

 msgid "NMUs vs QA uploads"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "NMUs vs QA uploads"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2150
+#: pkgs.dbk:2159

 msgid ""
 "NMUs are uploads of packages by somebody else than their assigned "
 "maintainer.  There is another type of upload where the uploaded package is "
 msgid ""
 "NMUs are uploads of packages by somebody else than their assigned "
 "maintainer.  There is another type of upload where the uploaded package is "


@@ -3082,7 +3069,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2157
+#: pkgs.dbk:2166

 msgid ""
 "QA uploads are very much like normal maintainer uploads: they may fix "
 "anything, even minor issues; the version numbering is normal, and there is "
 msgid ""
 "QA uploads are very much like normal maintainer uploads: they may fix "
 "anything, even minor issues; the version numbering is normal, and there is "


@@ -3092,13 +3079,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:2165
+#: pkgs.dbk:2174

 #, no-wrap
 msgid " * QA upload.\n"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 #, no-wrap
 msgid " * QA upload.\n"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2169
+#: pkgs.dbk:2178

 msgid ""
 "If you want to do an NMU, and it seems that the maintainer is not active, it "
 "is wise to check if the package is orphaned (this information is displayed "
 msgid ""
 "If you want to do an NMU, and it seems that the maintainer is not active, it "
 "is wise to check if the package is orphaned (this information is displayed "


@@ -3110,7 +3097,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2180
+#: pkgs.dbk:2189

 msgid ""
 "Instead of doing a QA upload, you can also consider adopting the package by "
 "making yourself the maintainer.  You don't need permission from anybody to "
 msgid ""
 "Instead of doing a QA upload, you can also consider adopting the package by "
 "making yourself the maintainer.  You don't need permission from anybody to "


@@ -3120,13 +3107,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:2191
+#: pkgs.dbk:2200

 msgid "Collaborative maintenance"
 msgstr "共同メンテナンス"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Collaborative maintenance"
 msgstr "共同メンテナンス"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:2193
+#: pkgs.dbk:2202

 msgid ""
 "Collaborative maintenance is a term describing the sharing of Debian package "
 "maintenance duties by several people.  This collaboration is almost always a "
 msgid ""
 "Collaborative maintenance is a term describing the sharing of Debian package "
 "maintenance duties by several people.  This collaboration is almost always a "


@@ -3138,7 +3125,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:2201
+#: pkgs.dbk:2210

 msgid ""
 "Generally there is a primary maintainer and one or more co-maintainers.  The "
 "primary maintainer is the person whose name is listed in the "
 msgid ""
 "Generally there is a primary maintainer and one or more co-maintainers.  The "
 "primary maintainer is the person whose name is listed in the "


@@ -3150,7 +3137,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:2209
+#: pkgs.dbk:2218

 msgid ""
 "In its most basic form, the process of adding a new co-maintainer is quite "
 "easy:"
 msgid ""
 "In its most basic form, the process of adding a new co-maintainer is quite "
 "easy:"


@@ -3158,7 +3145,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2215
+#: pkgs.dbk:2224

 msgid ""
 "Setup the co-maintainer with access to the sources you build the package "
 "from.  Generally this implies you are using a network-capable version "
 msgid ""
 "Setup the co-maintainer with access to the sources you build the package "
 "from.  Generally this implies you are using a network-capable version "


@@ -3169,7 +3156,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2223
+#: pkgs.dbk:2232

 msgid ""
 "Add the co-maintainer's correct maintainer name and address to the "
 "<literal>Uploaders</literal> field in the first paragraph of the "
 msgid ""
 "Add the co-maintainer's correct maintainer name and address to the "
 "<literal>Uploaders</literal> field in the first paragraph of the "


@@ -3178,14 +3165,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><screen>
 #. type: Content of: <chapter><section><itemizedlist><listitem><screen>
 
 # type: Content of: <chapter><section><itemizedlist><listitem><screen>
 #. type: Content of: <chapter><section><itemizedlist><listitem><screen>

-#: pkgs.dbk:2228
+#: pkgs.dbk:2237

 #, fuzzy, no-wrap
 msgid "Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex &lt;arex@debian.org&gt;\n"
 msgstr "Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex &lt;arex@debian.org&gt;"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 #, fuzzy, no-wrap
 msgid "Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex &lt;arex@debian.org&gt;\n"
 msgstr "Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex &lt;arex@debian.org&gt;"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2233
+#: pkgs.dbk:2242

 msgid ""
 "Using the PTS (<xref linkend=\"pkg-tracking-system\"/> ), the co-maintainers "
 "should subscribe themselves to the appropriate source package."
 msgid ""
 "Using the PTS (<xref linkend=\"pkg-tracking-system\"/> ), the co-maintainers "
 "should subscribe themselves to the appropriate source package."


@@ -3193,7 +3180,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:2239
+#: pkgs.dbk:2248

 msgid ""
 "Another form of collaborative maintenance is team maintenance, which is "
 "recommended if you maintain several packages with the same group of "
 msgid ""
 "Another form of collaborative maintenance is team maintenance, which is "
 "recommended if you maintain several packages with the same group of "


@@ -3204,7 +3191,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>

-#: pkgs.dbk:2248
+#: pkgs.dbk:2257

 msgid ""
 "Put the team member mainly responsible for the package in the Maintainer "
 "field.  In the Uploaders, put the mailing list address, and the team members "
 msgid ""
 "Put the team member mainly responsible for the package in the Maintainer "
 "field.  In the Uploaders, put the mailing list address, and the team members "


@@ -3213,7 +3200,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>

-#: pkgs.dbk:2255
+#: pkgs.dbk:2264

 msgid ""
 "Put the mailing list address in the Maintainer field.  In the Uploaders "
 "field, put the team members who care for the package.  In this case, you "
 msgid ""
 "Put the mailing list address in the Maintainer field.  In the Uploaders "
 "field, put the team members who care for the package.  In this case, you "


@@ -3223,7 +3210,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:2263
+#: pkgs.dbk:2272

 msgid ""
 "In any case, it is a bad idea to automatically put all team members in the "
 "Uploaders field.  It clutters the Developer's Package Overview listing (see "
 msgid ""
 "In any case, it is a bad idea to automatically put all team members in the "
 "Uploaders field.  It clutters the Developer's Package Overview listing (see "


@@ -3233,19 +3220,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: pkgs.dbk:2271
+#: pkgs.dbk:2280

 msgid "The testing distribution"
 msgstr "テスト版ディストリビューション"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgid "The testing distribution"
 msgstr "テスト版ディストリビューション"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2273
+#: pkgs.dbk:2282

 msgid "Basics"
 msgstr "基本"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Basics"
 msgstr "基本"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2275
+#: pkgs.dbk:2284

 msgid ""
 "Packages are usually installed into the <literal>testing</literal> "
 "distribution after they have undergone some degree of <literal>testing</"
 msgid ""
 "Packages are usually installed into the <literal>testing</literal> "
 "distribution after they have undergone some degree of <literal>testing</"


@@ -3254,7 +3241,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2280
+#: pkgs.dbk:2289

 msgid ""
 "They must be in sync on all architectures and mustn't have dependencies that "
 "make them uninstallable; they also have to have generally no known release-"
 msgid ""
 "They must be in sync on all architectures and mustn't have dependencies that "
 "make them uninstallable; they also have to have generally no known release-"


@@ -3265,13 +3252,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2289
+#: pkgs.dbk:2298

 msgid "Updates from unstable"
 msgstr "不安定版からの更新"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Updates from unstable"
 msgstr "不安定版からの更新"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2291
+#: pkgs.dbk:2300

 msgid ""
 "The scripts that update the <literal>testing</literal> distribution are run "
 "twice each day, right after the installation of the updated packages; these "
 msgid ""
 "The scripts that update the <literal>testing</literal> distribution are run "
 "twice each day, right after the installation of the updated packages; these "


@@ -3283,7 +3270,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2299
+#: pkgs.dbk:2308

 msgid ""
 "The inclusion of a package from <literal>unstable</literal> is conditional "
 "on the following:"
 msgid ""
 "The inclusion of a package from <literal>unstable</literal> is conditional "
 "on the following:"


@@ -3291,7 +3278,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2305
+#: pkgs.dbk:2314

 msgid ""
 "The package must have been available in <literal>unstable</literal> for 2, 5 "
 "or 10 days, depending on the urgency (high, medium or low).  Please note "
 msgid ""
 "The package must have been available in <literal>unstable</literal> for 2, 5 "
 "or 10 days, depending on the urgency (high, medium or low).  Please note "


@@ -3303,7 +3290,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2315
+#: pkgs.dbk:2324

 msgid ""
 "It must not have new release-critical bugs (RC bugs affecting the version "
 "available in <literal>unstable</literal>, but not affecting the version in "
 msgid ""
 "It must not have new release-critical bugs (RC bugs affecting the version "
 "available in <literal>unstable</literal>, but not affecting the version in "


@@ -3312,7 +3299,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2322
+#: pkgs.dbk:2331

 msgid ""
 "It must be available on all architectures on which it has previously been "
 "built in <literal>unstable</literal>.  <xref linkend=\"dak-ls\"/> may be of "
 msgid ""
 "It must be available on all architectures on which it has previously been "
 "built in <literal>unstable</literal>.  <xref linkend=\"dak-ls\"/> may be of "


@@ -3321,7 +3308,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2329
+#: pkgs.dbk:2338

 msgid ""
 "It must not break any dependency of a package which is already available in "
 "<literal>testing</literal>;"
 msgid ""
 "It must not break any dependency of a package which is already available in "
 "<literal>testing</literal>;"


@@ -3329,7 +3316,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2335
+#: pkgs.dbk:2344

 msgid ""
 "The packages on which it depends must either be available in "
 "<literal>testing</literal> or they must be accepted into <literal>testing</"
 msgid ""
 "The packages on which it depends must either be available in "
 "<literal>testing</literal> or they must be accepted into <literal>testing</"


@@ -3339,7 +3326,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2343
+#: pkgs.dbk:2352

 msgid ""
 "To find out whether a package is progressing into <literal>testing</literal> "
 "or not, see the <literal>testing</literal> script output on the <ulink url="
 msgid ""
 "To find out whether a package is progressing into <literal>testing</literal> "
 "or not, see the <literal>testing</literal> script output on the <ulink url="


@@ -3353,7 +3340,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2354
+#: pkgs.dbk:2363

 msgid ""
 "The <filename>update_excuses</filename> file does not always give the "
 "precise reason why the package is refused; you may have to find it on your "
 msgid ""
 "The <filename>update_excuses</filename> file does not always give the "
 "precise reason why the package is refused; you may have to find it on your "


@@ -3364,7 +3351,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2361
+#: pkgs.dbk:2370

 msgid ""
 "Sometimes, some packages never enter <literal>testing</literal> because the "
 "set of inter-relationship is too complicated and cannot be sorted out by the "
 msgid ""
 "Sometimes, some packages never enter <literal>testing</literal> because the "
 "set of inter-relationship is too complicated and cannot be sorted out by the "


@@ -3373,7 +3360,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2366
+#: pkgs.dbk:2375

 msgid ""
 "Some further dependency analysis is shown on <ulink url=\"http://release."
 "debian.org/migration/\"></ulink> — but be warned, this page also shows build "
 msgid ""
 "Some further dependency analysis is shown on <ulink url=\"http://release."
 "debian.org/migration/\"></ulink> — but be warned, this page also shows build "


@@ -3382,14 +3369,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2371
+#: pkgs.dbk:2380

 msgid "out-of-date"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #.  FIXME: better rename this file than document rampant professionalism? 
 #. type: Content of: <chapter><section><section><section><para>
 msgid "out-of-date"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #.  FIXME: better rename this file than document rampant professionalism? 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2374
+#: pkgs.dbk:2383

 msgid ""
 "For the <literal>testing</literal> migration script, outdated means: There "
 "are different versions in <literal>unstable</literal> for the release "
 msgid ""
 "For the <literal>testing</literal> migration script, outdated means: There "
 "are different versions in <literal>unstable</literal> for the release "


@@ -3401,55 +3388,55 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2382
+#: pkgs.dbk:2391

 msgid "Consider this example:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 msgid "Consider this example:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2389 pkgs.dbk:2422
+#: pkgs.dbk:2398 pkgs.dbk:2431

 msgid "alpha"
 msgstr "alpha"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 msgid "alpha"
 msgstr "alpha"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2390 pkgs.dbk:2423
+#: pkgs.dbk:2399 pkgs.dbk:2432

 msgid "arm"
 msgstr "arm"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 msgid "arm"
 msgstr "arm"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2395 pkgs.dbk:2429 pkgs.dbk:2491
+#: pkgs.dbk:2404 pkgs.dbk:2438 pkgs.dbk:2500

 msgid "testing"
 msgstr "テスト版"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "testing"
 msgstr "テスト版"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2396 pkgs.dbk:2401 pkgs.dbk:2430 pkgs.dbk:2431 pkgs.dbk:2438
+#: pkgs.dbk:2405 pkgs.dbk:2410 pkgs.dbk:2439 pkgs.dbk:2440 pkgs.dbk:2447

 msgid "1"
 msgstr "1"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "1"
 msgstr "1"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2397 pkgs.dbk:2432 pkgs.dbk:2437
+#: pkgs.dbk:2406 pkgs.dbk:2441 pkgs.dbk:2446

 msgid "-"
 msgstr "-"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 msgid "-"
 msgstr "-"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2400 pkgs.dbk:2435 pkgs.dbk:2492
+#: pkgs.dbk:2409 pkgs.dbk:2444 pkgs.dbk:2501

 msgid "unstable"
 msgstr "不安定版"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "unstable"
 msgstr "不安定版"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2402 pkgs.dbk:2436
+#: pkgs.dbk:2411 pkgs.dbk:2445

 msgid "2"
 msgstr "2"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "2"
 msgstr "2"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2408
+#: pkgs.dbk:2417

 msgid ""
 "The package is out of date on alpha in <literal>unstable</literal>, and will "
 "not go to <literal>testing</literal>. Removing the package would not help at "
 msgid ""
 "The package is out of date on alpha in <literal>unstable</literal>, and will "
 "not go to <literal>testing</literal>. Removing the package would not help at "


@@ -3459,7 +3446,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2414
+#: pkgs.dbk:2423

 msgid ""
 "However, if ftp-master removes a package in <literal>unstable</literal> "
 "(here on <literal>arm</literal>):"
 msgid ""
 "However, if ftp-master removes a package in <literal>unstable</literal> "
 "(here on <literal>arm</literal>):"


@@ -3467,13 +3454,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2424
+#: pkgs.dbk:2433

 msgid "hurd-i386"
 msgstr "hurd-i386"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "hurd-i386"
 msgstr "hurd-i386"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2444
+#: pkgs.dbk:2453

 msgid ""
 "In this case, the package is up to date on all release architectures in "
 "<literal>unstable</literal> (and the extra <literal>hurd-i386</literal> "
 msgid ""
 "In this case, the package is up to date on all release architectures in "
 "<literal>unstable</literal> (and the extra <literal>hurd-i386</literal> "


@@ -3482,7 +3469,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2449
+#: pkgs.dbk:2458

 msgid ""
 "Sometimes, the question is raised if it is possible to allow packages in "
 "that are not yet built on all architectures: No.  Just plainly no.  (Except "
 msgid ""
 "Sometimes, the question is raised if it is possible to allow packages in "
 "that are not yet built on all architectures: No.  Just plainly no.  (Except "


@@ -3491,13 +3478,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2456
+#: pkgs.dbk:2465

 msgid "Removals from testing"
 msgstr "テスト版からの削除"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Removals from testing"
 msgstr "テスト版からの削除"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2458
+#: pkgs.dbk:2467

 msgid ""
 "Sometimes, a package is removed to allow another package in: This happens "
 "only to allow <emphasis>another</emphasis> package to go in if it's ready in "
 msgid ""
 "Sometimes, a package is removed to allow another package in: This happens "
 "only to allow <emphasis>another</emphasis> package to go in if it's ready in "


@@ -3508,7 +3495,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2465
+#: pkgs.dbk:2474

 msgid ""
 "Of course, there is another reason to remove a package from <literal>testing "
 "</literal>: It's just too buggy (and having a single RC-bug is enough to be "
 msgid ""
 "Of course, there is another reason to remove a package from <literal>testing "
 "</literal>: It's just too buggy (and having a single RC-bug is enough to be "


@@ -3517,7 +3504,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2470
+#: pkgs.dbk:2479

 msgid ""
 "Furthermore, if a package has been removed from <literal>unstable</literal>, "
 "and no package in <literal>testing</literal> depends on it any more, then it "
 msgid ""
 "Furthermore, if a package has been removed from <literal>unstable</literal>, "
 "and no package in <literal>testing</literal> depends on it any more, then it "


@@ -3526,13 +3513,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2477
+#: pkgs.dbk:2486

 msgid "circular dependencies"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "circular dependencies"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2479
+#: pkgs.dbk:2488

 msgid ""
 "A situation which is not handled very well by britney is if package "
 "<literal>a</literal> depends on the new version of package <literal>b</"
 msgid ""
 "A situation which is not handled very well by britney is if package "
 "<literal>a</literal> depends on the new version of package <literal>b</"


@@ -3541,49 +3528,49 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2484
+#: pkgs.dbk:2493

 msgid "An example of this is:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "An example of this is:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2497
+#: pkgs.dbk:2506

 msgid "a"
 msgstr "a"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "a"
 msgstr "a"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2498
+#: pkgs.dbk:2507

 msgid "1; depends: b=1"
 msgstr "1; depends: b=1"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "1; depends: b=1"
 msgstr "1; depends: b=1"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2499
+#: pkgs.dbk:2508

 msgid "2; depends: b=2"
 msgstr "2; depends: b=2"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "2; depends: b=2"
 msgstr "2; depends: b=2"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2502
+#: pkgs.dbk:2511

 msgid "b"
 msgstr "b"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "b"
 msgstr "b"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2503
+#: pkgs.dbk:2512

 msgid "1; depends: a=1"
 msgstr "1; depends: a=1"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "1; depends: a=1"
 msgstr "1; depends: a=1"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2504
+#: pkgs.dbk:2513

 msgid "2; depends: a=2"
 msgstr "2; depends: a=2"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "2; depends: a=2"
 msgstr "2; depends: a=2"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2510
+#: pkgs.dbk:2519

 msgid ""
 "Neither package <literal>a</literal> nor package <literal>b</literal> is "
 "considered for update."
 msgid ""
 "Neither package <literal>a</literal> nor package <literal>b</literal> is "
 "considered for update."


@@ -3591,7 +3578,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2514
+#: pkgs.dbk:2523

 msgid ""
 "Currently, this requires some manual hinting from the release team.  Please "
 "contact them by sending mail to &email-debian-release; if this happens to "
 msgid ""
 "Currently, this requires some manual hinting from the release team.  Please "
 "contact them by sending mail to &email-debian-release; if this happens to "


@@ -3600,13 +3587,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2521
+#: pkgs.dbk:2530

 msgid "influence of package in testing"
 msgstr "テスト版パッケージへの影響"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "influence of package in testing"
 msgstr "テスト版パッケージへの影響"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2523
+#: pkgs.dbk:2532

 msgid ""
 "Generally, there is nothing that the status of a package in <literal>testing "
 "</literal> means for transition of the next version from <literal>unstable </"
 msgid ""
 "Generally, there is nothing that the status of a package in <literal>testing "
 "</literal> means for transition of the next version from <literal>unstable </"


@@ -3623,7 +3610,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2535
+#: pkgs.dbk:2544

 msgid ""
 "In summary this means: The only influence that a package being in <literal> "
 "testing</literal> has on a new version of the same package is that the new "
 msgid ""
 "In summary this means: The only influence that a package being in <literal> "
 "testing</literal> has on a new version of the same package is that the new "


@@ -3632,19 +3619,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2542
+#: pkgs.dbk:2551

 msgid "details"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "details"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2544
+#: pkgs.dbk:2553

 msgid "If you are interested in details, this is how britney works:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "If you are interested in details, this is how britney works:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2547
+#: pkgs.dbk:2556

 msgid ""
 "The packages are looked at to determine whether they are valid candidates.  "
 "This gives the update excuses.  The most common reasons why a package is not "
 msgid ""
 "The packages are looked at to determine whether they are valid candidates.  "
 "This gives the update excuses.  The most common reasons why a package is not "


@@ -3658,7 +3645,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2556
+#: pkgs.dbk:2565

 msgid ""
 "Now, the more complex part happens: Britney tries to update <literal>testing "
 "</literal> with the valid candidates. For that, britney tries to add each "
 msgid ""
 "Now, the more complex part happens: Britney tries to update <literal>testing "
 "</literal> with the valid candidates. For that, britney tries to add each "


@@ -3672,7 +3659,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2566
+#: pkgs.dbk:2575

 msgid ""
 "If you want to see more details, you can look it up on <filename>merkel:/org/"
 "&ftp-debian-org;/testing/update_out/</filename> (or in <filename>merkel:~aba/"
 msgid ""
 "If you want to see more details, you can look it up on <filename>merkel:/org/"
 "&ftp-debian-org;/testing/update_out/</filename> (or in <filename>merkel:~aba/"


@@ -3683,7 +3670,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2573
+#: pkgs.dbk:2582

 msgid ""
 "The hints are available via <ulink url=\"http://&ftp-master-host;/testing/"
 "hints/\"></ulink>."
 msgid ""
 "The hints are available via <ulink url=\"http://&ftp-master-host;/testing/"
 "hints/\"></ulink>."


@@ -3691,13 +3678,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2581
+#: pkgs.dbk:2590

 msgid "Direct updates to testing"
 msgstr "直接テスト版を更新する"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Direct updates to testing"
 msgstr "直接テスト版を更新する"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2583
+#: pkgs.dbk:2592

 msgid ""
 "The <literal>testing</literal> distribution is fed with packages from "
 "<literal>unstable</literal> according to the rules explained above.  "
 msgid ""
 "The <literal>testing</literal> distribution is fed with packages from "
 "<literal>unstable</literal> according to the rules explained above.  "


@@ -3708,7 +3695,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2590
+#: pkgs.dbk:2599

 msgid ""
 "Keep in mind that packages uploaded there are not automatically processed, "
 "they have to go through the hands of the release manager.  So you'd better "
 msgid ""
 "Keep in mind that packages uploaded there are not automatically processed, "
 "they have to go through the hands of the release manager.  So you'd better "


@@ -3719,7 +3706,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2597
+#: pkgs.dbk:2606

 msgid ""
 "You should not upload to <literal>testing-proposed-updates</literal> when "
 "you can update your packages through <literal>unstable</literal>.  If you "
 msgid ""
 "You should not upload to <literal>testing-proposed-updates</literal> when "
 "you can update your packages through <literal>unstable</literal>.  If you "


@@ -3733,7 +3720,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2606
+#: pkgs.dbk:2615

 msgid ""
 "Version numbers are usually selected by adding the codename of the "
 "<literal>testing</literal> distribution and a running number, like "
 msgid ""
 "Version numbers are usually selected by adding the codename of the "
 "<literal>testing</literal> distribution and a running number, like "


@@ -3743,13 +3730,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2613
+#: pkgs.dbk:2622

 msgid "Please make sure you didn't miss any of these items in your upload:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Please make sure you didn't miss any of these items in your upload:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2618
+#: pkgs.dbk:2627

 msgid ""
 "Make sure that your package really needs to go through <literal>testing-"
 "proposed-updates</literal>, and can't go through <literal> unstable</"
 msgid ""
 "Make sure that your package really needs to go through <literal>testing-"
 "proposed-updates</literal>, and can't go through <literal> unstable</"


@@ -3758,20 +3745,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2625
+#: pkgs.dbk:2634

 msgid "Make sure that you included only the minimal amount of changes;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Make sure that you included only the minimal amount of changes;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2630
+#: pkgs.dbk:2639

 msgid ""
 "Make sure that you included an appropriate explanation in the changelog;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "Make sure that you included an appropriate explanation in the changelog;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2635
+#: pkgs.dbk:2644

 msgid ""
 "Make sure that you've written <literal>testing</literal> or <literal>testing-"
 "proposed-updates</literal> into your target distribution;"
 msgid ""
 "Make sure that you've written <literal>testing</literal> or <literal>testing-"
 "proposed-updates</literal> into your target distribution;"


@@ -3779,7 +3766,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2641
+#: pkgs.dbk:2650

 msgid ""
 "Make sure that you've built and tested your package in <literal>testing</"
 "literal>, not in <literal>unstable</literal>;"
 msgid ""
 "Make sure that you've built and tested your package in <literal>testing</"
 "literal>, not in <literal>unstable</literal>;"


@@ -3787,7 +3774,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2647
+#: pkgs.dbk:2656

 msgid ""
 "Make sure that your version number is higher than the version in "
 "<literal>testing</literal> and <literal>testing-proposed-updates</literal>, "
 msgid ""
 "Make sure that your version number is higher than the version in "
 "<literal>testing</literal> and <literal>testing-proposed-updates</literal>, "


@@ -3796,7 +3783,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2654
+#: pkgs.dbk:2663

 msgid ""
 "After uploading and successful build on all platforms, contact the release "
 "team at &email-debian-release; and ask them to approve your upload."
 msgid ""
 "After uploading and successful build on all platforms, contact the release "
 "team at &email-debian-release; and ask them to approve your upload."


@@ -3804,19 +3791,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2662
+#: pkgs.dbk:2671

 msgid "Frequently asked questions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 msgid "Frequently asked questions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2664
+#: pkgs.dbk:2673

 msgid "What are release-critical bugs, and how do they get counted?"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "What are release-critical bugs, and how do they get counted?"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2666
+#: pkgs.dbk:2675

 msgid ""
 "All bugs of some higher severities are by default considered release-"
 "critical; currently, these are <literal>critical</literal>, <literal>grave</"
 msgid ""
 "All bugs of some higher severities are by default considered release-"
 "critical; currently, these are <literal>critical</literal>, <literal>grave</"


@@ -3825,7 +3812,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2671
+#: pkgs.dbk:2680

 msgid ""
 "Such bugs are presumed to have an impact on the chances that the package "
 "will be released with the <literal>stable</literal> release of Debian: in "
 msgid ""
 "Such bugs are presumed to have an impact on the chances that the package "
 "will be released with the <literal>stable</literal> release of Debian: in "


@@ -3836,7 +3823,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2678
+#: pkgs.dbk:2687

 msgid ""
 "The <literal>unstable</literal> bug count are all release-critical bugs "
 "which are marked to apply to <replaceable>package</replaceable>/"
 msgid ""
 "The <literal>unstable</literal> bug count are all release-critical bugs "
 "which are marked to apply to <replaceable>package</replaceable>/"


@@ -3847,7 +3834,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2686
+#: pkgs.dbk:2695

 msgid ""
 "How could installing a package into <literal>testing</literal> possibly "
 "break other packages?"
 msgid ""
 "How could installing a package into <literal>testing</literal> possibly "
 "break other packages?"


@@ -3855,7 +3842,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2689
+#: pkgs.dbk:2698

 msgid ""
 "The structure of the distribution archives is such that they can only "
 "contain one version of a package; a package is defined by its name.  So when "
 msgid ""
 "The structure of the distribution archives is such that they can only "
 "contain one version of a package; a package is defined by its name.  So when "


@@ -3867,7 +3854,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2697
+#: pkgs.dbk:2706

 msgid ""
 "However, the old version may have provided a binary package with an old "
 "soname of a library, such as <literal>libacme-foo0</literal>.  Removing the "
 msgid ""
 "However, the old version may have provided a binary package with an old "
 "soname of a library, such as <literal>libacme-foo0</literal>.  Removing the "


@@ -3877,7 +3864,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2703
+#: pkgs.dbk:2712

 msgid ""
 "Evidently, this mainly affects packages which provide changing sets of "
 "binary packages in different versions (in turn, mainly libraries).  However, "
 msgid ""
 "Evidently, this mainly affects packages which provide changing sets of "
 "binary packages in different versions (in turn, mainly libraries).  However, "


@@ -3887,7 +3874,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2709
+#: pkgs.dbk:2718

 msgid ""
 "When the set of binary packages provided by a source package change in this "
 "way, all the packages that depended on the old binaries will have to be "
 msgid ""
 "When the set of binary packages provided by a source package change in this "
 "way, all the packages that depended on the old binaries will have to be "


@@ -3902,7 +3889,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2720
+#: pkgs.dbk:2729

 msgid ""
 "If you are having problems with complicated groups of packages like this, "
 "contact &email-debian-devel; or &email-debian-release; for help."
 msgid ""
 "If you are having problems with complicated groups of packages like this, "
 "contact &email-debian-devel; or &email-debian-release; for help."

diff --git a/po4a/ja/resources.po b/po4a/ja/resources.po
index e73a9da0146fd1214bddb68ed64e079a17684fa8..19ca603cf3286dcd44f29a257239cdaaf8580451 100644 (file)
--- a/po4a/ja/resources.po
+++ b/po4a/ja/resources.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.4.0\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.4.0\n"

-"POT-Creation-Date: 2009-09-06 02:31+0900\n"
+"POT-Creation-Date: 2010-01-04 00:20+0100\n"

 "PO-Revision-Date: 2008-10-24 04:27+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
 "PO-Revision-Date: 2008-10-24 04:27+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"


@@ -302,14 +302,13 @@ msgstr ""
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 #: resources.dbk:151
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 #: resources.dbk:151

+#, fuzzy

 msgid ""
 "Since <literal>#debian-devel</literal> is an open channel, you should not "
 "speak there of issues that are discussed in &email-debian-private;.  There's "
 "another channel for this purpose, it's called <literal>#debian-private</"
 msgid ""
 "Since <literal>#debian-devel</literal> is an open channel, you should not "
 "speak there of issues that are discussed in &email-debian-private;.  There's "
 "another channel for this purpose, it's called <literal>#debian-private</"

-"literal> and it's protected by a key.  This key is available in the archives "
-"of debian-private in <filename>master.debian.org:&file-debian-private-"
-"archive;</filename>, just <command>zgrep</command> for <literal>#debian-"
-"private</literal> in all the files."
+"literal> and it's protected by a key.  This key is available at "
+"<filename>master.debian.org:&file-debian-private-key;</filename>."

 msgstr ""
 "<literal>#debian-devel</literal> は公開チャンネルなので、&email-debian-"
 "private; で話されている話題について触れるべきではありません。この目的の為に"
 msgstr ""
 "<literal>#debian-devel</literal> は公開チャンネルなので、&email-debian-"
 "private; で話されている話題について触れるべきではありません。この目的の為に"


@@ -320,7 +319,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:161
+#: resources.dbk:159

 msgid ""
 "There are other additional channels dedicated to specific subjects.  "
 "<literal>#debian-bugs</literal> is used for coordinating bug squashing "
 msgid ""
 "There are other additional channels dedicated to specific subjects.  "
 "<literal>#debian-bugs</literal> is used for coordinating bug squashing "


@@ -344,7 +343,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:172
+#: resources.dbk:170

 msgid ""
 "Some non-English developers' channels exist as well, for example "
 "<literal>#debian-devel-fr</literal> for French speaking people interested in "
 msgid ""
 "Some non-English developers' channels exist as well, for example "
 "<literal>#debian-devel-fr</literal> for French speaking people interested in "


@@ -356,7 +355,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:177
+#: resources.dbk:175

 msgid ""
 "Channels dedicated to Debian also exist on other IRC networks, notably on "
 "the <ulink url=\"&url-openprojects;\">freenode</ulink> IRC network, which "
 msgid ""
 "Channels dedicated to Debian also exist on other IRC networks, notably on "
 "the <ulink url=\"&url-openprojects;\">freenode</ulink> IRC network, which "


@@ -369,7 +368,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:183
+#: resources.dbk:181

 msgid ""
 "To get a cloak on freenode, you send Jörg Jaspert &lt;joerg@debian.org&gt; a "
 "signed mail where you tell what your nick is.  Put cloak somewhere in the "
 msgid ""
 "To get a cloak on freenode, you send Jörg Jaspert &lt;joerg@debian.org&gt; a "
 "signed mail where you tell what your nick is.  Put cloak somewhere in the "


@@ -390,13 +389,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:194
+#: resources.dbk:192

 msgid "Documentation"
 msgstr "ドキュメント化"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Documentation"
 msgstr "ドキュメント化"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:196
+#: resources.dbk:194

 msgid ""
 "This document contains a lot of information which is useful to Debian "
 "developers, but it cannot contain everything.  Most of the other interesting "
 msgid ""
 "This document contains a lot of information which is useful to Debian "
 "developers, but it cannot contain everything.  Most of the other interesting "


@@ -411,13 +410,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:205
+#: resources.dbk:203

 msgid "Debian machines"
 msgstr "Debian のマシン群"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Debian machines"
 msgstr "Debian のマシン群"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:207
+#: resources.dbk:205

 msgid ""
 "Debian has several computers working as servers, most of which serve "
 "critical functions in the Debian project.  Most of the machines are used for "
 msgid ""
 "Debian has several computers working as servers, most of which serve "
 "critical functions in the Debian project.  Most of the machines are used for "


@@ -429,7 +428,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:212
+#: resources.dbk:210

 msgid ""
 "Some of the machines are available for individual developers to use, as long "
 "as the developers follow the rules set forth in the <ulink url=\"&url-dmup;"
 msgid ""
 "Some of the machines are available for individual developers to use, as long "
 "as the developers follow the rules set forth in the <ulink url=\"&url-dmup;"


@@ -440,7 +439,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:217
+#: resources.dbk:215

 msgid ""
 "Generally speaking, you can use these machines for Debian-related purposes "
 "as you see fit.  Please be kind to system administrators, and do not use up "
 msgid ""
 "Generally speaking, you can use these machines for Debian-related purposes "
 "as you see fit.  Please be kind to system administrators, and do not use up "


@@ -455,7 +454,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:224
+#: resources.dbk:222

 msgid ""
 "Please take care to protect your Debian passwords and SSH keys installed on "
 "Debian machines.  Avoid login or upload methods which send passwords over "
 msgid ""
 "Please take care to protect your Debian passwords and SSH keys installed on "
 "Debian machines.  Avoid login or upload methods which send passwords over "


@@ -468,7 +467,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:229
+#: resources.dbk:227

 msgid ""
 "Please do not put any material that doesn't relate to Debian on the Debian "
 "servers, unless you have prior permission."
 msgid ""
 "Please do not put any material that doesn't relate to Debian on the Debian "
 "servers, unless you have prior permission."


@@ -478,7 +477,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:233
+#: resources.dbk:231

 msgid ""
 "The current list of Debian machines is available at <ulink url=\"&url-devel-"
 "machines;\"></ulink>.  That web page contains machine names, contact "
 msgid ""
 "The current list of Debian machines is available at <ulink url=\"&url-devel-"
 "machines;\"></ulink>.  That web page contains machine names, contact "


@@ -490,7 +489,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:239
+#: resources.dbk:237

 msgid ""
 "If you have a problem with the operation of a Debian server, and you think "
 "that the system operators need to be notified of this problem, you can check "
 msgid ""
 "If you have a problem with the operation of a Debian server, and you think "
 "that the system operators need to be notified of this problem, you can check "


@@ -508,7 +507,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:247
+#: resources.dbk:245

 msgid ""
 "If you have a problem with a certain service, not related to the system "
 "administration (such as packages to be removed from the archive, suggestions "
 msgid ""
 "If you have a problem with a certain service, not related to the system "
 "administration (such as packages to be removed from the archive, suggestions "


@@ -523,7 +522,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:254
+#: resources.dbk:252

 msgid ""
 "Some of the core servers are restricted, but the information from there is "
 "mirrored to another server."
 msgid ""
 "Some of the core servers are restricted, but the information from there is "
 "mirrored to another server."


@@ -533,13 +532,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:258
+#: resources.dbk:256

 msgid "The bugs server"
 msgstr "バグ報告サーバ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The bugs server"
 msgstr "バグ報告サーバ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:260
+#: resources.dbk:258

 msgid ""
 "<literal>&bugs-host;</literal> is the canonical location for the Bug "
 "Tracking System (BTS)."
 msgid ""
 "<literal>&bugs-host;</literal> is the canonical location for the Bug "
 "Tracking System (BTS)."


@@ -549,7 +548,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:264 resources.dbk:282
+#: resources.dbk:262 resources.dbk:280

 msgid "It is restricted; a mirror is available on <literal>merkel</literal>."
 msgstr ""
 "このサーバの利用は制限されています。ミラーが <literal>merkel</literal> 上で利"
 msgid "It is restricted; a mirror is available on <literal>merkel</literal>."
 msgstr ""
 "このサーバの利用は制限されています。ミラーが <literal>merkel</literal> 上で利"


@@ -557,7 +556,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:267
+#: resources.dbk:265

 msgid ""
 "If you plan on doing some statistical analysis or processing of Debian bugs, "
 "this would be the place to do it.  Please describe your plans on &email-"
 msgid ""
 "If you plan on doing some statistical analysis or processing of Debian bugs, "
 "this would be the place to do it.  Please describe your plans on &email-"


@@ -570,17 +569,18 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:275
+#: resources.dbk:273

 msgid "The ftp-master server"
 msgstr "ftp-master サーバ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The ftp-master server"
 msgstr "ftp-master サーバ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:277
+#: resources.dbk:275
+#, fuzzy

 msgid ""
 "The <literal>&ftp-master-host;</literal> server holds the canonical copy of "
 msgid ""
 "The <literal>&ftp-master-host;</literal> server holds the canonical copy of "

-"the Debian archive.  Generally, package uploads go to this server; see <xref "
-"linkend=\"upload\"/>."
+"the Debian archive.  Generally, package uploaded to &ftp-upload-host; end up "
+"on this server, see <xref linkend=\"upload\"/>."

 msgstr ""
 "<literal>&ftp-master-host;</literal> サーバは、Debian アーカイブのコピーの中"
 "心位置を占めています。大抵の場合、パッケージはこのサーバにアップロードされま"
 msgstr ""
 "<literal>&ftp-master-host;</literal> サーバは、Debian アーカイブのコピーの中"
 "心位置を占めています。大抵の場合、パッケージはこのサーバにアップロードされま"


@@ -588,7 +588,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:285
+#: resources.dbk:283

 msgid ""
 "Problems with the Debian FTP archive generally need to be reported as bugs "
 "against the <systemitem role=\"package\">&ftp-debian-org;</systemitem> "
 msgid ""
 "Problems with the Debian FTP archive generally need to be reported as bugs "
 "against the <systemitem role=\"package\">&ftp-debian-org;</systemitem> "


@@ -602,13 +602,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:293
+#: resources.dbk:291

 msgid "The www-master server"
 msgstr "www-master サーバ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The www-master server"
 msgstr "www-master サーバ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:295
+#: resources.dbk:293

 msgid ""
 "The main web server is <literal>www-master.debian.org</literal>.  It holds "
 "the official web pages, the face of Debian for most newbies."
 msgid ""
 "The main web server is <literal>www-master.debian.org</literal>.  It holds "
 "the official web pages, the face of Debian for most newbies."


@@ -618,7 +618,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:299
+#: resources.dbk:297

 msgid ""
 "If you find a problem with the Debian web server, you should generally "
 "submit a bug against the pseudo-package, <systemitem role=\"package\">www."
 msgid ""
 "If you find a problem with the Debian web server, you should generally "
 "submit a bug against the pseudo-package, <systemitem role=\"package\">www."


@@ -634,13 +634,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:308
+#: resources.dbk:306

 msgid "The people web server"
 msgstr "people ウェブサーバ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The people web server"
 msgstr "people ウェブサーバ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:310
+#: resources.dbk:308

 msgid ""
 "<literal>people.debian.org</literal> is the server used for developers' own "
 "web pages about anything related to Debian."
 msgid ""
 "<literal>people.debian.org</literal> is the server used for developers' own "
 "web pages about anything related to Debian."


@@ -650,7 +650,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:314
+#: resources.dbk:312

 msgid ""
 "If you have some Debian-specific information which you want to serve on the "
 "web, you can do this by putting material in the <filename>public_html</"
 msgid ""
 "If you have some Debian-specific information which you want to serve on the "
 "web, you can do this by putting material in the <filename>public_html</"


@@ -666,7 +666,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:321
+#: resources.dbk:319

 msgid ""
 "You should only use this particular location because it will be backed up, "
 "whereas on other hosts it won't."
 msgid ""
 "You should only use this particular location because it will be backed up, "
 "whereas on other hosts it won't."


@@ -676,7 +676,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:325
+#: resources.dbk:323

 msgid ""
 "Usually the only reason to use a different host is when you need to publish "
 "materials subject to the U.S.  export restrictions, in which case you can "
 msgid ""
 "Usually the only reason to use a different host is when you need to publish "
 "materials subject to the U.S.  export restrictions, in which case you can "


@@ -688,19 +688,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:330
+#: resources.dbk:328

 msgid "Send mail to &email-debian-devel; if you have any questions."
 msgstr "何か質問がある場合は、&email-debian-devel; にメールして下さい。"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgid "Send mail to &email-debian-devel; if you have any questions."
 msgstr "何か質問がある場合は、&email-debian-devel; にメールして下さい。"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:335
+#: resources.dbk:333

 msgid "The VCS servers"
 msgstr "VCS (バージョン管理システム) サーバ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The VCS servers"
 msgstr "VCS (バージョン管理システム) サーバ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:337
+#: resources.dbk:335

 msgid ""
 "If you need to use a Version Control System for any of your Debian work, you "
 "can use one the existing repositories hosted on Alioth or you can request a "
 msgid ""
 "If you need to use a Version Control System for any of your Debian work, you "
 "can use one the existing repositories hosted on Alioth or you can request a "


@@ -724,7 +724,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:348
+#: resources.dbk:346

 msgid ""
 "Historically, Debian first used <literal>cvs.debian.org</literal> to host "
 "CVS repositories. But that service is deprecated in favor of Alioth.  Only a "
 msgid ""
 "Historically, Debian first used <literal>cvs.debian.org</literal> to host "
 "CVS repositories. But that service is deprecated in favor of Alioth.  Only a "


@@ -736,13 +736,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:355
+#: resources.dbk:353

 msgid "chroots to different distributions"
 msgstr "複数のディストリビューション利用のために chroot を使う"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "chroots to different distributions"
 msgstr "複数のディストリビューション利用のために chroot を使う"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:357
+#: resources.dbk:355

 msgid ""
 "On some machines, there are chroots to different distributions available.  "
 "You can use them like this:"
 msgid ""
 "On some machines, there are chroots to different distributions available.  "
 "You can use them like this:"


@@ -752,7 +752,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: resources.dbk:361
+#: resources.dbk:359

 #, no-wrap
 msgid ""
 "vore$ dchroot unstable\n"
 #, no-wrap
 msgid ""
 "vore$ dchroot unstable\n"


@@ -763,7 +763,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:365
+#: resources.dbk:363

 msgid ""
 "In all chroots, the normal user home directories are available.  You can "
 "find out which chroots are available via <literal>&url-devel-machines;</"
 msgid ""
 "In all chroots, the normal user home directories are available.  You can "
 "find out which chroots are available via <literal>&url-devel-machines;</"


@@ -775,13 +775,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:374
+#: resources.dbk:372

 msgid "The Developers Database"
 msgstr "開発者データベース"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "The Developers Database"
 msgstr "開発者データベース"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:376
+#: resources.dbk:374

 msgid ""
 "The Developers Database, at <ulink url=\"&url-debian-db;\"></ulink>, is an "
 "LDAP directory for managing Debian developer attributes.  You can use this "
 msgid ""
 "The Developers Database, at <ulink url=\"&url-debian-db;\"></ulink>, is an "
 "LDAP directory for managing Debian developer attributes.  You can use this "


@@ -797,7 +797,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:384
+#: resources.dbk:382

 msgid ""
 "Developers can <ulink url=\"&url-debian-db-login;\">log into the database</"
 "ulink> to change various information about themselves, such as:"
 msgid ""
 "Developers can <ulink url=\"&url-debian-db-login;\">log into the database</"
 "ulink> to change various information about themselves, such as:"


@@ -807,25 +807,25 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:390
+#: resources.dbk:388

 msgid "forwarding address for your debian.org email"
 msgstr "debian.org アドレス宛のメールを転送するアドレス"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "forwarding address for your debian.org email"
 msgstr "debian.org アドレス宛のメールを転送するアドレス"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:395
+#: resources.dbk:393

 msgid "subscription to debian-private"
 msgstr "debian-private の購読"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "subscription to debian-private"
 msgstr "debian-private の購読"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:400
+#: resources.dbk:398

 msgid "whether you are on vacation"
 msgstr "休暇中かどうか"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "whether you are on vacation"
 msgstr "休暇中かどうか"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:405
+#: resources.dbk:403

 msgid ""
 "personal information such as your address, country, the latitude and "
 "longitude of the place where you live for use in <ulink url=\"&url-worldmap;"
 msgid ""
 "personal information such as your address, country, the latitude and "
 "longitude of the place where you live for use in <ulink url=\"&url-worldmap;"


@@ -838,13 +838,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:413
+#: resources.dbk:411

 msgid "password and preferred shell on Debian Project machines"
 msgstr "Debian プロジェクトのマシン上でのパスワードと優先的に指定するシェル"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "password and preferred shell on Debian Project machines"
 msgstr "Debian プロジェクトのマシン上でのパスワードと優先的に指定するシェル"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:418
+#: resources.dbk:416

 msgid ""
 "Most of the information is not accessible to the public, naturally.  For "
 "more information please read the online documentation that you can find at "
 msgid ""
 "Most of the information is not accessible to the public, naturally.  For "
 "more information please read the online documentation that you can find at "


@@ -856,7 +856,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:423
+#: resources.dbk:421

 msgid ""
 "Developers can also submit their SSH keys to be used for authorization on "
 "the official Debian machines, and even add new *.debian.net DNS entries.  "
 msgid ""
 "Developers can also submit their SSH keys to be used for authorization on "
 "the official Debian machines, and even add new *.debian.net DNS entries.  "


@@ -869,13 +869,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:431
+#: resources.dbk:429

 msgid "The Debian archive"
 msgstr "Debian アーカイブ"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "The Debian archive"
 msgstr "Debian アーカイブ"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:433
+#: resources.dbk:431

 msgid ""
 "The &debian-formal; distribution consists of a lot of packages (<filename>."
 "deb</filename>'s, currently around &number-of-pkgs;) and a few additional "
 msgid ""
 "The &debian-formal; distribution consists of a lot of packages (<filename>."
 "deb</filename>'s, currently around &number-of-pkgs;) and a few additional "


@@ -887,13 +887,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:439
+#: resources.dbk:437

 msgid "Here is an example directory tree of a complete Debian archive:"
 msgstr "以下が完全な Debian アーカイブのディレクトリツリーの例です："
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Here is an example directory tree of a complete Debian archive:"
 msgstr "以下が完全な Debian アーカイブのディレクトリツリーの例です："
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:443
+#: resources.dbk:441

 msgid ""
 "As you can see, the top-level directory contains two directories, "
 "<filename>dists/</filename> and <filename>pool/</filename>.  The latter is a "
 msgid ""
 "As you can see, the top-level directory contains two directories, "
 "<filename>dists/</filename> and <filename>pool/</filename>.  The latter is a "


@@ -923,7 +923,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:457
+#: resources.dbk:455

 msgid ""
 "<filename>dists/stable</filename> contains three directories, namely "
 "<filename>main</filename>, <filename>contrib</filename>, and <filename>non-"
 msgid ""
 "<filename>dists/stable</filename> contains three directories, namely "
 "<filename>main</filename>, <filename>contrib</filename>, and <filename>non-"


@@ -935,7 +935,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:462
+#: resources.dbk:460

 msgid ""
 "In each of the areas, there is a directory for the source packages "
 "(<filename>source</filename>) and a directory for each supported "
 msgid ""
 "In each of the areas, there is a directory for the source packages "
 "(<filename>source</filename>) and a directory for each supported "


@@ -948,7 +948,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:467
+#: resources.dbk:465

 msgid ""
 "The <filename>main</filename> area contains additional directories which "
 "hold the disk images and some essential pieces of documentation required for "
 msgid ""
 "The <filename>main</filename> area contains additional directories which "
 "hold the disk images and some essential pieces of documentation required for "


@@ -962,13 +962,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:473
+#: resources.dbk:471

 msgid "Sections"
 msgstr "セクション"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Sections"
 msgstr "セクション"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:475
+#: resources.dbk:473

 msgid ""
 "The <literal>main</literal> section of the Debian archive is what makes up "
 "the <emphasis role=\"strong\">official &debian-formal; distribution</"
 msgid ""
 "The <literal>main</literal> section of the Debian archive is what makes up "
 "the <emphasis role=\"strong\">official &debian-formal; distribution</"


@@ -986,7 +986,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:483
+#: resources.dbk:481

 msgid ""
 "Every package in the main section must fully comply with the <ulink url="
 "\"&url-dfsg;\">Debian Free Software Guidelines</ulink> (DFSG) and with all "
 msgid ""
 "Every package in the main section must fully comply with the <ulink url="
 "\"&url-dfsg;\">Debian Free Software Guidelines</ulink> (DFSG) and with all "


@@ -1002,7 +1002,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:491
+#: resources.dbk:489

 msgid ""
 "Packages in the <literal>contrib</literal> section have to comply with the "
 "DFSG, but may fail other requirements.  For instance, they may depend on non-"
 msgid ""
 "Packages in the <literal>contrib</literal> section have to comply with the "
 "DFSG, but may fail other requirements.  For instance, they may depend on non-"


@@ -1014,7 +1014,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:496
+#: resources.dbk:494

 msgid ""
 "Packages which do not conform to the DFSG are placed in the <literal>non-"
 "free</literal> section.  These packages are not considered as part of the "
 msgid ""
 "Packages which do not conform to the DFSG are placed in the <literal>non-"
 "free</literal> section.  These packages are not considered as part of the "


@@ -1030,7 +1030,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:503
+#: resources.dbk:501

 msgid ""
 "The <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> contains "
 "a more exact definition of the three sections.  The above discussion is just "
 msgid ""
 "The <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> contains "
 "a more exact definition of the three sections.  The above discussion is just "


@@ -1042,7 +1042,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:508
+#: resources.dbk:506

 msgid ""
 "The separation of the three sections at the top-level of the archive is "
 "important for all people who want to distribute Debian, either via FTP "
 msgid ""
 "The separation of the three sections at the top-level of the archive is "
 "important for all people who want to distribute Debian, either via FTP "


@@ -1060,7 +1060,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:516
+#: resources.dbk:514

 msgid ""
 "On the other hand, a CD-ROM vendor could easily check the individual package "
 "licenses of the packages in <literal>non-free</literal> and include as many "
 msgid ""
 "On the other hand, a CD-ROM vendor could easily check the individual package "
 "licenses of the packages in <literal>non-free</literal> and include as many "


@@ -1074,7 +1074,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:522
+#: resources.dbk:520

 msgid ""
 "Note that the term section is also used to refer to categories which "
 "simplify the organization and browsing of available packages, e.g.  "
 msgid ""
 "Note that the term section is also used to refer to categories which "
 "simplify the organization and browsing of available packages, e.g.  "


@@ -1092,13 +1092,13 @@ msgstr ""
 
 # type: Content of: <chapter>port<section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter>port<section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:532
+#: resources.dbk:530

 msgid "Architectures"
 msgstr "アーキテクチャ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Architectures"
 msgstr "アーキテクチャ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:534
+#: resources.dbk:532

 msgid ""
 "In the first days, the Linux kernel was only available for Intel i386 (or "
 "greater) platforms, and so was Debian.  But as Linux became more and more "
 msgid ""
 "In the first days, the Linux kernel was only available for Intel i386 (or "
 "greater) platforms, and so was Debian.  But as Linux became more and more "


@@ -1110,7 +1110,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:539
+#: resources.dbk:537

 msgid ""
 "The Linux 2.0 kernel supports Intel x86, DEC Alpha, SPARC, Motorola 680x0 "
 "(like Atari, Amiga and Macintoshes), MIPS, and PowerPC.  The Linux 2.2 "
 msgid ""
 "The Linux 2.0 kernel supports Intel x86, DEC Alpha, SPARC, Motorola 680x0 "
 "(like Atari, Amiga and Macintoshes), MIPS, and PowerPC.  The Linux 2.2 "


@@ -1139,7 +1139,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:553
+#: resources.dbk:551

 msgid ""
 "&debian-formal; 1.3 is only available as <literal>i386</literal>.  Debian "
 "2.0 shipped for <literal>i386</literal> and <literal>m68k</literal> "
 msgid ""
 "&debian-formal; 1.3 is only available as <literal>i386</literal>.  Debian "
 "2.0 shipped for <literal>i386</literal> and <literal>m68k</literal> "


@@ -1164,7 +1164,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:564
+#: resources.dbk:562

 msgid ""
 "Information for developers and users about the specific ports are available "
 "at the <ulink url=\"&url-debian-ports;\">Debian Ports web pages</ulink>."
 msgid ""
 "Information for developers and users about the specific ports are available "
 "at the <ulink url=\"&url-debian-ports;\">Debian Ports web pages</ulink>."


@@ -1174,13 +1174,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:570
+#: resources.dbk:568

 msgid "Packages"
 msgstr "パッケージ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Packages"
 msgstr "パッケージ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:572
+#: resources.dbk:570

 msgid ""
 "There are two types of Debian packages, namely <literal>source</literal> and "
 "<literal>binary</literal> packages."
 msgid ""
 "There are two types of Debian packages, namely <literal>source</literal> and "
 "<literal>binary</literal> packages."


@@ -1188,31 +1188,63 @@ msgstr ""
 "Debian パッケージには２種類あります。<literal>ソース</literal>パッケージと"
 "<literal>バイナリ</literal>パッケージです。"
 
 "Debian パッケージには２種類あります。<literal>ソース</literal>パッケージと"
 "<literal>バイナリ</literal>パッケージです。"
 

-# type: Content of: <chapter><section><section><para>

 #. type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:576
+#: resources.dbk:574

 msgid ""
 msgid ""

-"Source packages consist of either two or three files: a <filename>.dsc</"
-"filename> file, and either a <filename>.tar.gz</filename> file or both an "
-"<filename>.orig.tar.gz</filename> and a <filename>.diff.gz</filename> file."
+"Depending on the format of the source package, it will consist of one or "
+"more files in addition to the mandatory <filename>.dsc</filename> file:"
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para><itemizedlist><listitem><para>
+#: resources.dbk:578
+#, fuzzy
+msgid ""
+"with format “1.0”, it has either a <filename>.tar.gz</filename> file or both "
+"an <filename>.orig.tar.gz</filename> and a <filename>.diff.gz</filename> "
+"file;"

 msgstr ""
 "ソースパッケージは 2 つ、あるいは 3 つのファイルから成り立っています。"
 "<filename>.dsc</filename> ファイルおよび、<filename>.tar.gz</filename> ファイ"
 "ルか <filename>.orig.tar.gz</filename> ファイルと <filename>.diff.gz</"
 "filename> ファイルです。"
 
 msgstr ""
 "ソースパッケージは 2 つ、あるいは 3 つのファイルから成り立っています。"
 "<filename>.dsc</filename> ファイルおよび、<filename>.tar.gz</filename> ファイ"
 "ルか <filename>.orig.tar.gz</filename> ファイルと <filename>.diff.gz</"
 "filename> ファイルです。"
 

+#. type: Content of: <chapter><section><section><para><itemizedlist><listitem><para>
+#: resources.dbk:581
+msgid ""
+"with format “3.0 (quilt)”, it has a mandatory <filename>.orig.tar.{gz,bz2,"
+"lzma}</filename> upstream tarball, muliple optional <filename>.orig-"
+"<replaceable>component</replaceable>.tar.{gz,bz2,lzma}</filename> additional "
+"upstream tarballs"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para><itemizedlist><listitem><filename>
+#: resources.dbk:584
+msgid "debian.tar.{gz,bz2,lzma} debian tarball"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para><itemizedlist><listitem><para>
+#: resources.dbk:585
+msgid ""
+"with format “3.0 (native)”, it has only a single <filename>.tar.{gz,bz2,lzma}"
+"</filename> tarball."
+msgstr ""
+

 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:582
+#: resources.dbk:590
+#, fuzzy

 msgid ""
 "If a package is developed specially for Debian and is not distributed "
 msgid ""
 "If a package is developed specially for Debian and is not distributed "

-"outside of Debian, there is just one <filename>.tar.gz</filename> file which "
-"contains the sources of the program.  If a package is distributed elsewhere "
-"too, the <filename>.orig.tar.gz</filename> file stores the so-called "
+"outside of Debian, there is just one <filename>.tar.{gz,bz2,lzma}</filename> "
+"file which contains the sources of the program, it's called a “native” "
+"source package.  If a package is distributed elsewhere too, the <filename>."
+"orig.tar.{gz,bz2,lzma}</filename> file stores the so-called "

 "<literal>upstream source code</literal>, that is the source code that's "
 "distributed by the <literal>upstream maintainer</literal> (often the author "
 "<literal>upstream source code</literal>, that is the source code that's "
 "distributed by the <literal>upstream maintainer</literal> (often the author "

-"of the software).  In this case, the <filename>.diff.gz</filename> contains "
-"the changes made by the Debian maintainer."
+"of the software). In this case, the <filename>.diff.gz</filename> or the "
+"<filename>debian.tar.{gz,bz2,lzma}</filename> contains the changes made by "
+"the Debian maintainer."

 msgstr ""
 "パッケージが特に Debian 用に作られていて Debian 以外で利用されていない場合"
 "は、プログラムのソースを含んだ単純な 1 つの <filename>.tar.gz</filename> ファ"
 msgstr ""
 "パッケージが特に Debian 用に作られていて Debian 以外で利用されていない場合"
 "は、プログラムのソースを含んだ単純な 1 つの <filename>.tar.gz</filename> ファ"


@@ -1225,7 +1257,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:592
+#: resources.dbk:603

 msgid ""
 "The <filename>.dsc</filename> file lists all the files in the source package "
 "together with checksums (<command>md5sums</command>) and some additional "
 msgid ""
 "The <filename>.dsc</filename> file lists all the files in the source package "
 "together with checksums (<command>md5sums</command>) and some additional "


@@ -1237,13 +1269,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:599
+#: resources.dbk:610

 msgid "Distributions"
 msgstr "ディストリビューション"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Distributions"
 msgstr "ディストリビューション"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:601
+#: resources.dbk:612

 msgid ""
 "The directory system described in the previous chapter is itself contained "
 "within <literal>distribution directories</literal>.  Each distribution is "
 msgid ""
 "The directory system described in the previous chapter is itself contained "
 "within <literal>distribution directories</literal>.  Each distribution is "


@@ -1257,7 +1289,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:607
+#: resources.dbk:618

 msgid ""
 "To summarize, the Debian archive has a root directory within an FTP server.  "
 "For instance, at the mirror site, <literal>ftp.us.debian.org</literal>, the "
 msgid ""
 "To summarize, the Debian archive has a root directory within an FTP server.  "
 "For instance, at the mirror site, <literal>ftp.us.debian.org</literal>, the "


@@ -1273,7 +1305,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:614
+#: resources.dbk:625

 msgid ""
 "A distribution comprises Debian source and binary packages, and the "
 "respective <filename>Sources</filename> and <filename>Packages</filename> "
 msgid ""
 "A distribution comprises Debian source and binary packages, and the "
 "respective <filename>Sources</filename> and <filename>Packages</filename> "


@@ -1291,13 +1323,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: resources.dbk:622
+#: resources.dbk:633

 msgid "Stable, testing, and unstable"
 msgstr "安定版 (stable)、テスト版 (testing)、不安定版 (unstable)"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Stable, testing, and unstable"
 msgstr "安定版 (stable)、テスト版 (testing)、不安定版 (unstable)"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:624
+#: resources.dbk:635

 msgid ""
 "There are always distributions called <literal>stable</literal> (residing in "
 "<filename>dists/stable</filename>), <literal>testing</literal> (residing in "
 msgid ""
 "There are always distributions called <literal>stable</literal> (residing in "
 "<filename>dists/stable</filename>), <literal>testing</literal> (residing in "


@@ -1314,7 +1346,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:631
+#: resources.dbk:642

 msgid ""
 "Active development is done in the <literal>unstable</literal> distribution "
 "(that's why this distribution is sometimes called the <literal>development "
 msgid ""
 "Active development is done in the <literal>unstable</literal> distribution "
 "(that's why this distribution is sometimes called the <literal>development "


@@ -1334,7 +1366,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:640
+#: resources.dbk:651

 msgid ""
 "The <link linkend=\"testing\">testing</link> distribution is generated "
 "automatically by taking packages from <literal>unstable</literal> if they "
 msgid ""
 "The <link linkend=\"testing\">testing</link> distribution is generated "
 "automatically by taking packages from <literal>unstable</literal> if they "


@@ -1353,7 +1385,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:648
+#: resources.dbk:659

 msgid ""
 "After a period of development, once the release manager deems fit, the "
 "<literal>testing</literal> distribution is frozen, meaning that the policies "
 msgid ""
 "After a period of development, once the release manager deems fit, the "
 "<literal>testing</literal> distribution is frozen, meaning that the policies "


@@ -1390,7 +1422,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:665
+#: resources.dbk:676

 msgid ""
 "This development cycle is based on the assumption that the "
 "<literal>unstable</literal> distribution becomes <literal>stable</literal> "
 msgid ""
 "This development cycle is based on the assumption that the "
 "<literal>unstable</literal> distribution becomes <literal>stable</literal> "


@@ -1425,7 +1457,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:682
+#: resources.dbk:693

 msgid ""
 "Note that development under <literal>unstable</literal> continues during the "
 "freeze period, since the <literal>unstable</literal> distribution remains in "
 msgid ""
 "Note that development under <literal>unstable</literal> continues during the "
 "freeze period, since the <literal>unstable</literal> distribution remains in "


@@ -1438,13 +1470,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: resources.dbk:689
+#: resources.dbk:700

 msgid "More information about the testing distribution"
 msgstr "テスト版ディストリビューションについてのさらなる情報"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "More information about the testing distribution"
 msgstr "テスト版ディストリビューションについてのさらなる情報"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:691
+#: resources.dbk:702

 msgid ""
 "Packages are usually installed into the <literal>testing</literal> "
 "distribution after they have undergone some degree of testing in "
 msgid ""
 "Packages are usually installed into the <literal>testing</literal> "
 "distribution after they have undergone some degree of testing in "


@@ -1456,7 +1488,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:695
+#: resources.dbk:706

 msgid ""
 "For more details, please see the <link linkend=\"testing\">information about "
 "the testing distribution</link>."
 msgid ""
 "For more details, please see the <link linkend=\"testing\">information about "
 "the testing distribution</link>."


@@ -1466,13 +1498,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>

-#: resources.dbk:701
+#: resources.dbk:712

 msgid "Experimental"
 msgstr "試験版 (experimental)"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Experimental"
 msgstr "試験版 (experimental)"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:703
+#: resources.dbk:714

 msgid ""
 "The <literal>experimental</literal> distribution is a special distribution.  "
 "It is not a full distribution in the same sense as <literal>stable</"
 msgid ""
 "The <literal>experimental</literal> distribution is a special distribution.  "
 "It is not a full distribution in the same sense as <literal>stable</"


@@ -1498,7 +1530,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:715
+#: resources.dbk:726

 msgid ""
 "These are the <citerefentry> <refentrytitle>sources.list</refentrytitle> "
 "<manvolnum>5</manvolnum> </citerefentry> lines for <literal>experimental</"
 msgid ""
 "These are the <citerefentry> <refentrytitle>sources.list</refentrytitle> "
 "<manvolnum>5</manvolnum> </citerefentry> lines for <literal>experimental</"


@@ -1510,7 +1542,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><programlisting>
 #. type: Content of: <chapter><section><section><section><programlisting>
 
 # type: Content of: <chapter><section><section><section><programlisting>
 #. type: Content of: <chapter><section><section><section><programlisting>

-#: resources.dbk:720
+#: resources.dbk:731

 #, no-wrap
 msgid ""
 "deb http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ experimental main\n"
 #, no-wrap
 msgid ""
 "deb http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ experimental main\n"


@@ -1521,7 +1553,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:724
+#: resources.dbk:735

 msgid ""
 "If there is a chance that the software could do grave damage to a system, it "
 "is likely to be better to put it into <literal>experimental</literal>.  For "
 msgid ""
 "If there is a chance that the software could do grave damage to a system, it "
 "is likely to be better to put it into <literal>experimental</literal>.  For "


@@ -1535,7 +1567,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:730
+#: resources.dbk:741

 msgid ""
 "Whenever there is a new upstream version of a package that introduces new "
 "features but breaks a lot of old ones, it should either not be uploaded, or "
 msgid ""
 "Whenever there is a new upstream version of a package that introduces new "
 "features but breaks a lot of old ones, it should either not be uploaded, or "


@@ -1559,7 +1591,7 @@ msgstr ""
 # type: Content of: <chapter><section><section><section><para>
 # propagate
 #. type: Content of: <chapter><section><section><section><para>
 # type: Content of: <chapter><section><section><section><para>
 # propagate
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:740
+#: resources.dbk:751

 msgid ""
 "Some experimental software can still go into <literal>unstable</literal>, "
 "with a few warnings in the description, but that isn't recommended because "
 msgid ""
 "Some experimental software can still go into <literal>unstable</literal>, "
 "with a few warnings in the description, but that isn't recommended because "


@@ -1582,7 +1614,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:750
+#: resources.dbk:761

 msgid ""
 "New software which isn't likely to damage your system can go directly into "
 "<literal>unstable</literal>."
 msgid ""
 "New software which isn't likely to damage your system can go directly into "
 "<literal>unstable</literal>."


@@ -1592,7 +1624,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:754
+#: resources.dbk:765

 msgid ""
 "An alternative to <literal>experimental</literal> is to use your personal "
 "web space on <literal>people.debian.org</literal>."
 msgid ""
 "An alternative to <literal>experimental</literal> is to use your personal "
 "web space on <literal>people.debian.org</literal>."


@@ -1602,7 +1634,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:758
+#: resources.dbk:769

 msgid ""
 "When uploading to <literal>unstable</literal> a package which had bugs fixed "
 "in <literal>experimental</literal>, please consider using the option "
 msgid ""
 "When uploading to <literal>unstable</literal> a package which had bugs fixed "
 "in <literal>experimental</literal>, please consider using the option "


@@ -1616,13 +1648,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:768
+#: resources.dbk:779

 msgid "Release code names"
 msgstr "リリースのコードネーム"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Release code names"
 msgstr "リリースのコードネーム"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:770
+#: resources.dbk:781

 msgid ""
 "Every released Debian distribution has a <literal>code name</literal>: "
 "Debian 1.1 is called <literal>buzz</literal>; Debian 1.2, <literal>rex</"
 msgid ""
 "Every released Debian distribution has a <literal>code name</literal>: "
 "Debian 1.1 is called <literal>buzz</literal>; Debian 1.2, <literal>rex</"


@@ -1647,19 +1679,19 @@ msgstr ""
 "2.2 は <literal>potato</literal>、Debian 3.0 は <literal>woody</literal>、"
 "Debian 3.1 は <literal>sarge</literal>、Debian 4.0 は <literal>etch</"
 "literal>、Debian 5.0 は <literal>lenny</literal>、そして次のリリースは"
 "2.2 は <literal>potato</literal>、Debian 3.0 は <literal>woody</literal>、"
 "Debian 3.1 は <literal>sarge</literal>、Debian 4.0 は <literal>etch</"
 "literal>、Debian 5.0 は <literal>lenny</literal>、そして次のリリースは"

-"<literal>squeeze</literal> と呼ばれています。<literal>sid</"
-"literal> と呼ばれる「擬似ディストリビューション」もあり、これは現在の "
-"<literal>unstable</literal> ディストリビューションを指します。パッケージは安"
-"定に近づくと <literal>unstable</literal> から <literal>testing</literal> へと"
-"移動されるので、<literal>sid</literal> そのものは決してリリースされません。通"
-"常の Debian ディストリビューションの内容同様に、<literal>sid</literal> は "
-"Debian ではまだ公式にサポートあるいはリリースされていないアーキテクチャのパッ"
-"ã\82±ã\83¼ã\82¸ã\82\92å\90«ã\82\93ã\81§ã\81\84ã\81¾ã\81\99ã\80\82ã\81\93ã\82\8cã\82\89ã\81®ã\82¢ã\83¼ã\82­ã\83\86ã\82¯ã\83\81ã\83£ã\81¯ã\80\81ã\81\84ã\81¤ã\81\8b主æµ\81ã\83\87ã\82£ã\82¹ã\83\88ã\83ªã\83\93ã\83¥ã\83¼"
-"ã\82·ã\83§ã\83³ã\81«çµ±å\90\88ã\81\95ã\82\8cã\82\8bäº\88å®\9aã\81§ã\81\99ã\80\82"
+"<literal>squeeze</literal> と呼ばれています。<literal>sid</literal> と呼ばれ"
+"る「擬似ディストリビューション」もあり、これは現在の <literal>unstable</"
+"literal> ディストリビューションを指します。パッケージは安定に近づくと "
+"<literal>unstable</literal> から <literal>testing</literal> へと移動されるの"
+"で、<literal>sid</literal> そのものは決してリリースされません。通常の Debian "
+"ディストリビューションの内容同様に、<literal>sid</literal> は Debian ではまだ"
+"公式にサポートあるいはリリースされていないアーキテクチャのパッケージを含んで"
+"ã\81\84ã\81¾ã\81\99ã\80\82ã\81\93ã\82\8cã\82\89ã\81®ã\82¢ã\83¼ã\82­ã\83\86ã\82¯ã\83\81ã\83£ã\81¯ã\80\81ã\81\84ã\81¤ã\81\8b主æµ\81ã\83\87ã\82£ã\82¹ã\83\88ã\83ªã\83\93ã\83¥ã\83¼ã\82·ã\83§ã\83³ã\81«çµ±å\90\88ã\81\95ã\82\8c"
+"る予定です。"

 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:788
+#: resources.dbk:799

 msgid ""
 "Since Debian has an open development model (i.e., everyone can participate "
 "and follow the development) even the <literal>unstable</literal> and "
 msgid ""
 "Since Debian has an open development model (i.e., everyone can participate "
 "and follow the development) even the <literal>unstable</literal> and "


@@ -1681,7 +1713,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:798
+#: resources.dbk:809

 msgid ""
 "On the other hand, if we called the distribution directories <literal>Debian-"
 "x.y</literal> from the beginning, people would think that Debian release "
 msgid ""
 "On the other hand, if we called the distribution directories <literal>Debian-"
 "x.y</literal> from the beginning, people would think that Debian release "


@@ -1699,7 +1731,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:806
+#: resources.dbk:817

 msgid ""
 "Thus, the names of the distribution directories in the archive are "
 "determined by their code names and not their release status (e.g., "
 msgid ""
 "Thus, the names of the distribution directories in the archive are "
 "determined by their code names and not their release status (e.g., "


@@ -1721,13 +1753,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:820
+#: resources.dbk:831

 msgid "Debian mirrors"
 msgstr "Debian ミラーサーバ"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Debian mirrors"
 msgstr "Debian ミラーサーバ"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:822
+#: resources.dbk:833

 msgid ""
 "The various download archives and the web site have several mirrors "
 "available in order to relieve our canonical servers from heavy load.  In "
 msgid ""
 "The various download archives and the web site have several mirrors "
 "available in order to relieve our canonical servers from heavy load.  In "


@@ -1751,7 +1783,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:833
+#: resources.dbk:844

 msgid ""
 "All the information on Debian mirrors, including a list of the available "
 "public FTP/HTTP servers, can be found at <ulink url=\"&url-debian-mirrors;"
 msgid ""
 "All the information on Debian mirrors, including a list of the available "
 "public FTP/HTTP servers, can be found at <ulink url=\"&url-debian-mirrors;"


@@ -1766,7 +1798,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:840
+#: resources.dbk:851

 msgid ""
 "Note that mirrors are generally run by third-parties who are interested in "
 "helping Debian.  As such, developers generally do not have accounts on these "
 msgid ""
 "Note that mirrors are generally run by third-parties who are interested in "
 "helping Debian.  As such, developers generally do not have accounts on these "


@@ -1778,13 +1810,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:847
+#: resources.dbk:858

 msgid "The Incoming system"
 msgstr "Incoming システム"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "The Incoming system"
 msgstr "Incoming システム"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:849
+#: resources.dbk:860

 msgid ""
 "The Incoming system is responsible for collecting updated packages and "
 "installing them in the Debian archive.  It consists of a set of directories "
 msgid ""
 "The Incoming system is responsible for collecting updated packages and "
 "installing them in the Debian archive.  It consists of a set of directories "


@@ -1796,7 +1828,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:854
+#: resources.dbk:865

 msgid ""
 "Packages are uploaded by all the maintainers into a directory called "
 "<filename>UploadQueue</filename>.  This directory is scanned every few "
 msgid ""
 "Packages are uploaded by all the maintainers into a directory called "
 "<filename>UploadQueue</filename>.  This directory is scanned every few "


@@ -1837,7 +1869,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:873
+#: resources.dbk:884

 msgid ""
 "Once the package is accepted, the system sends a confirmation mail to the "
 "maintainer and closes all the bugs marked as fixed by the upload, and the "
 msgid ""
 "Once the package is accepted, the system sends a confirmation mail to the "
 "maintainer and closes all the bugs marked as fixed by the upload, and the "


@@ -1864,7 +1896,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:885
+#: resources.dbk:896

 msgid ""
 "The archive maintenance software will also send the OpenPGP/GnuPG signed "
 "<filename>.changes</filename> file that you uploaded to the appropriate "
 msgid ""
 "The archive maintenance software will also send the OpenPGP/GnuPG signed "
 "<filename>.changes</filename> file that you uploaded to the appropriate "


@@ -1886,7 +1918,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:895
+#: resources.dbk:906

 msgid ""
 "Though ftp-master is restricted, a copy of the installation is available to "
 "all developers on <literal>&ftp-master-mirror;</literal>."
 msgid ""
 "Though ftp-master is restricted, a copy of the installation is available to "
 "all developers on <literal>&ftp-master-mirror;</literal>."


@@ -1897,19 +1929,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:958
+#: resources.dbk:969

 msgid "Package information"
 msgstr "パッケージ情報"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgid "Package information"
 msgstr "パッケージ情報"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:960
+#: resources.dbk:971

 msgid "On the web"
 msgstr "ウェブ上から"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "On the web"
 msgstr "ウェブ上から"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:962
+#: resources.dbk:973

 msgid ""
 "Each package has several dedicated web pages.  <literal>http://&packages-"
 "host;/<replaceable>package-name</replaceable></literal> displays each "
 msgid ""
 "Each package has several dedicated web pages.  <literal>http://&packages-"
 "host;/<replaceable>package-name</replaceable></literal> displays each "


@@ -1925,7 +1957,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:969
+#: resources.dbk:980

 msgid ""
 "The bug tracking system tracks bugs for each package.  You can view the bugs "
 "of a given package at the URL <literal>http://&bugs-host;/"
 msgid ""
 "The bug tracking system tracks bugs for each package.  You can view the bugs "
 "of a given package at the URL <literal>http://&bugs-host;/"


@@ -1937,13 +1969,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:976
+#: resources.dbk:987

 msgid "The <command>dak ls</command> utility"
 msgstr "<command>dak ls</command> ユーティリティ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The <command>dak ls</command> utility"
 msgstr "<command>dak ls</command> ユーティリティ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:978
+#: resources.dbk:989

 msgid ""
 "<command>dak ls</command> is part of the dak suite of tools, listing "
 "available package versions for all known distributions and architectures.  "
 msgid ""
 "<command>dak ls</command> is part of the dak suite of tools, listing "
 "available package versions for all known distributions and architectures.  "


@@ -1961,8 +1993,8 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: resources.dbk:986
-#,f no-wrap
+#: resources.dbk:997
+#, no-wrap

 msgid ""
 "$ dak ls evince\n"
 "evince | 0.1.5-2sarge1 |     oldstable | source, alpha, arm, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"
 msgid ""
 "$ dak ls evince\n"
 "evince | 0.1.5-2sarge1 |     oldstable | source, alpha, arm, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"


@@ -1982,7 +2014,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:995
+#: resources.dbk:1006

 msgid ""
 "In this example, you can see that the version in <literal>unstable</literal> "
 "differs from the version in <literal>testing</literal> and that there has "
 msgid ""
 "In this example, you can see that the version in <literal>unstable</literal> "
 "differs from the version in <literal>testing</literal> and that there has "


@@ -1997,13 +2029,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:1005
+#: resources.dbk:1016

 msgid "The Package Tracking System"
 msgstr "パッケージ追跡システム"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "The Package Tracking System"
 msgstr "パッケージ追跡システム"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1007
+#: resources.dbk:1018

 msgid ""
 "The Package Tracking System (PTS) is an email-based tool to track the "
 "activity of a source package.  This really means that you can get the same "
 msgid ""
 "The Package Tracking System (PTS) is an email-based tool to track the "
 "activity of a source package.  This really means that you can get the same "


@@ -2017,7 +2049,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1012
+#: resources.dbk:1023

 msgid ""
 "Each email sent through the PTS is classified under one of the keywords "
 "listed below.  This will let you select the mails that you want to receive."
 msgid ""
 "Each email sent through the PTS is classified under one of the keywords "
 "listed below.  This will let you select the mails that you want to receive."


@@ -2027,31 +2059,31 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1016
+#: resources.dbk:1027

 msgid "By default you will get:"
 msgstr "デフォルトで受け取るもの:"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgid "By default you will get:"
 msgstr "デフォルトで受け取るもの:"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1020
+#: resources.dbk:1031

 msgid "<literal>bts</literal>"
 msgstr "<literal>bts</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>bts</literal>"
 msgstr "<literal>bts</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1023
+#: resources.dbk:1034

 msgid "All the bug reports and following discussions."
 msgstr "バグ報告とそれに続くディスカッション全て。"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgid "All the bug reports and following discussions."
 msgstr "バグ報告とそれに続くディスカッション全て。"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1028
+#: resources.dbk:1039

 msgid "<literal>bts-control</literal>"
 msgstr "<literal>bts-control</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>bts-control</literal>"
 msgstr "<literal>bts-control</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1031
+#: resources.dbk:1042

 msgid ""
 "The email notifications from <email>control@&bugs-host;</email> about bug "
 "report status changes."
 msgid ""
 "The email notifications from <email>control@&bugs-host;</email> about bug "
 "report status changes."


@@ -2061,13 +2093,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1037
+#: resources.dbk:1048

 msgid "<literal>upload-source</literal>"
 msgstr "<literal>upload-source</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>upload-source</literal>"
 msgstr "<literal>upload-source</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1040
+#: resources.dbk:1051

 msgid ""
 "The email notification from <command>katie</command> when an uploaded source "
 "package is accepted."
 msgid ""
 "The email notification from <command>katie</command> when an uploaded source "
 "package is accepted."


@@ -2077,13 +2109,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1046
+#: resources.dbk:1057

 msgid "<literal>katie-other</literal>"
 msgstr "<literal>katie-other</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>katie-other</literal>"
 msgstr "<literal>katie-other</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1049
+#: resources.dbk:1060

 msgid ""
 "Other warning and error emails from <command>katie</command> (such as an "
 "override disparity for the section and/or the priority field)."
 msgid ""
 "Other warning and error emails from <command>katie</command> (such as an "
 "override disparity for the section and/or the priority field)."


@@ -2093,13 +2125,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1055
+#: resources.dbk:1066

 msgid "<literal>default</literal>"
 msgstr "<literal>default</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>default</literal>"
 msgstr "<literal>default</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1058
+#: resources.dbk:1069

 msgid ""
 "Any non-automatic email sent to the PTS by people who wanted to contact the "
 "subscribers of the package.  This can be done by sending mail to "
 msgid ""
 "Any non-automatic email sent to the PTS by people who wanted to contact the "
 "subscribers of the package.  This can be done by sending mail to "


@@ -2115,13 +2147,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1067
+#: resources.dbk:1078

 msgid "<literal>contact</literal>"
 msgstr "<literal>contact</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>contact</literal>"
 msgstr "<literal>contact</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1070
+#: resources.dbk:1081

 msgid ""
 "Mails sent to the maintainer through the *@packages.debian.org email aliases."
 msgstr ""
 msgid ""
 "Mails sent to the maintainer through the *@packages.debian.org email aliases."
 msgstr ""


@@ -2129,35 +2161,34 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1076
+#: resources.dbk:1087

 msgid "<literal>summary</literal>"
 msgstr "<literal>summary</literal>"
 
 msgid "<literal>summary</literal>"
 msgstr "<literal>summary</literal>"
 

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1079
+#: resources.dbk:1090

 msgid ""
 msgid ""

-"Regular summary emails about the package's status.  Currently, only "
-"progression in <literal>testing</literal> is sent."
+"Regular summary emails about the package's status, including progression "
+"into <literal>testing</literal>, <ulink url=\"&url-dehs;\">DEHS</ulink> "
+"notifications of new upstream versions, and a notification if the package is "
+"removed or orphaned."

 msgstr ""
 msgstr ""

-"パッケージのステータスについて、一定期間のサマリメール。現状では <literal>テ"
-"スト版 (testing)</literal> への移行状況のみが送られている。"

 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1086
+#: resources.dbk:1100

 msgid "You can also decide to receive additional information:"
 msgstr "受け取るかどうかを決められる追加情報:"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgid "You can also decide to receive additional information:"
 msgstr "受け取るかどうかを決められる追加情報:"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1090
+#: resources.dbk:1104

 msgid "<literal>upload-binary</literal>"
 msgstr "<literal>upload-binary</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>upload-binary</literal>"
 msgstr "<literal>upload-binary</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1093
+#: resources.dbk:1107

 msgid ""
 "The email notification from <command>katie</command> when an uploaded binary "
 "package is accepted.  In other words, whenever a build daemon or a porter "
 msgid ""
 "The email notification from <command>katie</command> when an uploaded binary "
 "package is accepted.  In other words, whenever a build daemon or a porter "


@@ -2172,13 +2203,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1101
+#: resources.dbk:1115

 msgid "<literal>cvs</literal>"
 msgstr "<literal>cvs</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>cvs</literal>"
 msgstr "<literal>cvs</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1104
+#: resources.dbk:1118

 msgid ""
 "VCS commit notifications, if the package has a VCS repository and the "
 "maintainer has set up forwarding of commit notifications to the PTS. The "
 msgid ""
 "VCS commit notifications, if the package has a VCS repository and the "
 "maintainer has set up forwarding of commit notifications to the PTS. The "


@@ -2192,13 +2223,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1112
+#: resources.dbk:1126

 msgid "<literal>ddtp</literal>"
 msgstr "<literal>ddtp</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>ddtp</literal>"
 msgstr "<literal>ddtp</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1115
+#: resources.dbk:1129

 msgid ""
 "Translations of descriptions or debconf templates submitted to the Debian "
 "Description Translation Project."
 msgid ""
 "Translations of descriptions or debconf templates submitted to the Debian "
 "Description Translation Project."


@@ -2208,13 +2239,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1121
+#: resources.dbk:1135

 msgid "<literal>derivatives</literal>"
 msgstr "<literal>derivatives</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>derivatives</literal>"
 msgstr "<literal>derivatives</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1124
+#: resources.dbk:1138

 msgid ""
 "Information about changes made to the package in derivative distributions "
 "(for example Ubuntu)."
 msgid ""
 "Information about changes made to the package in derivative distributions "
 "(for example Ubuntu)."


@@ -2223,13 +2254,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:1131
+#: resources.dbk:1145

 msgid "The PTS email interface"
 msgstr "PTS メールインターフェイス"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The PTS email interface"
 msgstr "PTS メールインターフェイス"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1133
+#: resources.dbk:1147

 msgid ""
 "You can control your subscription(s) to the PTS by sending various commands "
 "to <email>pts@qa.debian.org</email>."
 msgid ""
 "You can control your subscription(s) to the PTS by sending various commands "
 "to <email>pts@qa.debian.org</email>."


@@ -2239,13 +2270,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1138
+#: resources.dbk:1152

 msgid "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1141
+#: resources.dbk:1155

 msgid ""
 "Subscribes <replaceable>email</replaceable> to communications related to the "
 "source package <replaceable>sourcepackage</replaceable>.  Sender address is "
 msgid ""
 "Subscribes <replaceable>email</replaceable> to communications related to the "
 "source package <replaceable>sourcepackage</replaceable>.  Sender address is "


@@ -2263,13 +2294,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1151
+#: resources.dbk:1165

 msgid "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1154
+#: resources.dbk:1168

 msgid ""
 "Removes a previous subscription to the source package "
 "<replaceable>sourcepackage</replaceable> using the specified email address "
 msgid ""
 "Removes a previous subscription to the source package "
 "<replaceable>sourcepackage</replaceable> using the specified email address "


@@ -2281,13 +2312,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1161
+#: resources.dbk:1175

 msgid "<literal>unsubscribeall [&lt;email&gt;]</literal>"
 msgstr "<literal>unsubscribeall [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>unsubscribeall [&lt;email&gt;]</literal>"
 msgstr "<literal>unsubscribeall [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1164
+#: resources.dbk:1178

 msgid ""
 "Removes all subscriptions of the specified email address or the sender "
 "address if the second argument is left out."
 msgid ""
 "Removes all subscriptions of the specified email address or the sender "
 "address if the second argument is left out."


@@ -2297,13 +2328,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1170
+#: resources.dbk:1184

 msgid "<literal>which [&lt;email&gt;]</literal>"
 msgstr "<literal>which [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>which [&lt;email&gt;]</literal>"
 msgstr "<literal>which [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1173
+#: resources.dbk:1187

 msgid ""
 "Lists all subscriptions for the sender or the email address optionally "
 "specified."
 msgid ""
 "Lists all subscriptions for the sender or the email address optionally "
 "specified."


@@ -2312,13 +2343,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1179
+#: resources.dbk:1193

 msgid "<literal>keyword [&lt;email&gt;]</literal>"
 msgstr "<literal>keyword [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>keyword [&lt;email&gt;]</literal>"
 msgstr "<literal>keyword [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1182
+#: resources.dbk:1196

 msgid ""
 "Tells you the keywords that you are accepting.  For an explanation of "
 "keywords, <link linkend=\"pkg-tracking-system\">see above</link>.  Here's a "
 msgid ""
 "Tells you the keywords that you are accepting.  For an explanation of "
 "keywords, <link linkend=\"pkg-tracking-system\">see above</link>.  Here's a "


@@ -2330,14 +2361,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1189
+#: resources.dbk:1203

 msgid ""
 "<literal>bts</literal>: mails coming from the Debian Bug Tracking System"
 msgstr "<literal>bts</literal>: Debian バグ追跡システムからのメール"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid ""
 "<literal>bts</literal>: mails coming from the Debian Bug Tracking System"
 msgstr "<literal>bts</literal>: Debian バグ追跡システムからのメール"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1194
+#: resources.dbk:1208

 msgid ""
 "<literal>bts-control</literal>: reply to mails sent to &email-bts-control;"
 msgstr ""
 msgid ""
 "<literal>bts-control</literal>: reply to mails sent to &email-bts-control;"
 msgstr ""


@@ -2345,7 +2376,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1200
+#: resources.dbk:1214

 msgid ""
 "<literal>summary</literal>: automatic summary mails about the state of a "
 "package"
 msgid ""
 "<literal>summary</literal>: automatic summary mails about the state of a "
 "package"


@@ -2353,7 +2384,7 @@ msgstr "<literal>summary</literal>: パッケージ状態の自動サマリメ
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1206
+#: resources.dbk:1220

 msgid ""
 "<literal>contact</literal>: mails sent to the maintainer through the "
 "*@packages.debian.org aliases"
 msgid ""
 "<literal>contact</literal>: mails sent to the maintainer through the "
 "*@packages.debian.org aliases"


@@ -2363,20 +2394,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1212
+#: resources.dbk:1226

 msgid "<literal>cvs</literal>: notification of VCS commits"
 msgstr "<literal>cvs</literal>: VCS へのコミット通知"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid "<literal>cvs</literal>: notification of VCS commits"
 msgstr "<literal>cvs</literal>: VCS へのコミット通知"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1217
+#: resources.dbk:1231

 msgid ""
 "<literal>ddtp</literal>: translations of descriptions and debconf templates"
 msgstr "<literal>ddtp</literal>: description や debconf テンプレートの翻訳"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid ""
 "<literal>ddtp</literal>: translations of descriptions and debconf templates"
 msgstr "<literal>ddtp</literal>: description や debconf テンプレートの翻訳"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1222
+#: resources.dbk:1236

 msgid ""
 "<literal>derivatives</literal>: changes made on the package by derivative "
 "distributions"
 msgid ""
 "<literal>derivatives</literal>: changes made on the package by derivative "
 "distributions"


@@ -2386,7 +2417,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1228
+#: resources.dbk:1242

 msgid ""
 "<literal>upload-source</literal>: announce of a new source upload that has "
 "been accepted"
 msgid ""
 "<literal>upload-source</literal>: announce of a new source upload that has "
 "been accepted"


@@ -2396,7 +2427,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1234
+#: resources.dbk:1248

 msgid ""
 "<literal>upload-binary</literal>: announce of a new binary-only upload "
 "(porting)"
 msgid ""
 "<literal>upload-binary</literal>: announce of a new binary-only upload "
 "(porting)"


@@ -2406,7 +2437,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1240
+#: resources.dbk:1254

 msgid ""
 "<literal>katie-other</literal>: other mails from ftpmasters (override "
 "disparity, etc.)"
 msgid ""
 "<literal>katie-other</literal>: other mails from ftpmasters (override "
 "disparity, etc.)"


@@ -2416,7 +2447,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1246
+#: resources.dbk:1260

 msgid ""
 "<literal>default</literal>: all the other mails (those which aren't "
 "automatic)"
 msgid ""
 "<literal>default</literal>: all the other mails (those which aren't "
 "automatic)"


@@ -2424,13 +2455,13 @@ msgstr "<literal>default</literal>: 他のすべてのメール (自動ではな
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1253
+#: resources.dbk:1267

 msgid "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1256
+#: resources.dbk:1270

 msgid ""
 "Same as the previous item but for the given source package, since you may "
 "select a different set of keywords for each source package."
 msgid ""
 "Same as the previous item but for the given source package, since you may "
 "select a different set of keywords for each source package."


@@ -2440,7 +2471,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1262
+#: resources.dbk:1276

 msgid ""
 "<literal>keyword [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</literal>"
 msgstr ""
 msgid ""
 "<literal>keyword [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</literal>"
 msgstr ""


@@ -2448,7 +2479,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1265
+#: resources.dbk:1279

 #, fuzzy
 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 #, fuzzy
 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "


@@ -2461,7 +2492,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1272
+#: resources.dbk:1286

 msgid ""
 "<literal>keywordall [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</"
 "literal>"
 msgid ""
 "<literal>keywordall [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</"
 "literal>"


@@ -2471,7 +2502,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1275
+#: resources.dbk:1289

 #, fuzzy
 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 #, fuzzy
 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "


@@ -2484,7 +2515,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1282
+#: resources.dbk:1296

 msgid ""
 "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;] {+|-|=} &lt;list of "
 "keywords&gt;</literal>"
 msgid ""
 "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;] {+|-|=} &lt;list of "
 "keywords&gt;</literal>"


@@ -2494,7 +2525,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1285
+#: resources.dbk:1299

 msgid ""
 "Same as previous item but overrides the keywords list for the indicated "
 "source package."
 msgid ""
 "Same as previous item but overrides the keywords list for the indicated "
 "source package."


@@ -2504,20 +2535,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1291
+#: resources.dbk:1305

 msgid "<literal>quit | thanks | --</literal>"
 msgstr "<literal>quit | thanks | --</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>quit | thanks | --</literal>"
 msgstr "<literal>quit | thanks | --</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1294
+#: resources.dbk:1308

 msgid "Stops processing commands.  All following lines are ignored by the bot."
 msgstr ""
 "コマンド処理を終了します。これ以下の全ての行は bot からは無視されます。"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Stops processing commands.  All following lines are ignored by the bot."
 msgstr ""
 "コマンド処理を終了します。これ以下の全ての行は bot からは無視されます。"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1300
+#: resources.dbk:1314

 msgid ""
 "The <command>pts-subscribe</command> command-line utility (from the "
 "<systemitem role=\"package\">devscripts</systemitem> package) can be handy "
 msgid ""
 "The <command>pts-subscribe</command> command-line utility (from the "
 "<systemitem role=\"package\">devscripts</systemitem> package) can be handy "


@@ -2531,13 +2562,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:1308
+#: resources.dbk:1322

 msgid "Filtering PTS mails"
 msgstr "PTS からのメールを振り分ける"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Filtering PTS mails"
 msgstr "PTS からのメールを振り分ける"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1310
+#: resources.dbk:1324

 msgid ""
 "Once you are subscribed to a package, you will get the mails sent to "
 "<literal><replaceable>sourcepackage</replaceable>@&pts-host;</literal>.  "
 msgid ""
 "Once you are subscribed to a package, you will get the mails sent to "
 "<literal><replaceable>sourcepackage</replaceable>@&pts-host;</literal>.  "


@@ -2555,7 +2586,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1318
+#: resources.dbk:1332

 msgid ""
 "Here is an example of added headers for a source upload notification on the "
 "<systemitem role=\"package\">dpkg</systemitem> package:"
 msgid ""
 "Here is an example of added headers for a source upload notification on the "
 "<systemitem role=\"package\">dpkg</systemitem> package:"


@@ -2565,7 +2596,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: resources.dbk:1322
+#: resources.dbk:1336

 #, no-wrap
 msgid ""
 "X-Loop: dpkg@&pts-host;\n"
 #, no-wrap
 msgid ""
 "X-Loop: dpkg@&pts-host;\n"


@@ -2580,13 +2611,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:1330
+#: resources.dbk:1344

 msgid "Forwarding VCS commits in the PTS"
 msgstr "PTS での VCS コミットを転送する"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Forwarding VCS commits in the PTS"
 msgstr "PTS での VCS コミットを転送する"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1332
+#: resources.dbk:1346

 msgid ""
 "If you use a publicly accessible VCS repository for maintaining your Debian "
 "package, you may want to forward the commit notification to the PTS so that "
 msgid ""
 "If you use a publicly accessible VCS repository for maintaining your Debian "
 "package, you may want to forward the commit notification to the PTS so that "


@@ -2599,7 +2630,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1338
+#: resources.dbk:1352

 msgid ""
 "Once you set up the VCS repository to generate commit notifications, you "
 "just have to make sure it sends a copy of those mails to "
 msgid ""
 "Once you set up the VCS repository to generate commit notifications, you "
 "just have to make sure it sends a copy of those mails to "


@@ -2618,7 +2649,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1347
+#: resources.dbk:1361

 msgid ""
 "For Subversion repositories, the usage of svnmailer is recommended.  See "
 "<ulink url=\"&url-alioth-pkg;\" /> for an example on how to do it."
 msgid ""
 "For Subversion repositories, the usage of svnmailer is recommended.  See "
 "<ulink url=\"&url-alioth-pkg;\" /> for an example on how to do it."


@@ -2628,13 +2659,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:1353
+#: resources.dbk:1367

 msgid "The PTS web interface"
 msgstr "PTS ウェブインターフェイス"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "The PTS web interface"
 msgstr "PTS ウェブインターフェイス"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1355
+#: resources.dbk:1369

 msgid ""
 "The PTS has a web interface at <ulink url=\"http://&pts-host;/\"></ulink> "
 "that puts together a lot of information about each source package.  It "
 msgid ""
 "The PTS has a web interface at <ulink url=\"http://&pts-host;/\"></ulink> "
 "that puts together a lot of information about each source package.  It "


@@ -2654,7 +2685,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1365
+#: resources.dbk:1379

 msgid ""
 "You can jump directly to the web page concerning a specific source package "
 "with a URL like <literal>http://&pts-host;/<replaceable>sourcepackage</"
 msgid ""
 "You can jump directly to the web page concerning a specific source package "
 "with a URL like <literal>http://&pts-host;/<replaceable>sourcepackage</"


@@ -2666,7 +2697,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1370
+#: resources.dbk:1384

 #, fuzzy
 msgid ""
 "This web interface has been designed like a portal for the development of "
 #, fuzzy
 msgid ""
 "This web interface has been designed like a portal for the development of "


@@ -2676,18 +2707,19 @@ msgid ""
 msgstr ""
 "このウェブインターフェイスは、パッケージ開発のポータルとなるようにデザインさ"
 "れています: 自分のパッケージのページ上にカスタムしたコンテンツを付け加えられ"
 msgstr ""
 "このウェブインターフェイスは、パッケージ開発のポータルとなるようにデザインさ"
 "れています: 自分のパッケージのページ上にカスタムしたコンテンツを付け加えられ"

-"ます。固定情報 (news 項目) や新しい項目を latest news section に追加できます。"
+"ます。固定情報 (news 項目) や新しい項目を latest news section に追加できま"
+"す。"

 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1376
+#: resources.dbk:1390

 #, fuzzy
 msgid "Static news items can be used to indicate:"
 msgstr "Static news 項目 can be used to indicate:"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "Static news items can be used to indicate:"
 msgstr "Static news 項目 can be used to indicate:"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1381
+#: resources.dbk:1395

 msgid ""
 "the availability of a project hosted on <link linkend=\"alioth\">Alioth</"
 "link> for co-maintaining the package"
 msgid ""
 "the availability of a project hosted on <link linkend=\"alioth\">Alioth</"
 "link> for co-maintaining the package"


@@ -2697,25 +2729,25 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1387
+#: resources.dbk:1401

 msgid "a link to the upstream web site"
 msgstr "upstream のウェブサイトへのリンク"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "a link to the upstream web site"
 msgstr "upstream のウェブサイトへのリンク"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1392
+#: resources.dbk:1406

 msgid "a link to the upstream bug tracker"
 msgstr "upstream のバグ追跡システムへのリンク"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "a link to the upstream bug tracker"
 msgstr "upstream のバグ追跡システムへのリンク"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1397
+#: resources.dbk:1411

 msgid "the existence of an IRC channel dedicated to the software"
 msgstr "ソフトウェア専用 IRC チャンネルの存在"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "the existence of an IRC channel dedicated to the software"
 msgstr "ソフトウェア専用 IRC チャンネルの存在"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1402
+#: resources.dbk:1416

 msgid ""
 "any other available resource that could be useful in the maintenance of the "
 "package"
 msgid ""
 "any other available resource that could be useful in the maintenance of the "
 "package"


@@ -2723,56 +2755,56 @@ msgstr "パッケージのメンテナンスについて、他の利用可能な
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1408
+#: resources.dbk:1422

 msgid "Usual news items may be used to announce that:"
 msgstr "アナウンスされる通常の news 項目:"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Usual news items may be used to announce that:"
 msgstr "アナウンスされる通常の news 項目:"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1413
+#: resources.dbk:1427

 msgid "beta packages are available for testing"
 msgstr "テスト用にベータ版パッケージが準備できたこと"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "beta packages are available for testing"
 msgstr "テスト用にベータ版パッケージが準備できたこと"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1418
+#: resources.dbk:1432

 msgid "final packages are expected for next week"
 msgstr "来週に最終的なパッケージが期待されている"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "final packages are expected for next week"
 msgstr "来週に最終的なパッケージが期待されている"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1423
+#: resources.dbk:1437

 msgid "the packaging is about to be redone from scratch"
 msgstr "パッケージをスクラッチから再構築しようとしている"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "the packaging is about to be redone from scratch"
 msgstr "パッケージをスクラッチから再構築しようとしている"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1428
+#: resources.dbk:1442

 msgid "backports are available"
 msgstr "バックポート版が準備できた"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "backports are available"
 msgstr "バックポート版が準備できた"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1433
+#: resources.dbk:1447

 msgid ""
 "the maintainer is on vacation (if they wish to publish this information)"
 msgstr "メンテナが休暇中 (この情報を公開したい場合に表示)"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "the maintainer is on vacation (if they wish to publish this information)"
 msgstr "メンテナが休暇中 (この情報を公開したい場合に表示)"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1438
+#: resources.dbk:1452

 msgid "a NMU is being worked on"
 msgstr "NMU 進行中"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "a NMU is being worked on"
 msgstr "NMU 進行中"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1443
+#: resources.dbk:1457

 msgid "something important will affect the package"
 msgstr "何かパッケージに重要な影響を与える"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "something important will affect the package"
 msgstr "何かパッケージに重要な影響を与える"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1448
+#: resources.dbk:1462

 #, fuzzy
 msgid ""
 "Both kinds of news are generated in a similar manner: you just have to send "
 #, fuzzy
 msgid ""
 "Both kinds of news are generated in a similar manner: you just have to send "


@@ -2795,7 +2827,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1459
+#: resources.dbk:1473

 msgid ""
 "Here are a few examples of valid mails used to generate news items in the "
 "PTS.  The first one adds a link to the cvsweb interface of debian-cd in the "
 msgid ""
 "Here are a few examples of valid mails used to generate news items in the "
 "PTS.  The first one adds a link to the cvsweb interface of debian-cd in the "


@@ -2807,7 +2839,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: resources.dbk:1464
+#: resources.dbk:1478

 #, no-wrap
 msgid ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
 #, no-wrap
 msgid ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"


@@ -2826,7 +2858,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1472
+#: resources.dbk:1486

 msgid ""
 "The second one is an announcement sent to a mailing list which is also sent "
 "to the PTS so that it is published on the PTS web page of the package.  Note "
 msgid ""
 "The second one is an announcement sent to a mailing list which is also sent "
 "to the PTS so that it is published on the PTS web page of the package.  Note "


@@ -2838,7 +2870,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>

-#: resources.dbk:1477
+#: resources.dbk:1491

 #, no-wrap
 msgid ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
 #, no-wrap
 msgid ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"


@@ -2869,7 +2901,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1490
+#: resources.dbk:1504

 #, fuzzy
 msgid ""
 "Think twice before adding a news item to the PTS because you won't be able "
 #, fuzzy
 msgid ""
 "Think twice before adding a news item to the PTS because you won't be able "


@@ -2885,13 +2917,13 @@ msgstr ""
 # type: Content of: <chapter><section><title>
 # FIXME ページ名が訳されないのでそのままにしてある
 #. type: Content of: <chapter><section><title>
 # type: Content of: <chapter><section><title>
 # FIXME ページ名が訳されないのでそのままにしてある
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:1500
+#: resources.dbk:1514

 msgid "Developer's packages overview"
 msgstr "Developer's packages overview"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Developer's packages overview"
 msgstr "Developer's packages overview"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1502
+#: resources.dbk:1516

 msgid ""
 "A QA (quality assurance) web portal is available at <ulink url=\"&url-ddpo;"
 "\"></ulink> which displays a table listing all the packages of a single "
 msgid ""
 "A QA (quality assurance) web portal is available at <ulink url=\"&url-ddpo;"
 "\"></ulink> which displays a table listing all the packages of a single "


@@ -2900,16 +2932,16 @@ msgid ""
 "bugs by severity, list of available versions in each distribution, testing "
 "status and much more including links to any other useful information."
 msgstr ""
 "bugs by severity, list of available versions in each distribution, testing "
 "status and much more including links to any other useful information."
 msgstr ""

-"QA (quality assurance、品質保証) ウェブポータルが <ulink url=\"&url-ddpo;\">"
-"</ulink> から利用できます。これは、一人の開発者のすべてのパッケージの一覧表を"
-"表示します (集団で行っている場合は、共同メンテナとしてとして表示されます) 。"
-"ã\81\93ã\81®è¡¨ã\81¯é\96\8bç\99ºè\80\85ã\81®ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81«ã\81¤ã\81\84ã\81¦ã\81\86ã\81¾ã\81\8fè¦\81ç´\84ã\81\95ã\82\8cã\81\9fæ\83\85å ±ã\82\92ä¸\8eã\81\88ã\81¦ã\81\8fã\82\8cã\81¾ã\81\99: é\87\8dè¦\81度"
-"ã\81«å¿\9cã\81\98ã\81\9fã\83\90ã\82°ã\81®æ\95°ã\82\84ã\81\9dã\82\8cã\81\9eã\82\8cã\81®ã\83\87ã\82£ã\82¹ã\83\88ã\83ªã\83\93ã\83¥ã\83¼ã\82·ã\83§ã\83³ã\81§å\88©ç\94¨å\8f¯è\83½ã\81ªã\83\90ã\83¼ã\82¸ã\83§ã\83³ç\95ªå\8f·ã\80\81"
-"testing の状態やその他有用な情報源へのリンクなどを含んでいます。"
+"QA (quality assurance、品質保証) ウェブポータルが <ulink url=\"&url-ddpo;"
+"\"></ulink> から利用できます。これは、一人の開発者のすべてのパッケージの一覧"
+"表を表示します (集団で行っている場合は、共同メンテナとしてとして表示されま"
+"ã\81\99) ã\80\82ã\81\93ã\81®è¡¨ã\81¯é\96\8bç\99ºè\80\85ã\81®ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81«ã\81¤ã\81\84ã\81¦ã\81\86ã\81¾ã\81\8fè¦\81ç´\84ã\81\95ã\82\8cã\81\9fæ\83\85å ±ã\82\92ä¸\8eã\81\88ã\81¦ã\81\8fã\82\8cã\81¾"
+"ã\81\99: é\87\8dè¦\81度ã\81«å¿\9cã\81\98ã\81\9fã\83\90ã\82°ã\81®æ\95°ã\82\84ã\81\9dã\82\8cã\81\9eã\82\8cã\81®ã\83\87ã\82£ã\82¹ã\83\88ã\83ªã\83\93ã\83¥ã\83¼ã\82·ã\83§ã\83³ã\81§å\88©ç\94¨å\8f¯è\83½ã\81ªã\83\90ã\83¼"
+"ジョン番号、testing の状態やその他有用な情報源へのリンクなどを含んでいます。"

 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1511
+#: resources.dbk:1525

 #, fuzzy
 msgid ""
 "It is a good idea to look up your own data regularly so that you don't "
 #, fuzzy
 msgid ""
 "It is a good idea to look up your own data regularly so that you don't "


@@ -2923,13 +2955,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:1518
+#: resources.dbk:1532

 msgid "Debian's GForge installation: Alioth"
 msgstr "Debian での GForge の導入例: Alioth"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 msgid "Debian's GForge installation: Alioth"
 msgstr "Debian での GForge の導入例: Alioth"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1520
+#: resources.dbk:1534

 msgid ""
 "Alioth is a Debian service based on a slightly modified version of the "
 "GForge software (which evolved from SourceForge). This software offers "
 msgid ""
 "Alioth is a Debian service based on a slightly modified version of the "
 "GForge software (which evolved from SourceForge). This software offers "


@@ -2944,9 +2976,9 @@ msgstr ""
 "能全てはウェブインターフェイスから管理します。"
 
 # type: Content of: <chapter><section><para>
 "能全てはウェブインターフェイスから管理します。"
 
 # type: Content of: <chapter><section><para>

+# FIXME: too long line...

 #. type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1527
-#FIXME: too long line...
+#: resources.dbk:1541

 msgid ""
 "It is intended to provide facilities to free software projects backed or led "
 "by Debian, facilitate contributions from external developers to projects "
 msgid ""
 "It is intended to provide facilities to free software projects backed or led "
 "by Debian, facilitate contributions from external developers to projects "


@@ -2954,15 +2986,16 @@ msgid ""
 "or its derivatives. It's heavily used by many Debian teams and provides "
 "hosting for all sorts of VCS repositories."
 msgstr ""
 "or its derivatives. It's heavily used by many Debian teams and provides "
 "hosting for all sorts of VCS repositories."
 msgstr ""

-"Debian がバックアップする、あるいは Debian が中心となっているフリーソフトウェア"
-"プロジェクトに対して支援を提供、外部の開発者からの支援協力を Debian によって"
-"始められたプロジェクトを与えたり、Debian やその派生ディストリビューションのプロモーション"
-"が目的であるプロジェクトを支援する機能を提供するためにあります。多くの Debian "
-"チームに非常によく利用されており、あらゆる種類の VCS リポジトリを提供しています。"
+"Debian がバックアップする、あるいは Debian が中心となっているフリーソフトウェ"
+"アプロジェクトに対して支援を提供、外部の開発者からの支援協力を Debian によっ"
+"て始められたプロジェクトを与えたり、Debian やその派生ディストリビューションの"
+"プロモーションが目的であるプロジェクトを支援する機能を提供するためにありま"
+"す。多くの Debian チームに非常によく利用されており、あらゆる種類の VCS リポジ"
+"トリを提供しています。"

 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1534
+#: resources.dbk:1548

 msgid ""
 "All Debian developers automatically have an account on Alioth.  They can "
 "activate it by using the recover password facility.  External developers can "
 msgid ""
 "All Debian developers automatically have an account on Alioth.  They can "
 "activate it by using the recover password facility.  External developers can "


@@ -2974,49 +3007,49 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1539
+#: resources.dbk:1553

 msgid "For more information please visit the following links:"
 msgstr "詳細な情報については、以下のリンクを参照下さい："
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "For more information please visit the following links:"
 msgstr "詳細な情報については、以下のリンクを参照下さい："
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:1542
+#: resources.dbk:1556

 msgid "<ulink url=\"&url-alioth-wiki;\" />"
 msgstr "<ulink url=\"&url-alioth-wiki;\" />"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"&url-alioth-wiki;\" />"
 msgstr "<ulink url=\"&url-alioth-wiki;\" />"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:1543
+#: resources.dbk:1557

 msgid "<ulink url=\"&url-alioth-faq;\" />"
 msgstr "<ulink url=\"&url-alioth-faq;\" />"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"&url-alioth-faq;\" />"
 msgstr "<ulink url=\"&url-alioth-faq;\" />"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:1544
+#: resources.dbk:1558

 msgid "<ulink url=\"&url-alioth-pkg;\" />"
 msgstr "<ulink url=\"&url-alioth-pkg;\" />"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"&url-alioth-pkg;\" />"
 msgstr "<ulink url=\"&url-alioth-pkg;\" />"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:1545
+#: resources.dbk:1559

 msgid "<ulink url=\"&url-alioth;\" />"
 msgstr "<ulink url=\"&url-alioth;\" />"
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 msgid "<ulink url=\"&url-alioth;\" />"
 msgstr "<ulink url=\"&url-alioth;\" />"
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:1550
+#: resources.dbk:1564

 msgid "Goodies for Developers"
 msgstr "開発者への特典"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 msgid "Goodies for Developers"
 msgstr "開発者への特典"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:1552
+#: resources.dbk:1566

 msgid "LWN Subscriptions"
 msgstr "LWN の購読"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "LWN Subscriptions"
 msgstr "LWN の購読"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1554
+#: resources.dbk:1568

 msgid ""
 "Since October of 2002, HP has sponsored a subscription to LWN for all "
 "interested Debian developers.  Details on how to get access to this benefit "
 msgid ""
 "Since October of 2002, HP has sponsored a subscription to LWN for all "
 "interested Debian developers.  Details on how to get access to this benefit "


@@ -3029,18 +3062,26 @@ msgstr ""
 "い。"
 
 #. type: Content of: <chapter><section><section><title>
 "い。"
 
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:1561
+#: resources.dbk:1575

 msgid "Gandi.net Hosting Discount"
 msgstr "Gandi.net ホスティング割引"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 msgid "Gandi.net Hosting Discount"
 msgstr "Gandi.net ホスティング割引"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1563
+#: resources.dbk:1577

 msgid ""
 "As of November 2008, Gandi.net offers a discount rate on their VPS hosting "
 "for Debian Developers.  See <ulink url=\"http://&lists-host;/debian-devel-"
 "announce/2008/11/msg00004.html\"></ulink>."
 msgstr ""
 "2008年11月現在、Gandi.net は Debian 開発者に対して VPS ホスティングを割引価格"
 msgid ""
 "As of November 2008, Gandi.net offers a discount rate on their VPS hosting "
 "for Debian Developers.  See <ulink url=\"http://&lists-host;/debian-devel-"
 "announce/2008/11/msg00004.html\"></ulink>."
 msgstr ""
 "2008年11月現在、Gandi.net は Debian 開発者に対して VPS ホスティングを割引価格"

-"で提供しています。<ulink url=\"http://&lists-host;/debian-devel-announce/2008/11/msg00004.html\"></ulink>"
-"を参照してください。"
+"で提供しています。<ulink url=\"http://&lists-host;/debian-devel-"
+"announce/2008/11/msg00004.html\"></ulink>を参照してください。"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "Regular summary emails about the package's status.  Currently, only "
+#~ "progression in <literal>testing</literal> is sent."
+#~ msgstr ""
+#~ "パッケージのステータスについて、一定期間のサマリメール。現状では <literal>"
+#~ "テスト版 (testing)</literal> への移行状況のみが送られている。"

diff --git a/po4a/ja/tools.po b/po4a/ja/tools.po
index f24c7f4863191de516440db7c8cd689e1817b0b3..5815f7779950ac09fc3482aaa4e916c49b44f2e6 100644 (file)
--- a/po4a/ja/tools.po
+++ b/po4a/ja/tools.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.4.1\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.4.1\n"

-"POT-Creation-Date: 2009-09-06 02:31+0900\n"
+"POT-Creation-Date: 2010-01-04 00:20+0100\n"

 "PO-Revision-Date: 2009-07-06 02:27+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
 "PO-Revision-Date: 2009-07-06 02:27+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"


@@ -390,56 +390,12 @@ msgstr ""
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 #: tools.dbk:179
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 #: tools.dbk:179

-msgid "<systemitem role=\"package\">debmake</systemitem>"
-msgstr "<systemitem role=\"package\">debmake</systemitem>"
-
-# type: Content of: <appendix><section><section><para>
-#. type: Content of: <appendix><section><section><para>
-#: tools.dbk:181
-#, fuzzy
-msgid ""
-"<systemitem role=\"package\">debmake</systemitem>, a precursor to "
-"<systemitem role=\"package\">debhelper</systemitem>, is a more coarse-"
-"grained <filename>debian/rules</filename> assistant.  It includes two main "
-"programs: <command>deb-make</command>, which can be used to help a "
-"maintainer convert a regular (non-Debian) source archive into a Debian "
-"source package; and <command>debstd</command>, which incorporates in one big "
-"shot the same sort of automated functions that one finds in <systemitem role="
-"\"package\">debhelper</systemitem>."
-msgstr ""
-"<systemitem role=\"package\">debhelper</systemitem> の前身、<systemitem role="
-"\"package\">debmake</systemitem>は、より木目の粗い <filename>debian/rules</"
-"filename> の補助ツールです。これは二つの主なプログラムを含んでいます: "
-"<command>deb-make</command> は、メンテナが通常の (Debian 由来ではない) ソース"
-"アーカイブを Debian ソースパッケージに変換する手伝いをするのに使います。そし"
-"て <command>debstd</command> は、"
-
-# type: Content of: <appendix><section><section><para>
-#. type: Content of: <appendix><section><section><para>
-#: tools.dbk:191
-msgid ""
-"The consensus is that <systemitem role=\"package\">debmake</systemitem> is "
-"now deprecated in favor of <systemitem role=\"package\">debhelper</"
-"systemitem>.  It is a bug to use <systemitem role=\"package\">debmake</"
-"systemitem> in new packages.  New packages using <systemitem role=\"package"
-"\">debmake</systemitem> will be rejected from the archive."
-msgstr ""
-"<systemitem role=\"package\">debmake</systemitem> は、<systemitem role="
-"\"package\">debhelper</systemitem> を優先して使い、現在は非推奨 (deprecated) "
-"というコンセンサスができています。新しいパッケージで <systemitem role="
-"\"package\">debmake</systemitem> を使うのはバグとなっています。新たなパッケー"
-"ジで <systemitem role=\"package\">debmake</systemitem> を使っているものはアー"
-"カイブから reject されます。"
-
-# type: Content of: <appendix><section><section><title>
-#. type: Content of: <appendix><section><section><title>
-#: tools.dbk:200

 msgid "<systemitem role=\"package\">dh-make</systemitem>"
 msgstr "<systemitem role=\"package\">dh-make</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dh-make</systemitem>"
 msgstr "<systemitem role=\"package\">dh-make</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:202
+#: tools.dbk:181

 #, fuzzy
 msgid ""
 "The <systemitem role=\"package\">dh-make</systemitem> package contains "
 #, fuzzy
 msgid ""
 "The <systemitem role=\"package\">dh-make</systemitem> package contains "


@@ -458,7 +414,7 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:210
+#: tools.dbk:189

 msgid ""
 "While the rules files generated by <command>dh_make</command> are in general "
 "a sufficient basis for a working package, they are still just the "
 msgid ""
 "While the rules files generated by <command>dh_make</command> are in general "
 "a sufficient basis for a working package, they are still just the "


@@ -469,13 +425,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:218
+#: tools.dbk:197

 msgid "<systemitem role=\"package\">yada</systemitem>"
 msgstr "<systemitem role=\"package\">yada</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">yada</systemitem>"
 msgstr "<systemitem role=\"package\">yada</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:220
+#: tools.dbk:199

 msgid ""
 "<systemitem role=\"package\">yada</systemitem> is another packaging helper "
 "tool.  It uses a <filename>debian/packages</filename> file to auto-generate "
 msgid ""
 "<systemitem role=\"package\">yada</systemitem> is another packaging helper "
 "tool.  It uses a <filename>debian/packages</filename> file to auto-generate "


@@ -489,7 +445,7 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:230
+#: tools.dbk:209

 msgid ""
 "For more informations see <literal><ulink url=\"http://yada.alioth.debian."
 "org/\">YADA site</ulink></literal>."
 msgid ""
 "For more informations see <literal><ulink url=\"http://yada.alioth.debian."
 "org/\">YADA site</ulink></literal>."


@@ -499,13 +455,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:236
+#: tools.dbk:215

 msgid "<systemitem role=\"package\">equivs</systemitem>"
 msgstr "<systemitem role=\"package\">equivs</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">equivs</systemitem>"
 msgstr "<systemitem role=\"package\">equivs</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:238
+#: tools.dbk:217

 msgid ""
 "<systemitem role=\"package\">equivs</systemitem> is another package for "
 "making packages.  It is often suggested for local use if you need to make a "
 msgid ""
 "<systemitem role=\"package\">equivs</systemitem> is another package for "
 "making packages.  It is often suggested for local use if you need to make a "


@@ -516,13 +472,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><title>
 #. type: Content of: <appendix><section><title>
 
 # type: Content of: <appendix><section><title>
 #. type: Content of: <appendix><section><title>

-#: tools.dbk:249
+#: tools.dbk:228

 msgid "Package builders"
 msgstr "パッケージ作成ツール"
 
 # type: Content of: <appendix><section><para>
 #. type: Content of: <appendix><section><para>
 msgid "Package builders"
 msgstr "パッケージ作成ツール"
 
 # type: Content of: <appendix><section><para>
 #. type: Content of: <appendix><section><para>

-#: tools.dbk:251
+#: tools.dbk:230

 msgid ""
 "The following packages help with the package building process, general "
 "driving <command>dpkg-buildpackage</command> as well as handling supporting "
 msgid ""
 "The following packages help with the package building process, general "
 "driving <command>dpkg-buildpackage</command> as well as handling supporting "


@@ -531,13 +487,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:255
+#: tools.dbk:234

 msgid "<systemitem role=\"package\">cvs-buildpackage</systemitem>"
 msgstr "<systemitem role=\"package\">cvs-buildpackage</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">cvs-buildpackage</systemitem>"
 msgstr "<systemitem role=\"package\">cvs-buildpackage</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:257
+#: tools.dbk:236

 msgid ""
 "<systemitem role=\"package\">cvs-buildpackage</systemitem> provides the "
 "capability to inject or import Debian source packages into a CVS repository, "
 msgid ""
 "<systemitem role=\"package\">cvs-buildpackage</systemitem> provides the "
 "capability to inject or import Debian source packages into a CVS repository, "


@@ -551,7 +507,7 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:263
+#: tools.dbk:242

 msgid ""
 "These utilities provide an infrastructure to facilitate the use of CVS by "
 "Debian maintainers.  This allows one to keep separate CVS branches of a "
 msgid ""
 "These utilities provide an infrastructure to facilitate the use of CVS by "
 "Debian maintainers.  This allows one to keep separate CVS branches of a "


@@ -562,13 +518,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:272
+#: tools.dbk:251

 msgid "<systemitem role=\"package\">debootstrap</systemitem>"
 msgstr "<systemitem role=\"package\">debootstrap</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">debootstrap</systemitem>"
 msgstr "<systemitem role=\"package\">debootstrap</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:274
+#: tools.dbk:253

 msgid ""
 "The <systemitem role=\"package\">debootstrap</systemitem> package and script "
 "allows you to bootstrap a Debian base system into any part of your "
 msgid ""
 "The <systemitem role=\"package\">debootstrap</systemitem> package and script "
 "allows you to bootstrap a Debian base system into any part of your "


@@ -578,7 +534,7 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:280
+#: tools.dbk:259

 msgid ""
 "Having a system like this can be useful in many ways.  For instance, you can "
 "<command>chroot</command> into it if you want to test your build "
 msgid ""
 "Having a system like this can be useful in many ways.  For instance, you can "
 "<command>chroot</command> into it if you want to test your build "


@@ -588,13 +544,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:288
+#: tools.dbk:267

 msgid "<systemitem role=\"package\">pbuilder</systemitem>"
 msgstr "<systemitem role=\"package\">pbuilder</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">pbuilder</systemitem>"
 msgstr "<systemitem role=\"package\">pbuilder</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:290
+#: tools.dbk:269

 msgid ""
 "<systemitem role=\"package\">pbuilder</systemitem> constructs a chrooted "
 "system, and builds a package inside the chroot.  It is very useful to check "
 msgid ""
 "<systemitem role=\"package\">pbuilder</systemitem> constructs a chrooted "
 "system, and builds a package inside the chroot.  It is very useful to check "


@@ -609,7 +565,7 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:296
+#: tools.dbk:275

 msgid ""
 "A related package is <systemitem role=\"package\">pbuilder-uml</systemitem>, "
 "which goes even further by doing the build within a User Mode Linux "
 msgid ""
 "A related package is <systemitem role=\"package\">pbuilder-uml</systemitem>, "
 "which goes even further by doing the build within a User Mode Linux "


@@ -620,13 +576,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:303
+#: tools.dbk:282

 msgid "<systemitem role=\"package\">sbuild</systemitem>"
 msgstr "<systemitem role=\"package\">sbuild</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">sbuild</systemitem>"
 msgstr "<systemitem role=\"package\">sbuild</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:305
+#: tools.dbk:284

 msgid ""
 "<systemitem role=\"package\">sbuild</systemitem> is another automated "
 "builder.  It can use chrooted environments as well.  It can be used stand-"
 msgid ""
 "<systemitem role=\"package\">sbuild</systemitem> is another automated "
 "builder.  It can use chrooted environments as well.  It can be used stand-"


@@ -646,13 +602,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><title>
 #. type: Content of: <appendix><section><title>
 
 # type: Content of: <appendix><section><title>
 #. type: Content of: <appendix><section><title>

-#: tools.dbk:317
+#: tools.dbk:296

 msgid "Package uploaders"
 msgstr "パッケージのアップロード用ツール"
 
 # type: Content of: <appendix><section><para>
 #. type: Content of: <appendix><section><para>
 msgid "Package uploaders"
 msgstr "パッケージのアップロード用ツール"
 
 # type: Content of: <appendix><section><para>
 #. type: Content of: <appendix><section><para>

-#: tools.dbk:319
+#: tools.dbk:298

 msgid ""
 "The following packages help automate or simplify the process of uploading "
 "packages into the official archive."
 msgid ""
 "The following packages help automate or simplify the process of uploading "
 "packages into the official archive."


@@ -662,13 +618,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:323
+#: tools.dbk:302

 msgid "<systemitem role=\"package\">dupload</systemitem>"
 msgstr "<systemitem role=\"package\">dupload</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dupload</systemitem>"
 msgstr "<systemitem role=\"package\">dupload</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:325
+#: tools.dbk:304

 msgid ""
 "<systemitem role=\"package\">dupload</systemitem> is a package and a script "
 "to automatically upload Debian packages to the Debian archive, to log the "
 msgid ""
 "<systemitem role=\"package\">dupload</systemitem> is a package and a script "
 "to automatically upload Debian packages to the Debian archive, to log the "


@@ -682,13 +638,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:333
+#: tools.dbk:312

 msgid "<systemitem role=\"package\">dput</systemitem>"
 msgstr "<systemitem role=\"package\">dput</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dput</systemitem>"
 msgstr "<systemitem role=\"package\">dput</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:335
+#: tools.dbk:314

 msgid ""
 "The <systemitem role=\"package\">dput</systemitem> package and script does "
 "much the same thing as <systemitem role=\"package\">dupload</systemitem>, "
 msgid ""
 "The <systemitem role=\"package\">dput</systemitem> package and script does "
 "much the same thing as <systemitem role=\"package\">dupload</systemitem>, "


@@ -706,13 +662,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:345
+#: tools.dbk:324

 msgid "<systemitem role=\"package\">dcut</systemitem>"
 msgstr "<systemitem role=\"package\">dcut</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dcut</systemitem>"
 msgstr "<systemitem role=\"package\">dcut</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:347
+#: tools.dbk:326

 msgid ""
 "The <systemitem role=\"package\">dcut</systemitem> script (part of the "
 "package <xref linkend=\"dput\"/> ) helps in removing files from the ftp "
 msgid ""
 "The <systemitem role=\"package\">dcut</systemitem> script (part of the "
 "package <xref linkend=\"dput\"/> ) helps in removing files from the ftp "


@@ -724,13 +680,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><title>
 #. type: Content of: <appendix><section><title>
 
 # type: Content of: <appendix><section><title>
 #. type: Content of: <appendix><section><title>

-#: tools.dbk:355
+#: tools.dbk:334

 msgid "Maintenance automation"
 msgstr "メンテナンスの自動化"
 
 # type: Content of: <appendix><section><para>
 #. type: Content of: <appendix><section><para>
 msgid "Maintenance automation"
 msgstr "メンテナンスの自動化"
 
 # type: Content of: <appendix><section><para>
 #. type: Content of: <appendix><section><para>

-#: tools.dbk:357
+#: tools.dbk:336

 #, fuzzy
 msgid ""
 "The following tools help automate different maintenance tasks, from adding "
 #, fuzzy
 msgid ""
 "The following tools help automate different maintenance tasks, from adding "


@@ -742,13 +698,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:362
+#: tools.dbk:341

 msgid "<systemitem role=\"package\">devscripts</systemitem>"
 msgstr "<systemitem role=\"package\">devscripts</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">devscripts</systemitem>"
 msgstr "<systemitem role=\"package\">devscripts</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:364
+#: tools.dbk:343

 msgid ""
 "<systemitem role=\"package\">devscripts</systemitem> is a package containing "
 "wrappers and tools which are very helpful for maintaining your Debian "
 msgid ""
 "<systemitem role=\"package\">devscripts</systemitem> is a package containing "
 "wrappers and tools which are very helpful for maintaining your Debian "


@@ -765,7 +721,7 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:378
+#: tools.dbk:357

 msgid ""
 "See the <citerefentry> <refentrytitle>devscripts</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> manual page for a complete list of "
 msgid ""
 "See the <citerefentry> <refentrytitle>devscripts</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> manual page for a complete list of "


@@ -777,13 +733,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:385
+#: tools.dbk:364

 msgid "<systemitem role=\"package\">autotools-dev</systemitem>"
 msgstr "<systemitem role=\"package\">autotools-dev</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">autotools-dev</systemitem>"
 msgstr "<systemitem role=\"package\">autotools-dev</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:387
+#: tools.dbk:366

 msgid ""
 "<systemitem role=\"package\">autotools-dev</systemitem> contains best "
 "practices for people who maintain packages which use <command>autoconf</"
 msgid ""
 "<systemitem role=\"package\">autotools-dev</systemitem> contains best "
 "practices for people who maintain packages which use <command>autoconf</"


@@ -794,13 +750,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:396
+#: tools.dbk:375

 msgid "<systemitem role=\"package\">dpkg-repack</systemitem>"
 msgstr "<systemitem role=\"package\">dpkg-repack</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dpkg-repack</systemitem>"
 msgstr "<systemitem role=\"package\">dpkg-repack</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:398
+#: tools.dbk:377

 msgid ""
 "<command>dpkg-repack</command> creates Debian package file out of a package "
 "that has already been installed.  If any changes have been made to the "
 msgid ""
 "<command>dpkg-repack</command> creates Debian package file out of a package "
 "that has already been installed.  If any changes have been made to the "


@@ -814,7 +770,7 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:404
+#: tools.dbk:383

 msgid ""
 "This utility can make it easy to copy packages from one computer to another, "
 "or to recreate packages which are installed on your system but no longer "
 msgid ""
 "This utility can make it easy to copy packages from one computer to another, "
 "or to recreate packages which are installed on your system but no longer "


@@ -824,13 +780,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:411
+#: tools.dbk:390

 msgid "<systemitem role=\"package\">alien</systemitem>"
 msgstr "<systemitem role=\"package\">alien</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">alien</systemitem>"
 msgstr "<systemitem role=\"package\">alien</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:413
+#: tools.dbk:392

 msgid ""
 "<command>alien</command> converts binary packages between various packaging "
 "formats, including Debian, RPM (RedHat), LSB (Linux Standard Base), Solaris, "
 msgid ""
 "<command>alien</command> converts binary packages between various packaging "
 "formats, including Debian, RPM (RedHat), LSB (Linux Standard Base), Solaris, "


@@ -842,13 +798,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:420
+#: tools.dbk:399

 msgid "<systemitem role=\"package\">debsums</systemitem>"
 msgstr "<systemitem role=\"package\">debsums</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">debsums</systemitem>"
 msgstr "<systemitem role=\"package\">debsums</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:422
+#: tools.dbk:401

 msgid ""
 "<command>debsums</command> checks installed packages against their MD5 "
 "sums.  Note that not all packages have MD5 sums, since they aren't required "
 msgid ""
 "<command>debsums</command> checks installed packages against their MD5 "
 "sums.  Note that not all packages have MD5 sums, since they aren't required "


@@ -860,13 +816,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:428
+#: tools.dbk:407

 msgid "<systemitem role=\"package\">dpkg-dev-el</systemitem>"
 msgstr "<systemitem role=\"package\">dpkg-dev-el</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dpkg-dev-el</systemitem>"
 msgstr "<systemitem role=\"package\">dpkg-dev-el</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:430
+#: tools.dbk:409

 msgid ""
 "<systemitem role=\"package\">dpkg-dev-el</systemitem> is an Emacs lisp "
 "package which provides assistance when editing some of the files in the "
 msgid ""
 "<systemitem role=\"package\">dpkg-dev-el</systemitem> is an Emacs lisp "
 "package which provides assistance when editing some of the files in the "


@@ -877,13 +833,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:439
+#: tools.dbk:418

 msgid "<systemitem role=\"package\">dpkg-depcheck</systemitem>"
 msgstr "<systemitem role=\"package\">dpkg-depcheck</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dpkg-depcheck</systemitem>"
 msgstr "<systemitem role=\"package\">dpkg-depcheck</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:441
+#: tools.dbk:420

 msgid ""
 "<command>dpkg-depcheck</command> (from the <systemitem role=\"package"
 "\">devscripts</systemitem> package, <xref linkend=\"devscripts\"/> )  runs a "
 msgid ""
 "<command>dpkg-depcheck</command> (from the <systemitem role=\"package"
 "\">devscripts</systemitem> package, <xref linkend=\"devscripts\"/> )  runs a "


@@ -897,7 +853,7 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:447
+#: tools.dbk:426

 msgid ""
 "For Debian packages, this is useful when you have to compose a "
 "<literal>Build-Depends</literal> line for your new package: running the "
 msgid ""
 "For Debian packages, this is useful when you have to compose a "
 "<literal>Build-Depends</literal> line for your new package: running the "


@@ -911,7 +867,7 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><screen>
 #. type: Content of: <appendix><section><section><screen>
 
 # type: Content of: <appendix><section><section><screen>
 #. type: Content of: <appendix><section><section><screen>

-#: tools.dbk:453
+#: tools.dbk:432

 #, fuzzy, no-wrap
 msgid "dpkg-depcheck -b debian/rules build\n"
 msgstr ""
 #, fuzzy, no-wrap
 msgid "dpkg-depcheck -b debian/rules build\n"
 msgstr ""


@@ -920,7 +876,7 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:456
+#: tools.dbk:435

 msgid ""
 "<command>dpkg-depcheck</command> can also be used to check for run-time "
 "dependencies, especially if your package uses exec(2) to run other programs."
 msgid ""
 "<command>dpkg-depcheck</command> can also be used to check for run-time "
 "dependencies, especially if your package uses exec(2) to run other programs."


@@ -930,7 +886,7 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:460
+#: tools.dbk:439

 msgid ""
 "For more information please see <citerefentry> <refentrytitle>dpkg-depcheck</"
 "refentrytitle> <manvolnum>1</manvolnum> </citerefentry>."
 msgid ""
 "For more information please see <citerefentry> <refentrytitle>dpkg-depcheck</"
 "refentrytitle> <manvolnum>1</manvolnum> </citerefentry>."


@@ -940,25 +896,25 @@ msgstr ""
 
 # type: Content of: <appendix><section><title>
 #. type: Content of: <appendix><section><title>
 
 # type: Content of: <appendix><section><title>
 #. type: Content of: <appendix><section><title>

-#: tools.dbk:469
+#: tools.dbk:448

 msgid "Porting tools"
 msgstr "移植用ツール"
 
 # type: Content of: <appendix><section><para>
 #. type: Content of: <appendix><section><para>
 msgid "Porting tools"
 msgstr "移植用ツール"
 
 # type: Content of: <appendix><section><para>
 #. type: Content of: <appendix><section><para>

-#: tools.dbk:471
+#: tools.dbk:450

 msgid "The following tools are helpful for porters and for cross-compilation."
 msgstr "以下のツールが、移植作業者がクロスコンパイルをする際に役立ちます。"
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 msgid "The following tools are helpful for porters and for cross-compilation."
 msgstr "以下のツールが、移植作業者がクロスコンパイルをする際に役立ちます。"
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:474
+#: tools.dbk:453

 msgid "<systemitem role=\"package\">quinn-diff</systemitem>"
 msgstr "<systemitem role=\"package\">quinn-diff</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">quinn-diff</systemitem>"
 msgstr "<systemitem role=\"package\">quinn-diff</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:476
+#: tools.dbk:455

 msgid ""
 "<systemitem role=\"package\">quinn-diff</systemitem> is used to locate the "
 "differences from one architecture to another.  For instance, it could tell "
 msgid ""
 "<systemitem role=\"package\">quinn-diff</systemitem> is used to locate the "
 "differences from one architecture to another.  For instance, it could tell "


@@ -972,13 +928,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:484
+#: tools.dbk:463

 msgid "<systemitem role=\"package\">dpkg-cross</systemitem>"
 msgstr "<systemitem role=\"package\">dpkg-cross</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dpkg-cross</systemitem>"
 msgstr "<systemitem role=\"package\">dpkg-cross</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:486
+#: tools.dbk:465

 msgid ""
 "<systemitem role=\"package\">dpkg-cross</systemitem> is a tool for "
 "installing libraries and headers for cross-compiling in a way similar to "
 msgid ""
 "<systemitem role=\"package\">dpkg-cross</systemitem> is a tool for "
 "installing libraries and headers for cross-compiling in a way similar to "


@@ -989,13 +945,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><title>
 #. type: Content of: <appendix><section><title>
 
 # type: Content of: <appendix><section><title>
 #. type: Content of: <appendix><section><title>

-#: tools.dbk:497
+#: tools.dbk:476

 msgid "Documentation and information"
 msgstr "ドキュメントと情報について"
 
 # type: Content of: <appendix><section><para>
 #. type: Content of: <appendix><section><para>
 msgid "Documentation and information"
 msgstr "ドキュメントと情報について"
 
 # type: Content of: <appendix><section><para>
 #. type: Content of: <appendix><section><para>

-#: tools.dbk:499
+#: tools.dbk:478

 #, fuzzy
 msgid ""
 "The following packages provide information for maintainers or help with "
 #, fuzzy
 msgid ""
 "The following packages provide information for maintainers or help with "


@@ -1004,13 +960,13 @@ msgstr "以下のパッケージがメンテナへの情報を与えてドキュ
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:504
+#: tools.dbk:483

 msgid "<systemitem role=\"package\">docbook-xml</systemitem>"
 msgstr "<systemitem role=\"package\">docbook-xml</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">docbook-xml</systemitem>"
 msgstr "<systemitem role=\"package\">docbook-xml</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:506
+#: tools.dbk:485

 msgid ""
 "<systemitem role=\"package\">docbook-xml</systemitem> provides the DocBook "
 "XML DTDs, which are commonly used for Debian documentation (as is the older "
 msgid ""
 "<systemitem role=\"package\">docbook-xml</systemitem> provides the DocBook "
 "XML DTDs, which are commonly used for Debian documentation (as is the older "


@@ -1023,7 +979,7 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:512
+#: tools.dbk:491

 msgid ""
 "The <systemitem role=\"package\">docbook-xsl</systemitem> package provides "
 "the XSL files for building and styling the source to various output formats. "
 msgid ""
 "The <systemitem role=\"package\">docbook-xsl</systemitem> package provides "
 "the XSL files for building and styling the source to various output formats. "


@@ -1041,7 +997,7 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:520
+#: tools.dbk:499

 msgid ""
 "To produce PDF from FO, you need an FO processor, such as <systemitem role="
 "\"package\">xmlroff</systemitem> or <systemitem role=\"package\">fop</"
 msgid ""
 "To produce PDF from FO, you need an FO processor, such as <systemitem role="
 "\"package\">xmlroff</systemitem> or <systemitem role=\"package\">fop</"


@@ -1055,13 +1011,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:528
+#: tools.dbk:507

 msgid "<systemitem role=\"package\">debiandoc-sgml</systemitem>"
 msgstr "<systemitem role=\"package\">debiandoc-sgml</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">debiandoc-sgml</systemitem>"
 msgstr "<systemitem role=\"package\">debiandoc-sgml</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:530
+#: tools.dbk:509

 #, fuzzy
 msgid ""
 "<systemitem role=\"package\">debiandoc-sgml</systemitem> provides the "
 #, fuzzy
 msgid ""
 "<systemitem role=\"package\">debiandoc-sgml</systemitem> provides the "


@@ -1078,7 +1034,7 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:539
+#: tools.dbk:518

 msgid ""
 "Documentation for the DTD can be found in the <systemitem role=\"package"
 "\">debiandoc-sgml-doc</systemitem> package."
 msgid ""
 "Documentation for the DTD can be found in the <systemitem role=\"package"
 "\">debiandoc-sgml-doc</systemitem> package."


@@ -1088,13 +1044,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:545
+#: tools.dbk:524

 msgid "<systemitem role=\"package\">debian-keyring</systemitem>"
 msgstr "<systemitem role=\"package\">debian-keyring</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">debian-keyring</systemitem>"
 msgstr "<systemitem role=\"package\">debian-keyring</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:547
+#: tools.dbk:526

 msgid ""
 "Contains the public GPG and PGP keys of Debian developers.  See <xref "
 "linkend=\"key-maint\"/> and the package documentation for more information."
 msgid ""
 "Contains the public GPG and PGP keys of Debian developers.  See <xref "
 "linkend=\"key-maint\"/> and the package documentation for more information."


@@ -1104,13 +1060,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:553
+#: tools.dbk:532

 msgid "<systemitem role=\"package\">debian-maintainers</systemitem>"
 msgstr "<systemitem role=\"package\">debian-maintainers</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">debian-maintainers</systemitem>"
 msgstr "<systemitem role=\"package\">debian-maintainers</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:555
+#: tools.dbk:534

 msgid ""
 "Contains the public GPG keys of Debian Maintainers.  See <ulink url=\"&url-"
 "wiki-dm;\"></ulink> for more information."
 msgid ""
 "Contains the public GPG keys of Debian Maintainers.  See <ulink url=\"&url-"
 "wiki-dm;\"></ulink> for more information."


@@ -1120,13 +1076,13 @@ msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>
 #. type: Content of: <appendix><section><section><title>

-#: tools.dbk:561
+#: tools.dbk:540

 msgid "<systemitem role=\"package\">debview</systemitem>"
 msgstr "<systemitem role=\"package\">debview</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">debview</systemitem>"
 msgstr "<systemitem role=\"package\">debview</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 #. type: Content of: <appendix><section><section><para>

-#: tools.dbk:563
+#: tools.dbk:542

 msgid ""
 "<systemitem role=\"package\">debview</systemitem> provides an Emacs mode for "
 "viewing Debian binary packages.  This lets you examine a package without "
 msgid ""
 "<systemitem role=\"package\">debview</systemitem> provides an Emacs mode for "
 "viewing Debian binary packages.  This lets you examine a package without "


@@ -1135,3 +1091,41 @@ msgstr ""
 "<systemitem role=\"package\">debview</systemitem> は、Debian バイナリパッケー"
 "ジを参照する Emacs モードを提供します。これを使うと、パッケージを解凍しなくて"
 "も実行できるようになります。"
 "<systemitem role=\"package\">debview</systemitem> は、Debian バイナリパッケー"
 "ジを参照する Emacs モードを提供します。これを使うと、パッケージを解凍しなくて"
 "も実行できるようになります。"

+
+# type: Content of: <appendix><section><section><title>
+#~ msgid "<systemitem role=\"package\">debmake</systemitem>"
+#~ msgstr "<systemitem role=\"package\">debmake</systemitem>"
+
+# type: Content of: <appendix><section><section><para>
+#, fuzzy
+#~ msgid ""
+#~ "<systemitem role=\"package\">debmake</systemitem>, a precursor to "
+#~ "<systemitem role=\"package\">debhelper</systemitem>, is a more coarse-"
+#~ "grained <filename>debian/rules</filename> assistant.  It includes two "
+#~ "main programs: <command>deb-make</command>, which can be used to help a "
+#~ "maintainer convert a regular (non-Debian) source archive into a Debian "
+#~ "source package; and <command>debstd</command>, which incorporates in one "
+#~ "big shot the same sort of automated functions that one finds in "
+#~ "<systemitem role=\"package\">debhelper</systemitem>."
+#~ msgstr ""
+#~ "<systemitem role=\"package\">debhelper</systemitem> の前身、<systemitem "
+#~ "role=\"package\">debmake</systemitem>は、より木目の粗い <filename>debian/"
+#~ "rules</filename> の補助ツールです。これは二つの主なプログラムを含んでいま"
+#~ "す: <command>deb-make</command> は、メンテナが通常の (Debian 由来ではな"
+#~ "い) ソースアーカイブを Debian ソースパッケージに変換する手伝いをするのに使"
+#~ "います。そして <command>debstd</command> は、"
+
+# type: Content of: <appendix><section><section><para>
+#~ msgid ""
+#~ "The consensus is that <systemitem role=\"package\">debmake</systemitem> "
+#~ "is now deprecated in favor of <systemitem role=\"package\">debhelper</"
+#~ "systemitem>.  It is a bug to use <systemitem role=\"package\">debmake</"
+#~ "systemitem> in new packages.  New packages using <systemitem role="
+#~ "\"package\">debmake</systemitem> will be rejected from the archive."
+#~ msgstr ""
+#~ "<systemitem role=\"package\">debmake</systemitem> は、<systemitem role="
+#~ "\"package\">debhelper</systemitem> を優先して使い、現在は非推奨 "
+#~ "(deprecated) というコンセンサスができています。新しいパッケージで "
+#~ "<systemitem role=\"package\">debmake</systemitem> を使うのはバグとなってい"
+#~ "ます。新たなパッケージで <systemitem role=\"package\">debmake</"
+#~ "systemitem> を使っているものはアーカイブから reject されます。"

diff --git a/po4a/po/best-pkging-practices.pot b/po4a/po/best-pkging-practices.pot
index 1ff385f70be8dbc75c60de8e97f62bc3c5468e26..0da8cf1d5fff937f21fb9be69f63a286120b9a4a 100644 (file)
--- a/po4a/po/best-pkging-practices.pot
+++ b/po4a/po/best-pkging-practices.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"POT-Creation-Date: 2008-08-08 11:33-0300\n"
+"POT-Creation-Date: 2010-01-04 00:17+0100\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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -15,12 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING"
 
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING"
 

-# type: Content of: <chapter><title>
+#. type: Content of: <chapter><title>

 #: best-pkging-practices.dbk:7
 msgid "Best Packaging Practices"
 msgstr ""
 
 #: best-pkging-practices.dbk:7
 msgid "Best Packaging Practices"
 msgstr ""
 

-# type: Content of: <chapter><para>
+#. type: Content of: <chapter><para>

 #: best-pkging-practices.dbk:9
 msgid ""
 "Debian's quality is largely due to the <ulink "
 #: best-pkging-practices.dbk:9
 msgid ""
 "Debian's quality is largely due to the <ulink "


@@ -32,7 +32,7 @@ msgid ""
 "create and maintain excellent packages."
 msgstr ""
 
 "create and maintain excellent packages."
 msgstr ""
 

-# type: Content of: <chapter><para>
+#. type: Content of: <chapter><para>

 #: best-pkging-practices.dbk:18
 msgid ""
 "This chapter provides some best practices for Debian developers.  All "
 #: best-pkging-practices.dbk:18
 msgid ""
 "This chapter provides some best practices for Debian developers.  All "


@@ -41,12 +41,12 @@ msgid ""
 "developers.  Feel free to pick and choose whatever works best for you."
 msgstr ""
 
 "developers.  Feel free to pick and choose whatever works best for you."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
+#. type: Content of: <chapter><section><title>

 #: best-pkging-practices.dbk:24
 msgid "Best practices for <filename>debian/rules</filename>"
 msgstr ""
 
 #: best-pkging-practices.dbk:24
 msgid "Best practices for <filename>debian/rules</filename>"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: best-pkging-practices.dbk:26
 msgid ""
 "The following recommendations apply to the <filename>debian/rules</filename> "
 #: best-pkging-practices.dbk:26
 msgid ""
 "The following recommendations apply to the <filename>debian/rules</filename> "


@@ -55,12 +55,12 @@ msgid ""
 "it's usually the file maintainers spend the most time on."
 msgstr ""
 
 "it's usually the file maintainers spend the most time on."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
+#. type: Content of: <chapter><section><section><title>

 #: best-pkging-practices.dbk:32
 msgid "Helper scripts"
 msgstr ""
 
 #: best-pkging-practices.dbk:32
 msgid "Helper scripts"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: best-pkging-practices.dbk:34
 msgid ""
 "The rationale for using helper scripts in <filename>debian/rules</filename> "
 #: best-pkging-practices.dbk:34
 msgid ""
 "The rationale for using helper scripts in <filename>debian/rules</filename> "


@@ -75,7 +75,7 @@ msgid ""
 "have to be changed."
 msgstr ""
 
 "have to be changed."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: best-pkging-practices.dbk:45
 msgid ""
 "Helper scripts take care of these issues.  Assuming you comply with the "
 #: best-pkging-practices.dbk:45
 msgid ""
 "Helper scripts take care of these issues.  Assuming you comply with the "


@@ -85,7 +85,7 @@ msgid ""
 "changes."
 msgstr ""
 
 "changes."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: best-pkging-practices.dbk:52
 msgid ""
 "<xref linkend=\"tools\"/> contains a couple of different helpers.  The most "
 #: best-pkging-practices.dbk:52
 msgid ""
 "<xref linkend=\"tools\"/> contains a couple of different helpers.  The most "


@@ -103,7 +103,7 @@ msgid ""
 "<filename>debian/rules</filename>."
 msgstr ""
 
 "<filename>debian/rules</filename>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: best-pkging-practices.dbk:66
 msgid ""
 "You can get started with <systemitem role=\"package\">debhelper</systemitem> "
 #: best-pkging-practices.dbk:66
 msgid ""
 "You can get started with <systemitem role=\"package\">debhelper</systemitem> "


@@ -119,7 +119,7 @@ msgid ""
 "helper, to learn its expectations and behavior."
 msgstr ""
 
 "helper, to learn its expectations and behavior."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: best-pkging-practices.dbk:79
 msgid ""
 "Some people feel that vanilla <filename>debian/rules</filename> files are "
 #: best-pkging-practices.dbk:79
 msgid ""
 "Some people feel that vanilla <filename>debian/rules</filename> files are "


@@ -129,12 +129,12 @@ msgid ""
 "<ulink url=\"&url-rules-files;\"></ulink>."
 msgstr ""
 
 "<ulink url=\"&url-rules-files;\"></ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
+#. type: Content of: <chapter><section><section><title>

 #: best-pkging-practices.dbk:88
 msgid "Separating your patches into multiple files"
 msgstr ""
 
 #: best-pkging-practices.dbk:88
 msgid "Separating your patches into multiple files"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: best-pkging-practices.dbk:90
 msgid ""
 "Big, complex packages may have many bugs that you need to deal with.  If you "
 #: best-pkging-practices.dbk:90
 msgid ""
 "Big, complex packages may have many bugs that you need to deal with.  If you "


@@ -146,45 +146,55 @@ msgid ""
 "out which patch sets to back out as a unit as bugs are fixed upstream."
 msgstr ""
 
 "out which patch sets to back out as a unit as bugs are fixed upstream."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: best-pkging-practices.dbk:99
 msgid ""
 #: best-pkging-practices.dbk:99
 msgid ""

-"Unfortunately, the packaging system as such currently doesn't provide for "
-"separating the patches into several files.  Nevertheless, there are ways to "
-"separate patches: the patch files are shipped within the Debian patch file "
-"(<filename>.diff.gz</filename>), usually within the "
-"<filename>debian/</filename> directory.  The only difference is that they "
-"aren't applied immediately by dpkg-source, but by the "
-"<literal>build</literal> rule of <filename>debian/rules</filename>.  "
-"Conversely, they are reverted in the <literal>clean</literal> rule."
+"Fortunately, with the source format “3.0 (quilt)” it is now possible to keep "
+"patches separate without having to modify <filename>debian/rules</filename> "
+"to setup a patch system. Patches are stored in "
+"<filename>debian/patches/</filename> and when the source package is unpacked "
+"patches listed in <filename>debian/patches/series</filename> are "
+"automatically applied.  As the name implies, patches can be managed with "
+"<command>quilt</command>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:109
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:107

 msgid ""
 msgid ""

-"<command>dbs</command> is one of the more popular approaches to this.  It "
-"does all of the above, and provides a facility for creating new and updating "
-"old patches.  See the package <systemitem role=\"package\">dbs</systemitem> "
-"for more information and <systemitem role=\"package\">hello-dbs</systemitem> "
-"for an example."
+"When using the older source “1.0”, it's also possible to separate patches "
+"but a dedicated patch system must be used: the patch files are shipped "
+"within the Debian patch file (<filename>.diff.gz</filename>), usually within "
+"the <filename>debian/</filename> directory. The only difference is that they "
+"aren't applied immediately by <command>dpkg-source</command>, but by the "
+"<literal>build</literal> rule of <filename>debian/rules</filename>, through "
+"a dependency on the <literal>patch</literal> rule.  Conversely, they are "
+"reverted in the <literal>clean</literal> rule, through a dependency on the "
+"<literal>unpatch</literal> rule."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:116
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:119

 msgid ""
 msgid ""

-"<command>dpatch</command> also provides these facilities, but it's intended "
-"to be even easier to use.  See the package <systemitem "
-"role=\"package\">dpatch</systemitem> for documentation and examples (in "
-"<filename>/usr/share/doc/dpatch</filename>)."
+"<command>quilt</command> is the recommended tool for this.  It does all of "
+"the above, and also allows to manage patch series.  See the <systemitem "
+"role=\"package\">quilt</systemitem> package for more information."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:124
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:125
+msgid ""
+"There are other tools to manage patches, like <command>dpatch</command>, and "
+"the patch system integrated with <systemitem "
+"role=\"package\">cdbs</systemitem>."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:132

 msgid "Multiple binary packages"
 msgstr ""
 
 msgid "Multiple binary packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:126
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:134

 msgid ""
 "A single source package will often build several binary packages, either to "
 "provide several flavors of the same software (e.g., the <systemitem "
 msgid ""
 "A single source package will often build several binary packages, either to "
 "provide several flavors of the same software (e.g., the <systemitem "


@@ -193,8 +203,8 @@ msgid ""
 "needed, and thus save some disk space)."
 msgstr ""
 
 "needed, and thus save some disk space)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:133
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:141

 msgid ""
 "The second case can be easily managed in <filename>debian/rules</filename>.  "
 "You just need to move the appropriate files from the build directory into "
 msgid ""
 "The second case can be easily managed in <filename>debian/rules</filename>.  "
 "You just need to move the appropriate files from the build directory into "


@@ -205,8 +215,8 @@ msgid ""
 "inter-package dependencies set right in <filename>debian/control</filename>."
 msgstr ""
 
 "inter-package dependencies set right in <filename>debian/control</filename>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:142
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:150

 msgid ""
 "The first case is a bit more difficult since it involves multiple recompiles "
 "of the same software but with different configuration options.  The "
 msgid ""
 "The first case is a bit more difficult since it involves multiple recompiles "
 "of the same software but with different configuration options.  The "


@@ -215,13 +225,13 @@ msgid ""
 "<filename>debian/rules</filename> file."
 msgstr ""
 
 "<filename>debian/rules</filename> file."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: best-pkging-practices.dbk:154
+#. type: Content of: <chapter><section><title>
+#: best-pkging-practices.dbk:162

 msgid "Best practices for <filename>debian/control</filename>"
 msgstr ""
 
 msgid "Best practices for <filename>debian/control</filename>"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:156
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:164

 msgid ""
 "The following practices are relevant to the "
 "<filename>debian/control</filename> file.  They supplement the <ulink "
 msgid ""
 "The following practices are relevant to the "
 "<filename>debian/control</filename> file.  They supplement the <ulink "


@@ -229,8 +239,8 @@ msgid ""
 "descriptions</ulink>."
 msgstr ""
 
 "descriptions</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:162
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:170

 msgid ""
 "The description of the package, as defined by the corresponding field in the "
 "<filename>control</filename> file, contains both the package synopsis and "
 msgid ""
 "The description of the package, as defined by the corresponding field in the "
 "<filename>control</filename> file, contains both the package synopsis and "


@@ -241,13 +251,13 @@ msgid ""
 "guidelines specific to the description."
 msgstr ""
 
 "guidelines specific to the description."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:171
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:179

 msgid "General guidelines for package descriptions"
 msgstr ""
 
 msgid "General guidelines for package descriptions"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:173
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:181

 msgid ""
 "The package description should be written for the average likely user, the "
 "average person who will use and benefit from the package.  For instance, "
 msgid ""
 "The package description should be written for the average likely user, the "
 "average person who will use and benefit from the package.  For instance, "


@@ -256,8 +266,8 @@ msgid ""
 "written for a less technical user."
 msgstr ""
 
 "written for a less technical user."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:180
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:188

 msgid ""
 "Our review of package descriptions lead us to conclude that most package "
 "descriptions are technical, that is, are not written to make sense for "
 msgid ""
 "Our review of package descriptions lead us to conclude that most package "
 "descriptions are technical, that is, are not written to make sense for "


@@ -265,8 +275,8 @@ msgid ""
 "users, this is a problem."
 msgstr ""
 
 "users, this is a problem."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:186
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:194

 msgid ""
 "How do you write for non-technical users? Avoid jargon.  Avoid referring to "
 "other applications or frameworks that the user might not be familiar with — "
 msgid ""
 "How do you write for non-technical users? Avoid jargon.  Avoid referring to "
 "other applications or frameworks that the user might not be familiar with — "


@@ -275,16 +285,16 @@ msgid ""
 "must use technical terms, introduce them."
 msgstr ""
 
 "must use technical terms, introduce them."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:193
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:201

 msgid ""
 "Be objective.  Package descriptions are not the place for advocating your "
 "package, no matter how much you love it.  Remember that the reader may not "
 "care about the same things you care about."
 msgstr ""
 
 msgid ""
 "Be objective.  Package descriptions are not the place for advocating your "
 "package, no matter how much you love it.  Remember that the reader may not "
 "care about the same things you care about."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:198
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:206

 msgid ""
 "References to the names of any other software packages, protocol names, "
 "standards, or specifications should use their canonical forms, if one "
 msgid ""
 "References to the names of any other software packages, protocol names, "
 "standards, or specifications should use their canonical forms, if one "


@@ -293,97 +303,101 @@ msgid ""
 "Use PostScript, not Postscript or postscript."
 msgstr ""
 
 "Use PostScript, not Postscript or postscript."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:205
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:213

 msgid ""
 "If you are having problems writing your description, you may wish to send it "
 "along to &email-debian-l10n-english; and request feedback."
 msgstr ""
 
 msgid ""
 "If you are having problems writing your description, you may wish to send it "
 "along to &email-debian-l10n-english; and request feedback."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:211
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:219

 msgid "The package synopsis, or short description"
 msgstr ""
 
 msgid "The package synopsis, or short description"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:213
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:221

 msgid ""
 msgid ""

-"The synopsis line (the short description) should be concise.  It must not "
-"repeat the package's name (this is policy)."
+"Policy says the synopsis line (the short description) must be concise, not "
+"repeating the package name, but also informative."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:217
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:225

 msgid ""
 msgid ""

-"It's a good idea to think of the synopsis as an appositive clause, not a "
-"full sentence.  An appositive clause is defined in WordNet as a grammatical "
-"relation between a word and a noun phrase that follows, e.g., Rudolph the "
-"red-nosed reindeer.  The appositive clause here is red-nosed reindeer.  "
-"Since the synopsis is a clause, rather than a full sentence, we recommend "
-"that it neither start with a capital nor end with a full stop (period).  It "
-"should also not begin with an article, either definite (the) or indefinite "
-"(a or an)."
+"The synopsis functions as a phrase describing the package, not a complete "
+"sentence, so sentential punctuation is inappropriate: it does not need extra "
+"capital letters or a final period (full stop). It should also omit any "
+"initial indefinite or definite article - \"a\", \"an\", or \"the\". Thus for "
+"instance:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:226
+#. type: Content of: <chapter><section><section><screen>
+#: best-pkging-practices.dbk:231
+#, no-wrap

 msgid ""
 msgid ""

-"It might help to imagine that the synopsis is combined with the package name "
-"in the following way:"
+"Package: libeg0\n"
+"Description: exemplification support library\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:229
-#, no-wrap
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:235

 msgid ""
 msgid ""

-"\n"
-"<replaceable>package-name</replaceable> is a "
-"<replaceable>synopsis</replaceable>.\n"
+"Technically this is a noun phrase minus articles, as opposed to a verb "
+"phrase.  A good heuristic is that it should be possible to substitute the "
+"package name and synopsis into this formula:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:233
-msgid "Alternatively, it might make sense to think of it as"
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:240
+msgid ""
+"The package <replaceable>name</replaceable> provides {a,an,the,some} "
+"<replaceable>synopsis</replaceable>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:235
-#, no-wrap
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:244

 msgid ""
 msgid ""

-"\n"
-"<replaceable>package-name</replaceable> is "
-"<replaceable>synopsis</replaceable>.\n"
+"Sets of related packages may use an alternative scheme that divides the "
+"synopsis into two parts, the first a description of the whole suite and the "
+"second a summary of the package's role within it:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:239
-msgid "or, if the package name itself is a plural (such as developers-tools)"
+#. type: Content of: <chapter><section><section><screen>
+#: best-pkging-practices.dbk:249
+#, no-wrap
+msgid ""
+"Package: eg-tools\n"
+"Description: simple exemplification system (utilities)\n"
+"\t\t\t              \n"
+"Package: eg-doc\n"
+"Description: simple exemplification system - documentation\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:241
-#, no-wrap
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:256

 msgid ""
 msgid ""

-"\n"
-"<replaceable>package-name</replaceable> are "
-"<replaceable>synopsis</replaceable>.\n"
+"These synopses follow a modified formula. Where a package "
+"\"<replaceable>name</replaceable>\" has a synopsis "
+"\"<replaceable>suite</replaceable> (<replaceable>role</replaceable>)\" or "
+"\"<replaceable>suite</replaceable> - <replaceable>role</replaceable>\", the "
+"elements should be phrased so that they fit into the formula:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:245
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:263

 msgid ""
 msgid ""

-"This way of forming a sentence from the package name and synopsis should be "
-"considered as a heuristic and not a strict rule.  There are some cases where "
-"it doesn't make sense to try to form a sentence."
+"The package <replaceable>name</replaceable> provides {a,an,the} "
+"<replaceable>role</replaceable> for the <replaceable>suite</replaceable>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:252
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:269

 msgid "The long description"
 msgstr ""
 
 msgid "The long description"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:254
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:271

 msgid ""
 "The long description is the primary information available to the user about "
 "a package before they install it.  It should provide all the information "
 msgid ""
 "The long description is the primary information available to the user about "
 "a package before they install it.  It should provide all the information "


@@ -391,13 +405,13 @@ msgid ""
 "the user has already read the package synopsis."
 msgstr ""
 
 "the user has already read the package synopsis."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:260
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:277

 msgid "The long description should consist of full and complete sentences."
 msgstr ""
 
 msgid "The long description should consist of full and complete sentences."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:263
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:280

 msgid ""
 "The first paragraph of the long description should answer the following "
 "questions: what does the package do? what task does it help the user "
 msgid ""
 "The first paragraph of the long description should answer the following "
 "questions: what does the package do? what task does it help the user "


@@ -405,8 +419,8 @@ msgid ""
 "of course the audience for the package is necessarily technical."
 msgstr ""
 
 "of course the audience for the package is necessarily technical."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:269
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:286

 msgid ""
 "The following paragraphs should answer the following questions: Why do I as "
 "a user need this package? What other features does the package have? What "
 msgid ""
 "The following paragraphs should answer the following questions: Why do I as "
 "a user need this package? What other features does the package have? What "


@@ -416,8 +430,8 @@ msgid ""
 "is the client for the foo server)?"
 msgstr ""
 
 "is the client for the foo server)?"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:277
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:294

 msgid ""
 "Be careful to avoid spelling and grammar mistakes.  Ensure that you "
 "spell-check it.  Both <command>ispell</command> and "
 msgid ""
 "Be careful to avoid spelling and grammar mistakes.  Ensure that you "
 "spell-check it.  Both <command>ispell</command> and "


@@ -425,74 +439,70 @@ msgid ""
 "<filename>debian/control</filename> files:"
 msgstr ""
 
 "<filename>debian/control</filename> files:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:281
+#. type: Content of: <chapter><section><section><screen>
+#: best-pkging-practices.dbk:299

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"ispell -d american -g debian/control\n"
+msgid "ispell -d american -g debian/control\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:284
+#. type: Content of: <chapter><section><section><screen>
+#: best-pkging-practices.dbk:302

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"aspell -d en -D -c debian/control\n"
+msgid "aspell -d en -D -c debian/control\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:288
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:305

 msgid ""
 "Users usually expect these questions to be answered in the package "
 "description:"
 msgstr ""
 
 msgid ""
 "Users usually expect these questions to be answered in the package "
 "description:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:293
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:310

 msgid ""
 "What does the package do? If it is an add-on to another package, then the "
 "short description of the package we are an add-on to should be put in here."
 msgstr ""
 
 msgid ""
 "What does the package do? If it is an add-on to another package, then the "
 "short description of the package we are an add-on to should be put in here."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:299
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:316

 msgid ""
 "Why should I want this package? This is related to the above, but not the "
 "same (this is a mail user agent; this is cool, fast, interfaces with PGP and "
 "LDAP and IMAP, has features X, Y, and Z)."
 msgstr ""
 
 msgid ""
 "Why should I want this package? This is related to the above, but not the "
 "same (this is a mail user agent; this is cool, fast, interfaces with PGP and "
 "LDAP and IMAP, has features X, Y, and Z)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:306
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:323

 msgid ""
 "If this package should not be installed directly, but is pulled in by "
 "another package, this should be mentioned."
 msgstr ""
 
 msgid ""
 "If this package should not be installed directly, but is pulled in by "
 "another package, this should be mentioned."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:312
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:329

 msgid ""
 "If the package is <literal>experimental</literal>, or there are other "
 "reasons it should not be used, if there are other packages that should be "
 "used instead, it should be here as well."
 msgstr ""
 
 msgid ""
 "If the package is <literal>experimental</literal>, or there are other "
 "reasons it should not be used, if there are other packages that should be "
 "used instead, it should be here as well."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:319
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:336

 msgid ""
 "How is this package different from the competition? Is it a better "
 "implementation? more features? different features? Why should I choose this "
 "package."
 msgstr ""
 
 msgid ""
 "How is this package different from the competition? Is it a better "
 "implementation? more features? different features? Why should I choose this "
 "package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:332
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:349

 msgid "Upstream home page"
 msgstr ""
 
 msgid "Upstream home page"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:334
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:351

 msgid ""
 "We recommend that you add the URL for the package's home page in the "
 "<literal>Homepage</literal> field of the <literal>Source</literal> section "
 msgid ""
 "We recommend that you add the URL for the package's home page in the "
 "<literal>Homepage</literal> field of the <literal>Source</literal> section "


@@ -500,46 +510,46 @@ msgid ""
 "package description itself is considered deprecated."
 msgstr ""
 
 "package description itself is considered deprecated."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:342
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:359

 msgid "Version Control System location"
 msgstr ""
 
 msgid "Version Control System location"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:344
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:361

 msgid ""
 "There are additional fields for the location of the Version Control System "
 "in <filename>debian/control</filename>."
 msgstr ""
 
 msgid ""
 "There are additional fields for the location of the Version Control System "
 "in <filename>debian/control</filename>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:348
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:365

 msgid "Vcs-Browser"
 msgstr ""
 
 msgid "Vcs-Browser"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:350
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:367

 msgid ""
 "Value of this field should be a <literal>http://</literal> URL pointing to a "
 "web-browsable copy of the Version Control System repository used to maintain "
 "the given package, if available."
 msgstr ""
 
 msgid ""
 "Value of this field should be a <literal>http://</literal> URL pointing to a "
 "web-browsable copy of the Version Control System repository used to maintain "
 "the given package, if available."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:355
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:372

 msgid ""
 "The information is meant to be useful for the final user, willing to browse "
 "the latest work done on the package (e.g.  when looking for the patch fixing "
 "a bug tagged as <literal>pending</literal> in the bug tracking system)."
 msgstr ""
 
 msgid ""
 "The information is meant to be useful for the final user, willing to browse "
 "the latest work done on the package (e.g.  when looking for the patch fixing "
 "a bug tagged as <literal>pending</literal> in the bug tracking system)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:362
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:379

 msgid "Vcs-*"
 msgstr ""
 
 msgid "Vcs-*"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:364
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:381

 msgid ""
 "Value of this field should be a string identifying unequivocally the "
 "location of the Version Control System repository used to maintain the given "
 msgid ""
 "Value of this field should be a string identifying unequivocally the "
 "location of the Version Control System repository used to maintain the given "


@@ -553,8 +563,8 @@ msgid ""
 "interface."
 msgstr ""
 
 "interface."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:375
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:392

 msgid ""
 "The information is meant to be useful for a user knowledgeable in the given "
 "Version Control System and willing to build the current version of a package "
 msgid ""
 "The information is meant to be useful for a user knowledgeable in the given "
 "Version Control System and willing to build the current version of a package "


@@ -567,8 +577,8 @@ msgid ""
 "repository instead of pointing to an SSH-accessible version of the same."
 msgstr ""
 
 "repository instead of pointing to an SSH-accessible version of the same."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:386
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:403

 msgid ""
 "In the following example, an instance of the field for a Subversion "
 "repository of the <systemitem role=\"package\">vim</systemitem> package is "
 msgid ""
 "In the following example, an instance of the field for a Subversion "
 "repository of the <systemitem role=\"package\">vim</systemitem> package is "


@@ -579,11 +589,10 @@ msgid ""
 "described above is also shown."
 msgstr ""
 
 "described above is also shown."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><screen>
-#: best-pkging-practices.dbk:394
+#. type: Content of: <chapter><section><section><section><screen>
+#: best-pkging-practices.dbk:412

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"\n"

 "  Source: vim\n"
 "  Section: editors\n"
 "  Priority: optional\n"
 "  Source: vim\n"
 "  Section: editors\n"
 "  Priority: optional\n"


@@ -593,34 +602,34 @@ msgid ""
 "  Homepage: http://www.vim.org\n"
 msgstr ""
 
 "  Homepage: http://www.vim.org\n"
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: best-pkging-practices.dbk:410
+#. type: Content of: <chapter><section><title>
+#: best-pkging-practices.dbk:427

 msgid "Best practices for <filename>debian/changelog</filename>"
 msgstr ""
 
 msgid "Best practices for <filename>debian/changelog</filename>"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:412
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:429

 msgid ""
 "The following practices supplement the <ulink "
 "url=\"&url-debian-policy;ch-docs.html#s-changelogs\">Policy on changelog "
 "files</ulink>."
 msgstr ""
 
 msgid ""
 "The following practices supplement the <ulink "
 "url=\"&url-debian-policy;ch-docs.html#s-changelogs\">Policy on changelog "
 "files</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:417
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:434

 msgid "Writing useful changelog entries"
 msgstr ""
 
 msgid "Writing useful changelog entries"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:419
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:436

 msgid ""
 "The changelog entry for a package revision documents changes in that "
 "revision, and only them.  Concentrate on describing significant and "
 "user-visible changes that were made since the last version."
 msgstr ""
 
 msgid ""
 "The changelog entry for a package revision documents changes in that "
 "revision, and only them.  Concentrate on describing significant and "
 "user-visible changes that were made since the last version."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:424
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:441

 msgid ""
 "Focus on <emphasis>what</emphasis> was changed — who, how and when are "
 "usually less important.  Having said that, remember to politely attribute "
 msgid ""
 "Focus on <emphasis>what</emphasis> was changed — who, how and when are "
 "usually less important.  Having said that, remember to politely attribute "


@@ -628,8 +637,8 @@ msgid ""
 "have sent in patches)."
 msgstr ""
 
 "have sent in patches)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:430
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:447

 msgid ""
 "There's no need to elaborate the trivial and obvious changes.  You can also "
 "aggregate several changes in one entry.  On the other hand, don't be overly "
 msgid ""
 "There's no need to elaborate the trivial and obvious changes.  You can also "
 "aggregate several changes in one entry.  On the other hand, don't be overly "


@@ -638,8 +647,8 @@ msgid ""
 "explanations, use the <filename>README.Debian</filename> file."
 msgstr ""
 
 "explanations, use the <filename>README.Debian</filename> file."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:437
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:454

 msgid ""
 "Use common English so that the majority of readers can comprehend it.  Avoid "
 "abbreviations, tech-speak and jargon when explaining changes that close "
 msgid ""
 "Use common English so that the majority of readers can comprehend it.  Avoid "
 "abbreviations, tech-speak and jargon when explaining changes that close "


@@ -647,8 +656,8 @@ msgid ""
 "particularly technically savvy.  Be polite, don't swear."
 msgstr ""
 
 "particularly technically savvy.  Be polite, don't swear."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:443
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:460

 msgid ""
 "It is sometimes desirable to prefix changelog entries with the names of the "
 "files that were changed.  However, there's no need to explicitly list each "
 msgid ""
 "It is sometimes desirable to prefix changelog entries with the names of the "
 "files that were changed.  However, there's no need to explicitly list each "


@@ -656,21 +665,21 @@ msgid ""
 "or repetitive.  You may use wildcards."
 msgstr ""
 
 "or repetitive.  You may use wildcards."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:449
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:466

 msgid ""
 "When referring to bugs, don't assume anything.  Say what the problem was, "
 "how it was fixed, and append the closes: #nnnnn string.  See <xref "
 "linkend=\"upload-bugfix\"/> for more information."
 msgstr ""
 
 msgid ""
 "When referring to bugs, don't assume anything.  Say what the problem was, "
 "how it was fixed, and append the closes: #nnnnn string.  See <xref "
 "linkend=\"upload-bugfix\"/> for more information."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:456
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:473

 msgid "Common misconceptions about changelog entries"
 msgstr ""
 
 msgid "Common misconceptions about changelog entries"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:458
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:475

 msgid ""
 "The changelog entries should <emphasis role=\"strong\">not</emphasis> "
 "document generic packaging issues (Hey, if you're looking for foo.conf, it's "
 msgid ""
 "The changelog entries should <emphasis role=\"strong\">not</emphasis> "
 "document generic packaging issues (Hey, if you're looking for foo.conf, it's "


@@ -680,16 +689,16 @@ msgid ""
 "file."
 msgstr ""
 
 "file."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:466
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:483

 msgid ""
 "The only bugs closed with a changelog entry should be those that are "
 "actually fixed in the same package revision.  Closing unrelated bugs in the "
 "changelog is bad practice.  See <xref linkend=\"upload-bugfix\"/> ."
 msgstr ""
 
 msgid ""
 "The only bugs closed with a changelog entry should be those that are "
 "actually fixed in the same package revision.  Closing unrelated bugs in the "
 "changelog is bad practice.  See <xref linkend=\"upload-bugfix\"/> ."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:471
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:488

 msgid ""
 "The changelog entries should <emphasis role=\"strong\">not</emphasis> be "
 "used for random discussion with bug reporters (I don't see segfaults when "
 msgid ""
 "The changelog entries should <emphasis role=\"strong\">not</emphasis> be "
 "used for random discussion with bug reporters (I don't see segfaults when "


@@ -702,8 +711,8 @@ msgid ""
 "more information on how to use the bug tracking system."
 msgstr ""
 
 "more information on how to use the bug tracking system."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:482
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:499

 msgid ""
 "It is an old tradition to acknowledge bugs fixed in non-maintainer uploads "
 "in the first changelog entry of the proper maintainer upload.  As we have "
 msgid ""
 "It is an old tradition to acknowledge bugs fixed in non-maintainer uploads "
 "in the first changelog entry of the proper maintainer upload.  As we have "


@@ -711,100 +720,88 @@ msgid ""
 "just mention this fact in your own changelog entry."
 msgstr ""
 
 "just mention this fact in your own changelog entry."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:490
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:507

 msgid "Common errors in changelog entries"
 msgstr ""
 
 msgid "Common errors in changelog entries"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:492
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:509

 msgid ""
 "The following examples demonstrate some common errors or examples of bad "
 "style in changelog entries."
 msgstr ""
 
 msgid ""
 "The following examples demonstrate some common errors or examples of bad "
 "style in changelog entries."
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:495
+#. type: Content of: <chapter><section><section><screen>
+#: best-pkging-practices.dbk:513

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"  * Fixed all outstanding bugs.\n"
+msgid "  * Fixed all outstanding bugs.\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:499
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:516

 msgid "This doesn't tell readers anything too useful, obviously."
 msgstr ""
 
 msgid "This doesn't tell readers anything too useful, obviously."
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:501
+#. type: Content of: <chapter><section><section><screen>
+#: best-pkging-practices.dbk:519

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"  * Applied patch from Jane Random.\n"
+msgid "  * Applied patch from Jane Random.\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:505
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:522

 msgid "What was the patch about?"
 msgstr ""
 
 msgid "What was the patch about?"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:507
+#. type: Content of: <chapter><section><section><screen>
+#: best-pkging-practices.dbk:525

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"  * Late night install target overhaul.\n"
+msgid "  * Late night install target overhaul.\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:511
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:528

 msgid ""
 "Overhaul which accomplished what? Is the mention of late night supposed to "
 "remind us that we shouldn't trust that code?"
 msgstr ""
 
 msgid ""
 "Overhaul which accomplished what? Is the mention of late night supposed to "
 "remind us that we shouldn't trust that code?"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:514
+#. type: Content of: <chapter><section><section><screen>
+#: best-pkging-practices.dbk:532

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"  * Fix vsync FU w/ ancient CRTs.\n"
+msgid "  * Fix vsync FU w/ ancient CRTs.\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:518
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:535

 msgid ""
 "Too many acronyms, and it's not overly clear what the, uh, fsckup (oops, a "
 "curse word!) was actually about, or how it was fixed."
 msgstr ""
 
 msgid ""
 "Too many acronyms, and it's not overly clear what the, uh, fsckup (oops, a "
 "curse word!) was actually about, or how it was fixed."
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:521
+#. type: Content of: <chapter><section><section><screen>
+#: best-pkging-practices.dbk:539

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"  * This is not a bug, closes: #nnnnnn.\n"
+msgid "  * This is not a bug, closes: #nnnnnn.\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:525
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:542

 msgid ""
 "First of all, there's absolutely no need to upload the package to convey "
 "this information; instead, use the bug tracking system.  Secondly, there's "
 "no explanation as to why the report is not a bug."
 msgstr ""
 
 msgid ""
 "First of all, there's absolutely no need to upload the package to convey "
 "this information; instead, use the bug tracking system.  Secondly, there's "
 "no explanation as to why the report is not a bug."
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:529
+#. type: Content of: <chapter><section><section><screen>
+#: best-pkging-practices.dbk:547

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"  * Has been fixed for ages, but I forgot to close; closes: #54321.\n"
+msgid "  * Has been fixed for ages, but I forgot to close; closes: #54321.\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:533
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:550

 msgid ""
 "If for some reason you didn't mention the bug number in a previous changelog "
 "entry, there's no problem, just close the bug normally in the BTS.  There's "
 msgid ""
 "If for some reason you didn't mention the bug number in a previous changelog "
 "entry, there's no problem, just close the bug normally in the BTS.  There's "


@@ -814,28 +811,26 @@ msgid ""
 "changelog)."
 msgstr ""
 
 "changelog)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:539
+#. type: Content of: <chapter><section><section><screen>
+#: best-pkging-practices.dbk:557

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"  * Closes: #12345, #12346, #15432\n"
+msgid "  * Closes: #12345, #12346, #15432\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:543
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:560

 msgid ""
 "Where's the description? If you can't think of a descriptive message, start "
 "by inserting the title of each different bug."
 msgstr ""
 
 msgid ""
 "Where's the description? If you can't think of a descriptive message, start "
 "by inserting the title of each different bug."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:549
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:566

 msgid "Supplementing changelogs with NEWS.Debian files"
 msgstr ""
 
 msgid "Supplementing changelogs with NEWS.Debian files"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:551
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:568

 msgid ""
 "Important news about changes in a package can also be put in <filename> "
 "NEWS.Debian</filename> files.  The news will be displayed by tools like "
 msgid ""
 "Important news about changes in a package can also be put in <filename> "
 "NEWS.Debian</filename> files.  The news will be displayed by tools like "


@@ -848,8 +843,8 @@ msgid ""
 "notes."
 msgstr ""
 
 "notes."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:562
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:579

 msgid ""
 "The file format is the same as a debian changelog file, but leave off the "
 "asterisks and describe each news item with a full paragraph when necessary "
 msgid ""
 "The file format is the same as a debian changelog file, but leave off the "
 "asterisks and describe each news item with a full paragraph when necessary "


@@ -860,11 +855,10 @@ msgid ""
 "</filename> file:"
 msgstr ""
 
 "</filename> file:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:570
+#. type: Content of: <chapter><section><section><screen>
+#: best-pkging-practices.dbk:588

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"\n"

 "cron (3.0pl1-74) unstable; urgency=low\n"
 "\n"
 "    The checksecurity script is no longer included with the cron package:\n"
 "cron (3.0pl1-74) unstable; urgency=low\n"
 "\n"
 "    The checksecurity script is no longer included with the cron package:\n"


@@ -876,8 +870,8 @@ msgid ""
 "-0500\n"
 msgstr ""
 
 "-0500\n"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:581
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:598

 msgid ""
 "The <filename>NEWS.Debian</filename> file is installed as <filename> "
 "/usr/share/doc/<replaceable>package</replaceable>/NEWS.Debian.gz</filename>.  "
 msgid ""
 "The <filename>NEWS.Debian</filename> file is installed as <filename> "
 "/usr/share/doc/<replaceable>package</replaceable>/NEWS.Debian.gz</filename>.  "


@@ -886,8 +880,8 @@ msgid ""
 "</literal> will install <filename>debian/NEWS</filename> files for you."
 msgstr ""
 
 "</literal> will install <filename>debian/NEWS</filename> files for you."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:588
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:605

 msgid ""
 "Unlike changelog files, you need not update <filename>NEWS.Debian</filename> "
 "files with every release.  Only update them if you have something "
 msgid ""
 "Unlike changelog files, you need not update <filename>NEWS.Debian</filename> "
 "files with every release.  Only update them if you have something "


@@ -896,13 +890,13 @@ msgid ""
 "package.  No news is good news!"
 msgstr ""
 
 "package.  No news is good news!"
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: best-pkging-practices.dbk:610
+#. type: Content of: <chapter><section><title>
+#: best-pkging-practices.dbk:627

 msgid "Best practices for maintainer scripts"
 msgstr ""
 
 msgid "Best practices for maintainer scripts"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:612
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:629

 msgid ""
 "Maintainer scripts include the files <filename>debian/postinst</filename>, "
 "<filename>debian/preinst</filename>, <filename>debian/prerm</filename> and "
 msgid ""
 "Maintainer scripts include the files <filename>debian/postinst</filename>, "
 "<filename>debian/preinst</filename>, <filename>debian/prerm</filename> and "


@@ -912,23 +906,23 @@ msgid ""
 "supplement the <ulink url=\"&url-debian-policy;\">Debian Policy</ulink>."
 msgstr ""
 
 "supplement the <ulink url=\"&url-debian-policy;\">Debian Policy</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:620
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:637

 msgid ""
 "Maintainer scripts must be idempotent.  That means that you need to make "
 "sure nothing bad will happen if the script is called twice where it would "
 "usually be called once."
 msgstr ""
 
 msgid ""
 "Maintainer scripts must be idempotent.  That means that you need to make "
 "sure nothing bad will happen if the script is called twice where it would "
 "usually be called once."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:625
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:642

 msgid ""
 "Standard input and output may be redirected (e.g.  into pipes) for logging "
 "purposes, so don't rely on them being a tty."
 msgstr ""
 
 msgid ""
 "Standard input and output may be redirected (e.g.  into pipes) for logging "
 "purposes, so don't rely on them being a tty."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:629
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:646

 msgid ""
 "All prompting or interactive configuration should be kept to a minimum.  "
 "When it is necessary, you should use the <systemitem "
 msgid ""
 "All prompting or interactive configuration should be kept to a minimum.  "
 "When it is necessary, you should use the <systemitem "


@@ -937,8 +931,8 @@ msgid ""
 "stage of the <filename>postinst</filename> script."
 msgstr ""
 
 "stage of the <filename>postinst</filename> script."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:636
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:653

 msgid ""
 "Keep the maintainer scripts as simple as possible.  We suggest you use pure "
 "POSIX shell scripts.  Remember, if you do need any bash features, the "
 msgid ""
 "Keep the maintainer scripts as simple as possible.  We suggest you use pure "
 "POSIX shell scripts.  Remember, if you do need any bash features, the "


@@ -947,8 +941,8 @@ msgid ""
 "role=\"package\">debhelper</systemitem> to easily add bits to the scripts."
 msgstr ""
 
 "role=\"package\">debhelper</systemitem> to easily add bits to the scripts."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:643
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:660

 msgid ""
 "If you change your maintainer scripts, be sure to test package removal, "
 "double installation, and purging.  Be sure that a purged package is "
 msgid ""
 "If you change your maintainer scripts, be sure to test package removal, "
 "double installation, and purging.  Be sure that a purged package is "


@@ -956,28 +950,28 @@ msgid ""
 "indirectly, in any maintainer script."
 msgstr ""
 
 "indirectly, in any maintainer script."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:649
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:666

 msgid ""
 "If you need to check for the existence of a command, you should use "
 "something like"
 msgstr ""
 
 msgid ""
 "If you need to check for the existence of a command, you should use "
 "something like"
 msgstr ""
 

-# type: Content of: <chapter><section><programlisting>
-#: best-pkging-practices.dbk:652
+#. type: Content of: <chapter><section><programlisting>
+#: best-pkging-practices.dbk:669

 #, no-wrap
 msgid "if [ -x /usr/sbin/install-docs ]; then ..."
 msgstr ""
 
 #, no-wrap
 msgid "if [ -x /usr/sbin/install-docs ]; then ..."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:654
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:671

 msgid ""
 "If you don't wish to hard-code the path of a command in your maintainer "
 "script, the following POSIX-compliant shell function may help:"
 msgstr ""
 
 msgid ""
 "If you don't wish to hard-code the path of a command in your maintainer "
 "script, the following POSIX-compliant shell function may help:"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:659
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:676

 msgid ""
 "You can use this function to search <literal>$PATH</literal> for a command "
 "name, passed as an argument.  It returns true (zero) if the command was "
 msgid ""
 "You can use this function to search <literal>$PATH</literal> for a command "
 "name, passed as an argument.  It returns true (zero) if the command was "


@@ -986,8 +980,8 @@ msgid ""
 "<command>which</command> are not POSIX."
 msgstr ""
 
 "<command>which</command> are not POSIX."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:666
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:683

 msgid ""
 "While <command>which</command> is an acceptable alternative, since it is "
 "from the required <systemitem role=\"package\">debianutils</systemitem> "
 msgid ""
 "While <command>which</command> is an acceptable alternative, since it is "
 "from the required <systemitem role=\"package\">debianutils</systemitem> "


@@ -997,15 +991,15 @@ msgid ""
 "partition is mounted.  Most scripts won't have this problem, though."
 msgstr ""
 
 "partition is mounted.  Most scripts won't have this problem, though."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: best-pkging-practices.dbk:676
+#. type: Content of: <chapter><section><title>
+#: best-pkging-practices.dbk:693

 msgid ""
 "Configuration management with <systemitem "
 "role=\"package\">debconf</systemitem>"
 msgstr ""
 
 msgid ""
 "Configuration management with <systemitem "
 "role=\"package\">debconf</systemitem>"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:678
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:695

 msgid ""
 "<systemitem role=\"package\">Debconf</systemitem> is a configuration "
 "management system which can be used by all the various packaging scripts "
 msgid ""
 "<systemitem role=\"package\">Debconf</systemitem> is a configuration "
 "management system which can be used by all the various packaging scripts "


@@ -1015,8 +1009,8 @@ msgid ""
 "interaction.  This will enable non-interactive installations in the future."
 msgstr ""
 
 "interaction.  This will enable non-interactive installations in the future."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:686
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:703

 msgid ""
 "Debconf is a great tool but it is often poorly used.  Many common mistakes "
 "are listed in the <citerefentry> "
 msgid ""
 "Debconf is a great tool but it is often poorly used.  Many common mistakes "
 "are listed in the <citerefentry> "


@@ -1025,8 +1019,8 @@ msgid ""
 "to use debconf.  Also, we document some best practices here."
 msgstr ""
 
 "to use debconf.  Also, we document some best practices here."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: best-pkging-practices.dbk:693
+#. type: Content of: <chapter><section><para>
+#: best-pkging-practices.dbk:710

 msgid ""
 "These guidelines include some writing style and typography recommendations, "
 "general considerations about debconf usage as well as more specific "
 msgid ""
 "These guidelines include some writing style and typography recommendations, "
 "general considerations about debconf usage as well as more specific "


@@ -1034,13 +1028,13 @@ msgid ""
 "for instance)."
 msgstr ""
 
 "for instance)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:699
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:716

 msgid "Do not abuse debconf"
 msgstr ""
 
 msgid "Do not abuse debconf"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:701
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:718

 msgid ""
 "Since debconf appeared in Debian, it has been widely abused and several "
 "criticisms received by the Debian distribution come from debconf abuse with "
 msgid ""
 "Since debconf appeared in Debian, it has been widely abused and several "
 "criticisms received by the Debian distribution come from debconf abuse with "


@@ -1048,8 +1042,8 @@ msgid ""
 "thing installed."
 msgstr ""
 
 "thing installed."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:707
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:724

 msgid ""
 "Keep usage notes to what they belong: the NEWS.Debian, or README.Debian "
 "file.  Only use notes for important notes which may directly affect the "
 msgid ""
 "Keep usage notes to what they belong: the NEWS.Debian, or README.Debian "
 "file.  Only use notes for important notes which may directly affect the "


@@ -1057,8 +1051,8 @@ msgid ""
 "confirmed or bother the user by email."
 msgstr ""
 
 "confirmed or bother the user by email."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:713
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:730

 msgid ""
 "Carefully choose the questions priorities in maintainer scripts.  See "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> "
 msgid ""
 "Carefully choose the questions priorities in maintainer scripts.  See "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> "


@@ -1066,39 +1060,39 @@ msgid ""
 "questions should use medium and low priorities."
 msgstr ""
 
 "questions should use medium and low priorities."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:721
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:738

 msgid "General recommendations for authors and translators"
 msgstr ""
 
 msgid "General recommendations for authors and translators"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:723
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:740

 msgid "Write correct English"
 msgstr ""
 
 msgid "Write correct English"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:725
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:742

 msgid ""
 "Most Debian package maintainers are not native English speakers.  So, "
 "writing properly phrased templates may not be easy for them."
 msgstr ""
 
 msgid ""
 "Most Debian package maintainers are not native English speakers.  So, "
 "writing properly phrased templates may not be easy for them."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:729
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:746

 msgid ""
 "Please use (and abuse) &email-debian-l10n-english; mailing list.  Have your "
 "templates proofread."
 msgstr ""
 
 msgid ""
 "Please use (and abuse) &email-debian-l10n-english; mailing list.  Have your "
 "templates proofread."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:733
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:750

 msgid ""
 "Badly written templates give a poor image of your package, of your work...or "
 "even of Debian itself."
 msgstr ""
 
 msgid ""
 "Badly written templates give a poor image of your package, of your work...or "
 "even of Debian itself."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:737
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:754

 msgid ""
 "Avoid technical jargon as much as possible.  If some terms sound common to "
 "you, they may be impossible to understand for others.  If you cannot avoid "
 msgid ""
 "Avoid technical jargon as much as possible.  If some terms sound common to "
 "you, they may be impossible to understand for others.  If you cannot avoid "


@@ -1106,171 +1100,285 @@ msgid ""
 "try to balance between verbosity and simplicity."
 msgstr ""
 
 "try to balance between verbosity and simplicity."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:745
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:762

 msgid "Be kind to translators"
 msgstr ""
 
 msgid "Be kind to translators"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:747
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:764

 msgid ""
 "Debconf templates may be translated.  Debconf, along with its sister package "
 "<command>po-debconf</command> offers a simple framework for getting "
 "templates translated by translation teams or even individuals."
 msgstr ""
 
 msgid ""
 "Debconf templates may be translated.  Debconf, along with its sister package "
 "<command>po-debconf</command> offers a simple framework for getting "
 "templates translated by translation teams or even individuals."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:752
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:769

 msgid ""
 "Please use gettext-based templates.  Install <systemitem "
 "role=\"package\">po-debconf</systemitem> on your development system and read "
 "its documentation (<literal>man po-debconf</literal> is a good start)."
 msgstr ""
 
 msgid ""
 "Please use gettext-based templates.  Install <systemitem "
 "role=\"package\">po-debconf</systemitem> on your development system and read "
 "its documentation (<literal>man po-debconf</literal> is a good start)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:757
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:774

 msgid ""
 "Avoid changing templates too often.  Changing templates text induces more "
 msgid ""
 "Avoid changing templates too often.  Changing templates text induces more "

-"work to translators which will get their translation fuzzied.  If you plan "
-"changes to your original templates, please contact translators.  Most active "
+"work to translators which will get their translation fuzzied.  A fuzzy "
+"translation is a string for which the original changed since it was "
+"translated, therefore requiring some update by a translator to be usable.  "
+"When changes are small enough, the original translation is kept in PO files "
+"but marked as <literal>fuzzy</literal>."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:782
+msgid ""
+"If you plan to do changes to your original templates, please use the "
+"notification system provided with the <systemitem "
+"role=\"package\">po-debconf</systemitem> package, namely the <command> "
+"podebconf-report-po</command>, to contact translators.  Most active "

 "translators are very responsive and getting their work included along with "
 "your modified templates will save you additional uploads.  If you use "
 "gettext-based templates, the translator's name and e-mail addresses are "
 "translators are very responsive and getting their work included along with "
 "your modified templates will save you additional uploads.  If you use "
 "gettext-based templates, the translator's name and e-mail addresses are "

-"mentioned in the po files headers."
+"mentioned in the PO files headers and will be used by <command> "
+"podebconf-report-po</command>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:766
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:794
+msgid "A recommended use of that utility is:"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><programlisting>
+#: best-pkging-practices.dbk:796
+#, no-wrap

 msgid ""
 msgid ""

-"The use of the <command>podebconf-report-po</command> from the <systemitem "
-"role=\"package\">po-debconf</systemitem> package is highly recommended to "
-"warn translators which have incomplete translations and request them for "
-"updates."
+"cd debian/po &amp;&amp; podebconf-report-po --languageteam --withtranslators "
+"--call --deadline=\"+10 days\""

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:771
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:798

 msgid ""
 msgid ""

-"If in doubt, you may also contact the translation team for a given language "
-"(debian-l10n-xxxxx@&lists-host;), or the &email-debian-i18n; mailing list."
+"This command will first synchronize the PO and POT files in debian/po with "
+"the templates files listed in <filename>debian/po/POTFILES.in</filename>.  "
+"Then, it will send a call for translation updates to the language team "
+"(mentioned in the <literal>Language-Team</literal> field of each PO file)  "
+"as well as the last translator (mentioned in "
+"<literal>Last-translator</literal>). Finally, it will also send a call for "
+"new translations, in the &email-debian-i18n; mailing list."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:807
+msgid ""
+"Giving a deadline to translators is always appreciated, so that they can "
+"organize their work. Please remember that some translation teams have a "
+"formalized translate/review process and a delay lower than 10 days is "
+"considered as unreasonable. A shorter delay puts too much pressure on "
+"translation teams and should be kept for very minor changes."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:776
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:814

 msgid ""
 msgid ""

-"Calls for translations posted to &email-debian-i18n; with the "
-"<filename>debian/po/templates.pot</filename> file attached or referenced in "
-"a URL are encouraged.  Be sure to mentions in these calls for new "
-"translations which languages you have existing translations for, in order to "
-"avoid duplicate work."
+"If in doubt, you may also contact the translation team for a given language "
+"(debian-l10n-xxxxx@&lists-host;), or the &email-debian-i18n; mailing list."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:785
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:821

 msgid "Unfuzzy complete translations when correcting typos and spelling"
 msgstr ""
 
 msgid "Unfuzzy complete translations when correcting typos and spelling"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:787
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:823

 msgid ""
 "When the text of a debconf template is corrected and you are <emphasis "
 "role=\"strong\">sure</emphasis> that the change does <emphasis "
 "role=\"strong\">not</emphasis> affect translations, please be kind to "
 msgid ""
 "When the text of a debconf template is corrected and you are <emphasis "
 "role=\"strong\">sure</emphasis> that the change does <emphasis "
 "role=\"strong\">not</emphasis> affect translations, please be kind to "

-"translators and unfuzzy their translations."
+"translators and <emphasis>unfuzzy</emphasis> their translations."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:793
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:829

 msgid ""
 "If you don't do so, the whole template will not be translated as long as a "
 "translator will send you an update."
 msgstr ""
 
 msgid ""
 "If you don't do so, the whole template will not be translated as long as a "
 "translator will send you an update."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:797
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:833

 msgid ""
 msgid ""

-"To <literal>unfuzzy</literal> translations, you can proceed the following "
-"way:"
+"To <emphasis>unfuzzy</emphasis> translations, you can use two methods. The "
+"first method does <emphasis>preventive</emphasis> search and replace actions "
+"in the PO files. The latter uses <command>gettext</command> utilities to "
+"<emphasis>unfuzzy</emphasis> strings."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:839
+msgid "<emphasis>Preventive unfuzzy</emphasis> method:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:803
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:844

 msgid ""
 msgid ""

-"Put all incomplete PO files out of the way.  You can check the completeness "
-"by using (needs the <systemitem role=\"package\">gettext</systemitem> "
-"package installed):"
+"Try finding a complete translation file <emphasis role=\"strong\"> "
+"before</emphasis> the change:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:807
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#: best-pkging-practices.dbk:847 best-pkging-practices.dbk:917

 #, no-wrap
 msgid ""
 "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null\n"
 "--statistics $i; done"
 msgstr ""
 
 #, no-wrap
 msgid ""
 "for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null\n"
 "--statistics $i; done"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:812
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:850
+msgid ""
+"The file only showing <emphasis>translated</emphasis> items will be used as "
+"the reference file. If there is none (which should not happen if you take "
+"care to properly interact with translators), you should use the file with "
+"the most translated strings."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:858
+msgid ""
+"Identify the needed change. In this example, let's assume the change is "
+"about fixing a typo in the word <literal>typo</literal> which was "
+"inadvertently written as <literal>tpyo</literal>. Therefore, the change is "
+"<command>s/tpyo/typo</command>."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:866
+msgid ""
+"Check that this change is only applied to the place where you really intend "
+"to make it and <emphasis role=\"strong\">not</emphasis> in any other place "
+"where the original string is appropriate. This specifically applies to "
+"change in punctuation, for instance."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:874
+msgid ""
+"Modify all PO files by using <command>sed</command>. The use of that command "
+"is recommended over any text editor to guarantee that the files encoding "
+"will not be broken by the edit action."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#: best-pkging-practices.dbk:879
+#, no-wrap
+msgid ""
+"cd debian/po\n"
+"for i in *.po; do sed -i 's/tpyo/typo/g' $i; done\n"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:885
+msgid "Change the debconf template file to fix the typo."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:890
+msgid "Run <command>debconf-updatepo</command>"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:895
+msgid ""
+"Check the <filename>foo.po</filename> reference file. Its statistics should "
+"not be changed:"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#: best-pkging-practices.dbk:899
+#, no-wrap
+msgid "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:908
+msgid "Gettext utilities method:"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:913
+msgid ""
+"Put all incomplete PO files out of the way.  You can check the completeness "
+"by using (needs the <systemitem role=\"package\">gettext</systemitem> "
+"package installed):"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:922

 msgid ""
 "move all files which report either fuzzy strings to a temporary place.  "
 "Files which report no fuzzy strings (only translated and untranslated) will "
 "be kept in place."
 msgstr ""
 
 msgid ""
 "move all files which report either fuzzy strings to a temporary place.  "
 "Files which report no fuzzy strings (only translated and untranslated) will "
 "be kept in place."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:819
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:929

 msgid ""
 "now <emphasis role=\"strong\">and now only</emphasis>, modify the template "
 "for the typos and check again that translation are not impacted (typos, "
 "spelling errors, sometimes typographical corrections are usually OK)"
 msgstr ""
 
 msgid ""
 "now <emphasis role=\"strong\">and now only</emphasis>, modify the template "
 "for the typos and check again that translation are not impacted (typos, "
 "spelling errors, sometimes typographical corrections are usually OK)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:826
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:936

 msgid ""
 "run <command>debconf-updatepo</command>.  This will fuzzy all strings you "
 "modified in translations.  You can see this by running the above again"
 msgstr ""
 
 msgid ""
 "run <command>debconf-updatepo</command>.  This will fuzzy all strings you "
 "modified in translations.  You can see this by running the above again"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:832
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:942

 msgid "use the following command:"
 msgstr ""
 
 msgid "use the following command:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
-#: best-pkging-practices.dbk:834
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
+#: best-pkging-practices.dbk:944

 #, no-wrap
 msgid "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
 msgstr ""
 
 #, no-wrap
 msgid "for i in debian/po/*po; do msgattrib --output-file=$i --clear-fuzzy $i; done"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:838
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:948

 msgid ""
 "move back to debian/po the files which showed fuzzy strings in the first "
 "step"
 msgstr ""
 
 msgid ""
 "move back to debian/po the files which showed fuzzy strings in the first "
 "step"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:843
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:953

 msgid "run <command>debconf-updatepo</command> again"
 msgstr ""
 
 msgid "run <command>debconf-updatepo</command> again"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:850
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:960

 msgid "Do not make assumptions about interfaces"
 msgstr ""
 
 msgid "Do not make assumptions about interfaces"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:852
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:962

 msgid ""
 "Templates text should not make reference to widgets belonging to some "
 msgid ""
 "Templates text should not make reference to widgets belonging to some "

-"debconf interfaces.  Sentences like If you answer Yes...  have no meaning "
-"for users of graphical interfaces which use checkboxes for boolean "
-"questions."
+"debconf interfaces.  Sentences like <emphasis>If you answer "
+"Yes...</emphasis> have no meaning for users of graphical interfaces which "
+"use checkboxes for boolean questions."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:857
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:967

 msgid ""
 "String templates should also avoid mentioning the default values in their "
 "description.  First, because this is redundant with the values seen by the "
 msgid ""
 "String templates should also avoid mentioning the default values in their "
 "description.  First, because this is redundant with the values seen by the "


@@ -1278,127 +1386,173 @@ msgid ""
 "maintainer choices (for instance, when the debconf database was preseeded)."
 msgstr ""
 
 "maintainer choices (for instance, when the debconf database was preseeded)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:863
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:973

 msgid ""
 "More generally speaking, try to avoid referring to user actions.  Just give "
 "facts."
 msgstr ""
 
 msgid ""
 "More generally speaking, try to avoid referring to user actions.  Just give "
 "facts."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:869
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:979

 msgid "Do not use first person"
 msgstr ""
 
 msgid "Do not use first person"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:871
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:981

 msgid ""
 msgid ""

-"You should avoid the use of first person (I will do this...  or We "
-"recommend...).  The computer is not a person and the Debconf templates do "
-"not speak for the Debian developers.  You should use neutral construction.  "
-"Those of you who already wrote scientific publications, just write your "
-"templates like you would write a scientific paper.  However, try using "
-"action voice if still possible, like Enable this if ...  instead of This can "
-"be enabled if ...."
+"You should avoid the use of first person (<emphasis>I will do "
+"this...</emphasis> or <emphasis>We recommend...</emphasis>).  The computer "
+"is not a person and the Debconf templates do not speak for the Debian "
+"developers.  You should use neutral construction.  Those of you who already "
+"wrote scientific publications, just write your templates like you would "
+"write a scientific paper.  However, try using active voice if still "
+"possible, like <emphasis>Enable this if ...</emphasis> instead of "
+"<emphasis>This can be enabled if...</emphasis>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:881
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:991

 msgid "Be gender neutral"
 msgstr ""
 
 msgid "Be gender neutral"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:883
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:993

 msgid ""
 "The world is made of men and women.  Please use gender-neutral constructions "
 "in your writing."
 msgstr ""
 
 msgid ""
 "The world is made of men and women.  Please use gender-neutral constructions "
 "in your writing."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:891
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:1001

 msgid "Templates fields definition"
 msgstr ""
 
 msgid "Templates fields definition"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:893
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1003

 msgid ""
 "This part gives some information which is mostly taken from the "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> "
 "<manvolnum>7</manvolnum> </citerefentry> manual page."
 msgstr ""
 
 msgid ""
 "This part gives some information which is mostly taken from the "
 "<citerefentry> <refentrytitle>debconf-devel</refentrytitle> "
 "<manvolnum>7</manvolnum> </citerefentry> manual page."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:898
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:1008

 msgid "Type"
 msgstr ""
 
 msgid "Type"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:900
+#. type: Content of: <chapter><section><section><section><section><title>
+#: best-pkging-practices.dbk:1010

 msgid "string:"
 msgstr ""
 
 msgid "string:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:902
+#. type: Content of: <chapter><section><section><section><section><para>
+#: best-pkging-practices.dbk:1012

 msgid "Results in a free-form input field that the user can type any string into."
 msgstr ""
 
 msgid "Results in a free-form input field that the user can type any string into."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:907
+#. type: Content of: <chapter><section><section><section><section><title>
+#: best-pkging-practices.dbk:1017

 msgid "password:"
 msgstr ""
 
 msgid "password:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:909
+#. type: Content of: <chapter><section><section><section><section><para>
+#: best-pkging-practices.dbk:1019

 msgid ""
 "Prompts the user for a password.  Use this with caution; be aware that the "
 "password the user enters will be written to debconf's database.  You should "
 "probably clean that value out of the database as soon as is possible."
 msgstr ""
 
 msgid ""
 "Prompts the user for a password.  Use this with caution; be aware that the "
 "password the user enters will be written to debconf's database.  You should "
 "probably clean that value out of the database as soon as is possible."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:916
+#. type: Content of: <chapter><section><section><section><section><title>
+#: best-pkging-practices.dbk:1026

 msgid "boolean:"
 msgstr ""
 
 msgid "boolean:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:918
+#. type: Content of: <chapter><section><section><section><section><para>
+#: best-pkging-practices.dbk:1028

 msgid ""
 "A true/false choice.  Remember: true/false, <emphasis role=\"strong\">not "
 "yes/no</emphasis>..."
 msgstr ""
 
 msgid ""
 "A true/false choice.  Remember: true/false, <emphasis role=\"strong\">not "
 "yes/no</emphasis>..."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:924
+#. type: Content of: <chapter><section><section><section><section><title>
+#: best-pkging-practices.dbk:1034

 msgid "select:"
 msgstr ""
 
 msgid "select:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:926
+#. type: Content of: <chapter><section><section><section><section><para>
+#: best-pkging-practices.dbk:1036

 msgid ""
 "A choice between one of a number of values.  The choices must be specified "
 "in a field named 'Choices'.  Separate the possible values with commas and "
 msgid ""
 "A choice between one of a number of values.  The choices must be specified "
 "in a field named 'Choices'.  Separate the possible values with commas and "

-"spaces, like this: Choices: yes, no, maybe"
+"spaces, like this: <literal>Choices: yes, no, maybe</literal>."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><section><para>
+#: best-pkging-practices.dbk:1041
+msgid ""
+"If choices are translatable strings, the 'Choices' field may be marked as "
+"translatable by using <literal>__Choices</literal>. The double underscore "
+"will split out each choice in a separate string."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><section><para>
+#: best-pkging-practices.dbk:1046
+msgid ""
+"The <command>po-debconf</command> system also offers interesting "
+"possibilities to only mark <emphasis role=\"strong\">some</emphasis> choices "
+"as translatable.  Example:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:933
+#. type: Content of: <chapter><section><section><section><section><programlisting>
+#: best-pkging-practices.dbk:1051
+#, no-wrap
+msgid ""
+"Template: foo/bar\n"
+"Type: Select\n"
+"#flag:translate:3\n"
+"__Choices: PAL, SECAM, Other\n"
+"_Description: TV standard:\n"
+" Please choose the TV standard used in your country.\n"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><section><para>
+#: best-pkging-practices.dbk:1059
+msgid ""
+"In that example, only the 'Other' string is translatable while others are "
+"acronyms that should not be translated. The above allows only 'Other' to be "
+"included in PO and POT files."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><section><para>
+#: best-pkging-practices.dbk:1064
+msgid ""
+"The debconf templates flag system offers many such possibilities. The "
+"<citerefentry> <refentrytitle>po-debconf</refentrytitle> "
+"<manvolnum>7</manvolnum> </citerefentry> manual page lists all these "
+"possibilities."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><section><title>
+#: best-pkging-practices.dbk:1072

 msgid "multiselect:"
 msgstr ""
 
 msgid "multiselect:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:935
+#. type: Content of: <chapter><section><section><section><section><para>
+#: best-pkging-practices.dbk:1074

 msgid ""
 "Like the select data type, except the user can choose any number of items "
 "from the choices list (or chose none of them)."
 msgstr ""
 
 msgid ""
 "Like the select data type, except the user can choose any number of items "
 "from the choices list (or chose none of them)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:941
+#. type: Content of: <chapter><section><section><section><section><title>
+#: best-pkging-practices.dbk:1080

 msgid "note:"
 msgstr ""
 
 msgid "note:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:943
+#. type: Content of: <chapter><section><section><section><section><para>
+#: best-pkging-practices.dbk:1082

 msgid ""
 "Rather than being a question per se, this datatype indicates a note that can "
 "be displayed to the user.  It should be used only for important notes that "
 msgid ""
 "Rather than being a question per se, this datatype indicates a note that can "
 "be displayed to the user.  It should be used only for important notes that "


@@ -1407,50 +1561,50 @@ msgid ""
 "mailing the note to them in some cases."
 msgstr ""
 
 "mailing the note to them in some cases."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:952
+#. type: Content of: <chapter><section><section><section><section><title>
+#: best-pkging-practices.dbk:1091

 msgid "text:"
 msgstr ""
 
 msgid "text:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:954
+#. type: Content of: <chapter><section><section><section><section><para>
+#: best-pkging-practices.dbk:1093

 msgid "This type is now considered obsolete: don't use it."
 msgstr ""
 
 msgid "This type is now considered obsolete: don't use it."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:959
+#. type: Content of: <chapter><section><section><section><section><title>
+#: best-pkging-practices.dbk:1098

 msgid "error:"
 msgstr ""
 
 msgid "error:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:961
+#. type: Content of: <chapter><section><section><section><section><para>
+#: best-pkging-practices.dbk:1100

 msgid ""
 "This type is designed to handle error messages.  It is mostly similar to the "
 "note type.  Frontends may present it differently (for instance, the dialog "
 "frontend of cdebconf draws a red screen instead of the usual blue one)."
 msgstr ""
 
 msgid ""
 "This type is designed to handle error messages.  It is mostly similar to the "
 "note type.  Frontends may present it differently (for instance, the dialog "
 "frontend of cdebconf draws a red screen instead of the usual blue one)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><para>
-#: best-pkging-practices.dbk:966
+#. type: Content of: <chapter><section><section><section><section><para>
+#: best-pkging-practices.dbk:1105

 msgid ""
 "It is recommended to use this type for any message that needs user attention "
 "for a correction of any kind."
 msgstr ""
 
 msgid ""
 "It is recommended to use this type for any message that needs user attention "
 "for a correction of any kind."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:974
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:1113

 msgid "Description: short and extended description"
 msgstr ""
 
 msgid "Description: short and extended description"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:976
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1115

 msgid ""
 "Template descriptions have two parts: short and extended.  The short "
 "description is in the Description: line of the template."
 msgstr ""
 
 msgid ""
 "Template descriptions have two parts: short and extended.  The short "
 "description is in the Description: line of the template."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:980
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1119

 msgid ""
 "The short description should be kept short (50 characters or so) so that it "
 "may be accomodated by most debconf interfaces.  Keeping it short also helps "
 msgid ""
 "The short description should be kept short (50 characters or so) so that it "
 "may be accomodated by most debconf interfaces.  Keeping it short also helps "


@@ -1458,8 +1612,8 @@ msgid ""
 "original."
 msgstr ""
 
 "original."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:986
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1125

 msgid ""
 "The short description should be able to stand on its own.  Some interfaces "
 "do not show the long description by default, or only if the user explicitely "
 msgid ""
 "The short description should be able to stand on its own.  Some interfaces "
 "do not show the long description by default, or only if the user explicitely "


@@ -1467,15 +1621,15 @@ msgid ""
 "want to do?"
 msgstr ""
 
 "want to do?"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:992
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1131

 msgid ""
 "The short description does not necessarily have to be a full sentence.  This "
 "is part of the keep it short and efficient recommendation."
 msgstr ""
 
 msgid ""
 "The short description does not necessarily have to be a full sentence.  This "
 "is part of the keep it short and efficient recommendation."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:996
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1135

 msgid ""
 "The extended description should not repeat the short description word for "
 "word.  If you can't think up a long description, then first, think some "
 msgid ""
 "The extended description should not repeat the short description word for "
 "word.  If you can't think up a long description, then first, think some "


@@ -1484,16 +1638,16 @@ msgid ""
 "up with anything, leave it blank."
 msgstr ""
 
 "up with anything, leave it blank."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1003
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1142

 msgid ""
 "The extended description should use complete sentences.  Paragraphs should "
 "be kept short for improved readability.  Do not mix two ideas in the same "
 "paragraph but rather use another paragraph."
 msgstr ""
 
 msgid ""
 "The extended description should use complete sentences.  Paragraphs should "
 "be kept short for improved readability.  Do not mix two ideas in the same "
 "paragraph but rather use another paragraph."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1008
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1147

 msgid ""
 "Don't be too verbose.  User tend to ignore too long screens.  20 lines are "
 "by experience a border you shouldn't cross, because that means that in the "
 msgid ""
 "Don't be too verbose.  User tend to ignore too long screens.  20 lines are "
 "by experience a border you shouldn't cross, because that means that in the "


@@ -1501,82 +1655,82 @@ msgid ""
 "just don't do that."
 msgstr ""
 
 "just don't do that."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1014
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1153

 msgid ""
 "The extended description should <emphasis role=\"strong\">never</emphasis> "
 "include a question."
 msgstr ""
 
 msgid ""
 "The extended description should <emphasis role=\"strong\">never</emphasis> "
 "include a question."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1018
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1157

 msgid ""
 "For specific rules depending on templates type (string, boolean, etc.), "
 "please read below."
 msgstr ""
 
 msgid ""
 "For specific rules depending on templates type (string, boolean, etc.), "
 "please read below."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1024
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:1163

 msgid "Choices"
 msgstr ""
 
 msgid "Choices"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1026
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1165

 msgid ""
 "This field should be used for Select and Multiselect types.  It contains the "
 "possible choices which will be presented to users.  These choices should be "
 "separated by commas."
 msgstr ""
 
 msgid ""
 "This field should be used for Select and Multiselect types.  It contains the "
 "possible choices which will be presented to users.  These choices should be "
 "separated by commas."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1033
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:1172

 msgid "Default"
 msgstr ""
 
 msgid "Default"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1035
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1174

 msgid ""
 "This field is optional.  It contains the default answer for string, select "
 "and multiselect templates.  For multiselect templates, it may contain a "
 "comma-separated list of choices."
 msgstr ""
 
 msgid ""
 "This field is optional.  It contains the default answer for string, select "
 "and multiselect templates.  For multiselect templates, it may contain a "
 "comma-separated list of choices."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1044
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:1183

 msgid "Templates fields specific style guide"
 msgstr ""
 
 msgid "Templates fields specific style guide"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1046
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:1185

 msgid "Type field"
 msgstr ""
 
 msgid "Type field"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1048
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1187

 msgid ""
 "No specific indication except: use the appropriate type by referring to the "
 "previous section."
 msgstr ""
 
 msgid ""
 "No specific indication except: use the appropriate type by referring to the "
 "previous section."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1054
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:1193

 msgid "Description field"
 msgstr ""
 
 msgid "Description field"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1056
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1195

 msgid ""
 "Below are specific instructions for properly writing the Description (short "
 "and extended) depending on the template type."
 msgstr ""
 
 msgid ""
 "Below are specific instructions for properly writing the Description (short "
 "and extended) depending on the template type."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1060
+#. type: Content of: <chapter><section><section><section><section><title>
+#: best-pkging-practices.dbk:1199

 msgid "String/password templates"
 msgstr ""
 
 msgid "String/password templates"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1064
+#. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1203

 msgid ""
 "The short description is a prompt and <emphasis "
 "role=\"strong\">not</emphasis> a title.  Avoid question style prompts (IP "
 msgid ""
 "The short description is a prompt and <emphasis "
 "role=\"strong\">not</emphasis> a title.  Avoid question style prompts (IP "


@@ -1584,8 +1738,8 @@ msgid ""
 "recommended."
 msgstr ""
 
 "recommended."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1071
+#. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1210

 msgid ""
 "The extended description is a complement to the short description.  In the "
 "extended part, explain what is being asked, rather than ask the same "
 msgid ""
 "The extended description is a complement to the short description.  In the "
 "extended part, explain what is being asked, rather than ask the same "


@@ -1593,13 +1747,13 @@ msgid ""
 "style is strongly discouraged."
 msgstr ""
 
 "style is strongly discouraged."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1081
+#. type: Content of: <chapter><section><section><section><section><title>
+#: best-pkging-practices.dbk:1220

 msgid "Boolean templates"
 msgstr ""
 
 msgid "Boolean templates"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1085
+#. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1224

 msgid ""
 "The short description should be phrased in the form of a question which "
 "should be kept short and should generally end with a question mark.  Terse "
 msgid ""
 "The short description should be phrased in the form of a question which "
 "should be kept short and should generally end with a question mark.  Terse "


@@ -1607,20 +1761,20 @@ msgid ""
 "long (remember that translations are often longer than original versions)"
 msgstr ""
 
 "long (remember that translations are often longer than original versions)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1093
+#. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1232

 msgid ""
 "Again, please avoid referring to specific interface widgets.  A common "
 "mistake for such templates is if you answer Yes-type constructions."
 msgstr ""
 
 msgid ""
 "Again, please avoid referring to specific interface widgets.  A common "
 "mistake for such templates is if you answer Yes-type constructions."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1101
+#. type: Content of: <chapter><section><section><section><section><title>
+#: best-pkging-practices.dbk:1240

 msgid "Select/Multiselect"
 msgstr ""
 
 msgid "Select/Multiselect"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1105
+#. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1244

 msgid ""
 "The short description is a prompt and <emphasis "
 "role=\"strong\">not</emphasis> a title.  Do <emphasis "
 msgid ""
 "The short description is a prompt and <emphasis "
 "role=\"strong\">not</emphasis> a title.  Do <emphasis "


@@ -1628,8 +1782,8 @@ msgid ""
 "Users are clever enough to figure out they have to choose something...:)"
 msgstr ""
 
 "Users are clever enough to figure out they have to choose something...:)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1113
+#. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1252

 msgid ""
 "The extended description will complete the short description.  It may refer "
 "to the available choices.  It may also mention that the user may choose more "
 msgid ""
 "The extended description will complete the short description.  It may refer "
 "to the available choices.  It may also mention that the user may choose more "


@@ -1637,25 +1791,25 @@ msgid ""
 "(although the interface often makes this clear)."
 msgstr ""
 
 "(although the interface often makes this clear)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><title>
-#: best-pkging-practices.dbk:1123
+#. type: Content of: <chapter><section><section><section><section><title>
+#: best-pkging-practices.dbk:1262

 msgid "Notes"
 msgstr ""
 
 msgid "Notes"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1127
+#. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1266

 msgid "The short description should be considered to be a *title*."
 msgstr ""
 
 msgid "The short description should be considered to be a *title*."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1132
+#. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1271

 msgid ""
 "The extended description is what will be displayed as a more detailed "
 "explanation of the note.  Phrases, no terse writing style."
 msgstr ""
 
 msgid ""
 "The extended description is what will be displayed as a more detailed "
 "explanation of the note.  Phrases, no terse writing style."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1138
+#. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1277

 msgid ""
 "<emphasis role=\"strong\">Do not abuse debconf.</emphasis> Notes are the "
 "most common way to abuse debconf.  As written in debconf-devel manual page: "
 msgid ""
 "<emphasis role=\"strong\">Do not abuse debconf.</emphasis> Notes are the "
 "most common way to abuse debconf.  As written in debconf-devel manual page: "


@@ -1666,51 +1820,50 @@ msgid ""
 "existing translations for the future."
 msgstr ""
 
 "existing translations for the future."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1153
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:1292

 msgid "Choices field"
 msgstr ""
 
 msgid "Choices field"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1155
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1294

 msgid ""
 "If the Choices are likely to change often, please consider using the "
 "__Choices trick.  This will split each individual choice into a single "
 "string, which will considerably help translators for doing their work."
 msgstr ""
 
 msgid ""
 "If the Choices are likely to change often, please consider using the "
 "__Choices trick.  This will split each individual choice into a single "
 "string, which will considerably help translators for doing their work."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1162 best-pkging-practices.dbk:1200
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:1301 best-pkging-practices.dbk:1339

 msgid "Default field"
 msgstr ""
 
 msgid "Default field"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1164
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1303

 msgid ""
 "If the default value, for a select template, is likely to vary depending on "
 "the user language (for instance, if the choice is a language choice), please "
 "use the _DefaultChoice trick."
 msgstr ""
 
 msgid ""
 "If the default value, for a select template, is likely to vary depending on "
 "the user language (for instance, if the choice is a language choice), please "
 "use the _DefaultChoice trick."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1169
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1308

 msgid ""
 "This special field allow translators to put the most appropriate choice "
 "according to their own language.  It will become the default choice when "
 "their language is used while your own mentioned Default Choice will be used "
 msgid ""
 "This special field allow translators to put the most appropriate choice "
 "according to their own language.  It will become the default choice when "
 "their language is used while your own mentioned Default Choice will be used "

-"chan using English."
+"when using English."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1175
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1314

 msgid "Example, taken from the geneweb package templates:"
 msgstr ""
 
 msgid "Example, taken from the geneweb package templates:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><screen>
-#: best-pkging-practices.dbk:1177
+#. type: Content of: <chapter><section><section><section><screen>
+#: best-pkging-practices.dbk:1317

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"\n"

 "Template: geneweb/lang\n"
 "Type: select\n"
 "__Choices: Afrikaans (af), Bulgarian (bg), Catalan (ca), Chinese (zh), Czech "
 "Template: geneweb/lang\n"
 "Type: select\n"
 "__Choices: Afrikaans (af), Bulgarian (bg), Catalan (ca), Chinese (zh), Czech "


@@ -1726,38 +1879,38 @@ msgid ""
 "_Description: Geneweb default language:\n"
 msgstr ""
 
 "_Description: Geneweb default language:\n"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1189
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1328

 msgid ""
 "Note the use of brackets which allow internal comments in debconf fields.  "
 "Also note the use of comments which will show up in files the translators "
 "will work with."
 msgstr ""
 
 msgid ""
 "Note the use of brackets which allow internal comments in debconf fields.  "
 "Also note the use of comments which will show up in files the translators "
 "will work with."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1194
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1333

 msgid ""
 "The comments are needed as the DefaultChoice trick is a bit confusing: the "
 "translators may put their own choice"
 msgstr ""
 
 msgid ""
 "The comments are needed as the DefaultChoice trick is a bit confusing: the "
 "translators may put their own choice"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1202
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1341

 msgid ""
 "Do NOT use empty default field.  If you don't want to use default values, do "
 "not use Default at all."
 msgstr ""
 
 msgid ""
 "Do NOT use empty default field.  If you don't want to use default values, do "
 "not use Default at all."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1206
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1345

 msgid ""
 "If you use po-debconf (and you <emphasis role=\"strong\">should</emphasis>, "
 "see 2.2), consider making this field translatable, if you think it may be "
 "translated."
 msgstr ""
 
 msgid ""
 "If you use po-debconf (and you <emphasis role=\"strong\">should</emphasis>, "
 "see 2.2), consider making this field translatable, if you think it may be "
 "translated."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1211
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1350

 msgid ""
 "If the default value may vary depending on language/country (for instance "
 "the default value for a language choice), consider using the special "
 msgid ""
 "If the default value may vary depending on language/country (for instance "
 "the default value for a language choice), consider using the special "


@@ -1766,18 +1919,18 @@ msgid ""
 "</citerefentry>)."
 msgstr ""
 
 "</citerefentry>)."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: best-pkging-practices.dbk:1223
+#. type: Content of: <chapter><section><title>
+#: best-pkging-practices.dbk:1362

 msgid "Internationalization"
 msgstr ""
 
 msgid "Internationalization"
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1225
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:1364

 msgid "Handling debconf translations"
 msgstr ""
 
 msgid "Handling debconf translations"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1227
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1366

 msgid ""
 "Like porters, translators have a difficult task.  They work on many packages "
 "and must collaborate with many different maintainers.  Moreover, most of the "
 msgid ""
 "Like porters, translators have a difficult task.  They work on many packages "
 "and must collaborate with many different maintainers.  Moreover, most of the "


@@ -1785,8 +1938,8 @@ msgid ""
 "particularly patient with them."
 msgstr ""
 
 "particularly patient with them."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1233
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1372

 msgid ""
 "The goal of <systemitem role=\"package\">debconf</systemitem> was to make "
 "packages configuration easier for maintainers and for users.  Originally, "
 msgid ""
 "The goal of <systemitem role=\"package\">debconf</systemitem> was to make "
 "packages configuration easier for maintainers and for users.  Originally, "


@@ -1799,8 +1952,8 @@ msgid ""
 "provided."
 msgstr ""
 
 "provided."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1243
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1382

 msgid ""
 "Using <systemitem role=\"package\">po-debconf</systemitem>, the translation "
 "is stored in <filename>po</filename> files (drawing from "
 msgid ""
 "Using <systemitem role=\"package\">po-debconf</systemitem>, the translation "
 "is stored in <filename>po</filename> files (drawing from "


@@ -1816,21 +1969,21 @@ msgid ""
 "</citerefentry> manual page for details."
 msgstr ""
 
 "</citerefentry> manual page for details."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1259
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:1398

 msgid "Internationalized documentation"
 msgstr ""
 
 msgid "Internationalized documentation"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1261
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1400

 msgid ""
 "Internationalizing documentation is crucial for users, but a lot of labor.  "
 "There's no way to eliminate all that work, but you can make things easier "
 "for translators."
 msgstr ""
 
 msgid ""
 "Internationalizing documentation is crucial for users, but a lot of labor.  "
 "There's no way to eliminate all that work, but you can make things easier "
 "for translators."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1266
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1405

 msgid ""
 "If you maintain documentation of any size, its easier for translators if "
 "they have access to a source control system.  That lets translators see the "
 msgid ""
 "If you maintain documentation of any size, its easier for translators if "
 "they have access to a source control system.  That lets translators see the "


@@ -1846,8 +1999,8 @@ msgid ""
 "might wish to adapt and provide that in your CVS area."
 msgstr ""
 
 "might wish to adapt and provide that in your CVS area."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1280
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1419

 msgid ""
 "If you maintain XML or SGML documentation, we suggest that you isolate any "
 "language-independent information and define those as entities in a separate "
 msgid ""
 "If you maintain XML or SGML documentation, we suggest that you isolate any "
 "language-independent information and define those as entities in a separate "


@@ -1855,18 +2008,18 @@ msgid ""
 "much easier, for instance, to keep URLs up to date across multiple files."
 msgstr ""
 
 "much easier, for instance, to keep URLs up to date across multiple files."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: best-pkging-practices.dbk:1290
+#. type: Content of: <chapter><section><title>
+#: best-pkging-practices.dbk:1429

 msgid "Common packaging situations"
 msgstr ""
 
 msgid "Common packaging situations"
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1301
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:1440

 msgid "Packages using <command>autoconf</command>/<command>automake</command>"
 msgstr ""
 
 msgid "Packages using <command>autoconf</command>/<command>automake</command>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1303
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1442

 msgid ""
 "Keeping <command>autoconf</command>'s <filename>config.sub</filename> and "
 "<filename>config.guess</filename> files up to date is critical for porters, "
 msgid ""
 "Keeping <command>autoconf</command>'s <filename>config.sub</filename> and "
 "<filename>config.guess</filename> files up to date is critical for porters, "


@@ -1878,13 +2031,13 @@ msgid ""
 "recommendations."
 msgstr ""
 
 "recommendations."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1315
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:1454

 msgid "Libraries"
 msgstr ""
 
 msgid "Libraries"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1317
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1456

 msgid ""
 "Libraries are always difficult to package for various reasons.  The policy "
 "imposes many constraints to ease their maintenance and to make sure upgrades "
 msgid ""
 "Libraries are always difficult to package for various reasons.  The policy "
 "imposes many constraints to ease their maintenance and to make sure upgrades "


@@ -1892,35 +2045,35 @@ msgid ""
 "in a library can result in dozens of dependent packages breaking."
 msgstr ""
 
 "in a library can result in dozens of dependent packages breaking."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1323
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1462

 msgid ""
 "Good practices for library packaging have been grouped in <ulink "
 "url=\"&url-libpkg-guide;\">the library packaging guide</ulink>."
 msgstr ""
 
 msgid ""
 "Good practices for library packaging have been grouped in <ulink "
 "url=\"&url-libpkg-guide;\">the library packaging guide</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1330
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:1469

 msgid "Documentation"
 msgstr ""
 
 msgid "Documentation"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1332
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1471

 msgid ""
 "Be sure to follow the <ulink url=\"&url-debian-policy;ch-docs.html\">Policy "
 "on documentation</ulink>."
 msgstr ""
 
 msgid ""
 "Be sure to follow the <ulink url=\"&url-debian-policy;ch-docs.html\">Policy "
 "on documentation</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1337
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1476

 msgid ""
 "If your package contains documentation built from XML or SGML, we recommend "
 "you not ship the XML or SGML source in the binary package(s).  If users want "
 "the source of the documentation, they should retrieve the source package."
 msgstr ""
 
 msgid ""
 "If your package contains documentation built from XML or SGML, we recommend "
 "you not ship the XML or SGML source in the binary package(s).  If users want "
 "the source of the documentation, they should retrieve the source package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1342
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1481

 msgid ""
 "Policy specifies that documentation should be shipped in HTML format.  We "
 "also recommend shipping documentation in PDF and plain text format if "
 msgid ""
 "Policy specifies that documentation should be shipped in HTML format.  We "
 "also recommend shipping documentation in PDF and plain text format if "


@@ -1929,8 +2082,8 @@ msgid ""
 "source format is HTML."
 msgstr ""
 
 "source format is HTML."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1349
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1488

 msgid ""
 "Major shipped manuals should register themselves with <systemitem "
 "role=\"package\">doc-base</systemitem> on installation.  See the <systemitem "
 msgid ""
 "Major shipped manuals should register themselves with <systemitem "
 "role=\"package\">doc-base</systemitem> on installation.  See the <systemitem "


@@ -1938,20 +2091,40 @@ msgid ""
 "information."
 msgstr ""
 
 "information."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1357
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1494
+msgid ""
+"Debian policy (section 12.1) directs that manual pages should accompany "
+"every program, utility, and function, and suggests them for other objects "
+"like configuration files. If the work you are packaging does not have such "
+"manual pages, consider writing them for inclusion in your package, and "
+"submitting them upstream."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1501
+msgid ""
+"The manpages do not need to be written directly in the troff format.  "
+"Popular source formats are Docbook, POD and reST, which can be converted "
+"using <command>xsltproc</command>, <command>pod2man</command> and "
+"<command>rst2man</command> respectively. To a lesser extent, the <command> "
+"help2man</command>program can also be used to write a stub."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:1510

 msgid "Specific types of packages"
 msgstr ""
 
 msgid "Specific types of packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1359
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1512

 msgid ""
 "Several specific types of packages have special sub-policies and "
 "corresponding packaging rules and practices:"
 msgstr ""
 
 msgid ""
 "Several specific types of packages have special sub-policies and "
 "corresponding packaging rules and practices:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1365
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1518

 msgid ""
 "Perl related packages have a <ulink url=\"&url-perl-policy;\">Perl "
 "policy</ulink>, some examples of packages following that policy are "
 msgid ""
 "Perl related packages have a <ulink url=\"&url-perl-policy;\">Perl "
 "policy</ulink>, some examples of packages following that policy are "


@@ -1960,29 +2133,29 @@ msgid ""
 "independent perl module)."
 msgstr ""
 
 "independent perl module)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1374
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1527

 msgid ""
 "Python related packages have their python policy; see &file-python-policy; "
 "in the <systemitem role=\"package\">python</systemitem> package."
 msgstr ""
 
 msgid ""
 "Python related packages have their python policy; see &file-python-policy; "
 "in the <systemitem role=\"package\">python</systemitem> package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1381
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1534

 msgid ""
 "Emacs related packages have the <ulink url=\"&url-emacs-policy;\">emacs "
 "policy</ulink>."
 msgstr ""
 
 msgid ""
 "Emacs related packages have the <ulink url=\"&url-emacs-policy;\">emacs "
 "policy</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1388
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1541

 msgid ""
 "Java related packages have their <ulink url=\"&url-java-policy;\">java "
 "policy</ulink>."
 msgstr ""
 
 msgid ""
 "Java related packages have their <ulink url=\"&url-java-policy;\">java "
 "policy</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1395
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1548

 msgid ""
 "Ocaml related packages have their own policy, found in &file-ocaml-policy; "
 "from the <systemitem role=\"package\">ocaml</systemitem> package.  A good "
 msgid ""
 "Ocaml related packages have their own policy, found in &file-ocaml-policy; "
 "from the <systemitem role=\"package\">ocaml</systemitem> package.  A good "


@@ -1990,29 +2163,29 @@ msgid ""
 "package."
 msgstr ""
 
 "package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1403
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1556

 msgid ""
 "Packages providing XML or SGML DTDs should conform to the recommendations "
 "found in the <systemitem role=\"package\">sgml-base-doc</systemitem> "
 "package."
 msgstr ""
 
 msgid ""
 "Packages providing XML or SGML DTDs should conform to the recommendations "
 "found in the <systemitem role=\"package\">sgml-base-doc</systemitem> "
 "package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: best-pkging-practices.dbk:1409
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: best-pkging-practices.dbk:1562

 msgid ""
 "Lisp packages should register themselves with <systemitem "
 "role=\"package\">common-lisp-controller</systemitem>, about which see "
 "&file-lisp-controller;."
 msgstr ""
 
 msgid ""
 "Lisp packages should register themselves with <systemitem "
 "role=\"package\">common-lisp-controller</systemitem>, about which see "
 "&file-lisp-controller;."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1439
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:1592

 msgid "Architecture-independent data"
 msgstr ""
 
 msgid "Architecture-independent data"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1441
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1594

 msgid ""
 "It is not uncommon to have a large amount of architecture-independent data "
 "packaged with a program.  For example, audio files, a collection of icons, "
 msgid ""
 "It is not uncommon to have a large amount of architecture-independent data "
 "packaged with a program.  For example, audio files, a collection of icons, "


@@ -2021,8 +2194,8 @@ msgid ""
 "best to keep it all in a single package."
 msgstr ""
 
 "best to keep it all in a single package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1448
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1601

 msgid ""
 "However, if the size of the data is considerable, consider splitting it out "
 "into a separate, architecture-independent package (_all.deb).  By doing "
 msgid ""
 "However, if the size of the data is considerable, consider splitting it out "
 "into a separate, architecture-independent package (_all.deb).  By doing "


@@ -2034,20 +2207,20 @@ msgid ""
 "linkend=\"tools-lint\"/> ) when run over the entire Debian archive."
 msgstr ""
 
 "linkend=\"tools-lint\"/> ) when run over the entire Debian archive."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1460
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:1613

 msgid "Needing a certain locale during build"
 msgstr ""
 
 msgid "Needing a certain locale during build"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1462
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1615

 msgid ""
 "If you need a certain locale during build, you can create a temporary file "
 "via this trick:"
 msgstr ""
 
 msgid ""
 "If you need a certain locale during build, you can create a temporary file "
 "via this trick:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1466
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1619

 msgid ""
 "If you set <varname>LOCPATH</varname> to the equivalent of "
 "<filename>/usr/lib/locale</filename>, and <varname>LC_ALL</varname> to the "
 msgid ""
 "If you set <varname>LOCPATH</varname> to the equivalent of "
 "<filename>/usr/lib/locale</filename>, and <varname>LC_ALL</varname> to the "


@@ -2055,11 +2228,10 @@ msgid ""
 "root.  Something like this:"
 msgstr ""
 
 "root.  Something like this:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:1470
+#. type: Content of: <chapter><section><section><screen>
+#: best-pkging-practices.dbk:1624

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"\n"

 "LOCALE_PATH=debian/tmpdir/usr/lib/locale\n"
 "LOCALE_NAME=en_IN\n"
 "LOCALE_CHARSET=UTF-8\n"
 "LOCALE_PATH=debian/tmpdir/usr/lib/locale\n"
 "LOCALE_NAME=en_IN\n"
 "LOCALE_CHARSET=UTF-8\n"


@@ -2072,13 +2244,13 @@ msgid ""
 "LOCPATH=$LOCALE_PATH LC_ALL=$LOCALE_NAME.$LOCALE_CHARSET date\n"
 msgstr ""
 
 "LOCPATH=$LOCALE_PATH LC_ALL=$LOCALE_NAME.$LOCALE_CHARSET date\n"
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1484
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:1637

 msgid "Make transition packages deborphan compliant"
 msgstr ""
 
 msgid "Make transition packages deborphan compliant"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1486
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1639

 msgid ""
 "Deborphan is a program for helping users to detect which packages can safely "
 "be removed from the system, i.e.  the ones that have no packages depending "
 msgid ""
 "Deborphan is a program for helping users to detect which packages can safely "
 "be removed from the system, i.e.  the ones that have no packages depending "


@@ -2087,8 +2259,8 @@ msgid ""
 "argument, it tries to catch other useless packages."
 msgstr ""
 
 "argument, it tries to catch other useless packages."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1493
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1646

 msgid ""
 "For example, with <literal>--guess-dummy</literal>, "
 "<command>deborphan</command> tries to search all transitional packages which "
 msgid ""
 "For example, with <literal>--guess-dummy</literal>, "
 "<command>deborphan</command> tries to search all transitional packages which "


@@ -2096,8 +2268,8 @@ msgid ""
 "looks for the string dummy or transitional in their short description."
 msgstr ""
 
 "looks for the string dummy or transitional in their short description."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1500
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1653

 msgid ""
 "So, when you are creating such a package, please make sure to add this text "
 "to your short description.  If you are looking for examples, just run: "
 msgid ""
 "So, when you are creating such a package, please make sure to add this text "
 "to your short description.  If you are looking for examples, just run: "


@@ -2105,33 +2277,25 @@ msgid ""
 "search .|grep transitional</command>."
 msgstr ""
 
 "search .|grep transitional</command>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1508
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:1661

 msgid "Best practices for <filename>orig.tar.gz</filename> files"
 msgstr ""
 
 msgid "Best practices for <filename>orig.tar.gz</filename> files"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1510
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1663

 msgid ""
 "There are two kinds of original source tarballs: Pristine source and "
 "repackaged upstream source."
 msgstr ""
 
 msgid ""
 "There are two kinds of original source tarballs: Pristine source and "
 "repackaged upstream source."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1514
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:1667

 msgid "Pristine source"
 msgstr ""
 
 msgid "Pristine source"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para><footnote>
-#: best-pkging-practices.dbk:1516
-msgid ""
-"The defining characteristic of a pristine source tarball is that the "
-"<literal>.orig.tar.gz</literal> file is byte-for-byte identical to a tarball "
-"officially distributed by the upstream author.  <footnote>"
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para><footnote><para>
-#: best-pkging-practices.dbk:1518
+#. type: Content of: <chapter><section><section><section><para><footnote><para>
+#: best-pkging-practices.dbk:1671

 msgid ""
 "We cannot prevent upstream authors from changing the tarball they distribute "
 "without also incrementing the version number, so there can be no guarantee "
 msgid ""
 "We cannot prevent upstream authors from changing the tarball they distribute "
 "without also incrementing the version number, so there can be no guarantee "


@@ -2139,25 +2303,28 @@ msgid ""
 "<emphasis>currently</emphasis> distributing at any point in time.  All that "
 "can be expected is that it is identical to something that upstream once "
 "<emphasis>did</emphasis> distribute.  If a difference arises later (say, if "
 "<emphasis>currently</emphasis> distributing at any point in time.  All that "
 "can be expected is that it is identical to something that upstream once "
 "<emphasis>did</emphasis> distribute.  If a difference arises later (say, if "

-"upstream notices that he wasn't using maximal comression in his original "
+"upstream notices that he wasn't using maximal compression in his original "

 "distribution and then re-<command>gzip</command>s it), that's just too bad.  "
 "distribution and then re-<command>gzip</command>s it), that's just too bad.  "

-"Since there is no good way to upload a new <literal>.orig.tar.gz</literal> "
-"for the same version, there is not even any point in treating this situation "
-"as a bug."
+"Since there is no good way to upload a new "
+"<literal>.orig.tar.{gz,bz2}</literal> for the same version, there is not "
+"even any point in treating this situation as a bug."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1528
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1669

 msgid ""
 msgid ""

-"</footnote> This makes it possible to use checksums to easily verify that "
-"all changes between Debian's version and upstream's are contained in the "
-"Debian diff.  Also, if the original source is huge, upstream authors and "
-"others who already have the upstream tarball can save download time if they "
-"want to inspect your packaging in detail."
+"The defining characteristic of a pristine source tarball is that the "
+"<literal>.orig.tar.{gz,bz2}</literal> file is byte-for-byte identical to a "
+"tarball officially distributed by the upstream author.  <placeholder "
+"type=\"footnote\" id=\"0\"/> This makes it possible to use checksums to "
+"easily verify that all changes between Debian's version and upstream's are "
+"contained in the Debian diff.  Also, if the original source is huge, "
+"upstream authors and others who already have the upstream tarball can save "
+"download time if they want to inspect your packaging in detail."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1536
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1689

 msgid ""
 "There is no universally accepted guidelines that upstream authors follow "
 "regarding to the directory structure inside their tarball, but "
 msgid ""
 "There is no universally accepted guidelines that upstream authors follow "
 "regarding to the directory structure inside their tarball, but "


@@ -2166,22 +2333,21 @@ msgid ""
 "following:"
 msgstr ""
 
 "following:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1544
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:1697

 msgid "It unpacks the tarball in an empty temporary directory by doing"
 msgstr ""
 
 msgid "It unpacks the tarball in an empty temporary directory by doing"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: best-pkging-practices.dbk:1546
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
+#: best-pkging-practices.dbk:1700

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"\n"

 "zcat path/to/&lt;packagename&gt;_&lt;upstream-version&gt;.orig.tar.gz | tar "
 "xf -\n"
 msgstr ""
 
 "zcat path/to/&lt;packagename&gt;_&lt;upstream-version&gt;.orig.tar.gz | tar "
 "xf -\n"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1552
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:1705

 msgid ""
 "If, after this, the temporary directory contains nothing but one directory "
 "and no other files, <command>dpkg-source</command> renames that directory to "
 msgid ""
 "If, after this, the temporary directory contains nothing but one directory "
 "and no other files, <command>dpkg-source</command> renames that directory to "


@@ -2190,8 +2356,8 @@ msgid ""
 "forgotten."
 msgstr ""
 
 "forgotten."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1561
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:1714

 msgid ""
 "Otherwise, the upstream tarball must have been packaged without a common "
 "top-level directory (shame on the upstream author!).  In this case, "
 msgid ""
 "Otherwise, the upstream tarball must have been packaged without a common "
 "top-level directory (shame on the upstream author!).  In this case, "


@@ -2200,13 +2366,13 @@ msgid ""
 "<literal>&lt;packagename&gt;-&lt;upstream-version&gt;(.orig)</literal>."
 msgstr ""
 
 "<literal>&lt;packagename&gt;-&lt;upstream-version&gt;(.orig)</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1572
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:1725

 msgid "Repackaged upstream source"
 msgstr ""
 
 msgid "Repackaged upstream source"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1574
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1727

 msgid ""
 "You <emphasis role=\"strong\">should</emphasis> upload packages with a "
 "pristine source tarball if possible, but there are various reasons why it "
 msgid ""
 "You <emphasis role=\"strong\">should</emphasis> upload packages with a "
 "pristine source tarball if possible, but there are various reasons why it "


@@ -2215,20 +2381,21 @@ msgid ""
 "non-DFSG-free material that you must remove before uploading."
 msgstr ""
 
 "non-DFSG-free material that you must remove before uploading."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1581
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1734

 msgid ""
 msgid ""

-"In these cases the developer must construct a suitable <literal>.orig.tar.gz "
-"</literal> file himself.  We refer to such a tarball as a repackaged "
-"upstream source.  Note that a repackaged upstream source is different from a "
-"Debian-native package.  A repackaged source still comes with Debian-specific "
-"changes in a separate <literal>.diff.gz</literal> and still has a version "
-"number composed of <literal>&lt;upstream-version&gt;</literal> and "
+"In these cases the developer must construct a suitable "
+"<literal>.orig.tar.{gz,bz2} </literal> file himself.  We refer to such a "
+"tarball as a repackaged upstream source.  Note that a repackaged upstream "
+"source is different from a Debian-native package.  A repackaged source still "
+"comes with Debian-specific changes in a separate <literal>.diff.gz</literal> "
+"or <literal>.debian.tar.{gz,bz2}</literal> and still has a version number "
+"composed of <literal>&lt;upstream-version&gt;</literal> and "

 "<literal>&lt;debian-revision&gt;</literal>."
 msgstr ""
 
 "<literal>&lt;debian-revision&gt;</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1590
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1743

 msgid ""
 "There may be cases where it is desirable to repackage the source even though "
 "upstream distributes a <literal>.tar.gz</literal> that could in principle be "
 msgid ""
 "There may be cases where it is desirable to repackage the source even though "
 "upstream distributes a <literal>.tar.gz</literal> that could in principle be "


@@ -2239,52 +2406,45 @@ msgid ""
 "defend your decision if you repackage source that could have been pristine."
 msgstr ""
 
 "defend your decision if you repackage source that could have been pristine."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1599
-msgid "A repackaged <literal>.orig.tar.gz</literal>"
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1752
+msgid "A repackaged <literal>.orig.tar.{gz,bz2}</literal>"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1604
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:1757

 msgid ""
 msgid ""

-"<emphasis role=\"strong\">must</emphasis> contain detailed information how "
-"the repackaged source was obtained, and how this can be reproduced in the "
-"<filename>debian/copyright</filename>.  It is also a good idea to provide a "
-"<literal>get-orig-source</literal> target in your "
+"should be documented in the resulting source package.  Detailed information "
+"on how the repackaged source was obtained, and on how this can be reproduced "
+"should be provided in <filename>debian/copyright</filename>.  It is also a "
+"good idea to provide a <literal>get-orig-source</literal> target in your "

 "<filename>debian/rules</filename> file that repeats the process, as "
 "described in the Policy Manual, <ulink "
 "url=\"&url-debian-policy;ch-source.html#s-debianrules\">Main building "
 "script: debian/rules</ulink>."
 msgstr ""
 
 "<filename>debian/rules</filename> file that repeats the process, as "
 "described in the Policy Manual, <ulink "
 "url=\"&url-debian-policy;ch-source.html#s-debianrules\">Main building "
 "script: debian/rules</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para><footnote>
-#: best-pkging-practices.dbk:1616
-msgid ""
-"<emphasis role=\"strong\">should not</emphasis> contain any file that does "
-"not come from the upstream author(s), or whose contents has been changed by "
-"you.  <footnote>"
-msgstr ""
-
-#.  or similarly named 
-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para><footnote><para>
-#: best-pkging-practices.dbk:1618
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para><footnote><para>
+#: best-pkging-practices.dbk:1772

 msgid ""
 "As a special exception, if the omission of non-free files would lead to the "
 "source failing to build without assistance from the Debian diff, it might be "
 "appropriate to instead edit the files, omitting only the non-free parts of "
 msgid ""
 "As a special exception, if the omission of non-free files would lead to the "
 "source failing to build without assistance from the Debian diff, it might be "
 "appropriate to instead edit the files, omitting only the non-free parts of "

-"them, and/or explain the situation in a README.Debian-source file in the "
-"root of the source tree.  But in that case please also urge the upstream "
-"author to make the non-free components easier seperable from the rest of the "
-"source."
+"them, and/or explain the situation in a README.source file in the root of "
+"the source tree.  But in that case please also urge the upstream author to "
+"make the non-free components easier seperable from the rest of the source."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1625
-msgid "</footnote>"
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:1770
+msgid ""
+"<emphasis role=\"strong\">should not</emphasis> contain any file that does "
+"not come from the upstream author(s), or whose contents has been changed by "
+"you.  <placeholder type=\"footnote\" id=\"0\"/>"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1630
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:1783

 msgid ""
 "<emphasis role=\"strong\">should</emphasis>, except where impossible for "
 "legal reasons, preserve the entire building and portablility infrastructure "
 msgid ""
 "<emphasis role=\"strong\">should</emphasis>, except where impossible for "
 "legal reasons, preserve the entire building and portablility infrastructure "


@@ -2295,8 +2455,8 @@ msgid ""
 "by running a configure script."
 msgstr ""
 
 "by running a configure script."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1639
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:1792

 msgid ""
 "(<emphasis>Rationale:</emphasis> It is common for Debian users who need to "
 "build software for non-Debian platforms to fetch the source from a Debian "
 msgid ""
 "(<emphasis>Rationale:</emphasis> It is common for Debian users who need to "
 "build software for non-Debian platforms to fetch the source from a Debian "


@@ -2304,8 +2464,8 @@ msgid ""
 "point)."
 msgstr ""
 
 "point)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1646
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:1799

 msgid ""
 "<emphasis role=\"strong\">should</emphasis> use "
 "<literal>&lt;packagename&gt;-&lt;upstream-version&gt;.orig</literal> as the "
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> use "
 "<literal>&lt;packagename&gt;-&lt;upstream-version&gt;.orig</literal> as the "


@@ -2313,76 +2473,39 @@ msgid ""
 "distinguish pristine tarballs from repackaged ones."
 msgstr ""
 
 "distinguish pristine tarballs from repackaged ones."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: best-pkging-practices.dbk:1654
-msgid ""
-"<emphasis role=\"strong\">should</emphasis> be gzipped with maximal "
-"compression."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1659
+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:1807

 msgid ""
 msgid ""

-"The canonical way to meet the latter two points is to let "
-"<literal>dpkg-source -b</literal> construct the repackaged tarball from an "
-"unpacked directory."
+"<emphasis role=\"strong\">should</emphasis> be gzipped or bzipped with "
+"maximal compression."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: best-pkging-practices.dbk:1665
-msgid "Changing binary files in <literal>diff.gz</literal>"
+#. type: Content of: <chapter><section><section><section><title>
+#: best-pkging-practices.dbk:1814
+msgid "Changing binary files"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para><footnote>
-#: best-pkging-practices.dbk:1667
+#. type: Content of: <chapter><section><section><section><para>
+#: best-pkging-practices.dbk:1816

 msgid ""
 "Sometimes it is necessary to change binary files contained in the original "
 msgid ""
 "Sometimes it is necessary to change binary files contained in the original "

-"tarball, or to add binary files that are not in it.  If this is done by "
-"simply copying the files into the debianized source tree, "
-"<command>dpkg-source</command> will not be able to handle this.  On the "
-"other hand, according to the guidelines given above, you cannot include such "
-"a changed binary file in a repackaged <filename>orig.tar.gz</filename>.  "
-"Instead, include the file in the <filename>debian</filename> directory in "
-"<command>uuencode</command>d (or similar) form <footnote>"
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para><footnote><para>
-#: best-pkging-practices.dbk:1674
-msgid ""
-"The file should have a name that makes it clear which binary file it "
-"encodes.  Usually, some postfix indicating the encoding should be appended "
-"to the original filename.  Note that you don't need to depend on <systemitem "
-"role=\"package\">sharutils</systemitem> to get the "
-"<command>uudecode</command> program if you use <command>perl</command>'s "
-"<literal>pack</literal> function.  The code could look like"
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1682
-msgid ""
-"&example-uu; </footnote>.  The file would then be decoded and copied to its "
-"place during the build process.  Thus the change will be visible quite easy."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para>
-#: best-pkging-practices.dbk:1688
-msgid ""
-"Some packages use <command>dbs</command> to manage patches to their upstream "
-"source, and always create a new <literal>orig.tar.gz</literal> file that "
-"contains the real <literal>orig.tar.gz</literal> in its toplevel directory.  "
-"This is questionable with respect to the preference for pristine source.  On "
-"the other hand, it is easy to modify or add binary files in this case: Just "
-"put them into the newly created <literal>orig.tar.gz</literal> file, besides "
-"the real one, and copy them to the right place during the build process."
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#: best-pkging-practices.dbk:1701
+"tarball, or to add binary files that are not in it. This is fully supported "
+"when using source packages in “3.0 (quilt)” format, see the "
+"<citerefentry><refentrytitle>dpkg-source</refentrytitle><manvolnum>1</manvolnum></citerefentry> "
+"manual page for details. When using the older format “1.0”, binary files "
+"can't be stored in the <filename>.diff.gz</filename> so you must store an "
+"<command>uuencode</command>d (or similar) version of the file(s)  and decode "
+"it at build time in <filename>debian/rules</filename> (and move it in its "
+"official location)."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:1831

 msgid "Best practices for debug packages"
 msgstr ""
 
 msgid "Best practices for debug packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1703
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1833

 msgid ""
 "A debug package is a package with a name ending in -dbg, that contains "
 "additional information that gdb can use.  Since Debian binaries are stripped "
 msgid ""
 "A debug package is a package with a name ending in -dbg, that contains "
 "additional information that gdb can use.  Since Debian binaries are stripped "


@@ -2392,8 +2515,8 @@ msgid ""
 "install it, without bloating a regular system with the information."
 msgstr ""
 
 "install it, without bloating a regular system with the information."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1711
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1841

 msgid ""
 "It is up to a package's maintainer whether to create a debug package or "
 "not.  Maintainers are encouraged to create debug packages for library "
 msgid ""
 "It is up to a package's maintainer whether to create a debug package or "
 "not.  Maintainers are encouraged to create debug packages for library "


@@ -2405,8 +2528,8 @@ msgid ""
 "apache and the X server are also good candidates for debug packages."
 msgstr ""
 
 "apache and the X server are also good candidates for debug packages."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1721
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1851

 msgid ""
 "Some debug packages may contain an entire special debugging build of a "
 "library or other binary, but most of them can save space and build time by "
 msgid ""
 "Some debug packages may contain an entire special debugging build of a "
 "library or other binary, but most of them can save space and build time by "


@@ -2421,8 +2544,8 @@ msgid ""
 "<filename>/usr/lib/debug/usr/lib/libfoo.so.1</filename>."
 msgstr ""
 
 "<filename>/usr/lib/debug/usr/lib/libfoo.so.1</filename>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1733
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1863

 msgid ""
 "The debugging symbols can be extracted from an object file using <command> "
 "objcopy --only-keep-debug</command>.  Then the object file can be stripped, "
 msgid ""
 "The debugging symbols can be extracted from an object file using <command> "
 "objcopy --only-keep-debug</command>.  Then the object file can be stripped, "


@@ -2432,8 +2555,8 @@ msgid ""
 "</citerefentry> explains in detail how this works."
 msgstr ""
 
 "</citerefentry> explains in detail how this works."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1741
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1871

 msgid ""
 "The <command>dh_strip</command> command in debhelper supports creating debug "
 "packages, and can take care of using <command>objcopy</command> to separate "
 msgid ""
 "The <command>dh_strip</command> command in debhelper supports creating debug "
 "packages, and can take care of using <command>objcopy</command> to separate "


@@ -2442,18 +2565,16 @@ msgid ""
 "add an entry to <filename>debian/control</filename> for the debug package."
 msgstr ""
 
 "add an entry to <filename>debian/control</filename> for the debug package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: best-pkging-practices.dbk:1748
+#. type: Content of: <chapter><section><section><para>
+#: best-pkging-practices.dbk:1878

 msgid ""
 msgid ""

-"Note that the Debian package should depend on the package that it provides "
+"Note that the debug package should depend on the package that it provides "

 "debugging symbols for, and this dependency should be versioned.  For "
 "example:"
 msgstr ""
 
 "debugging symbols for, and this dependency should be versioned.  For "
 "example:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: best-pkging-practices.dbk:1751
+#. type: Content of: <chapter><section><section><screen>
+#: best-pkging-practices.dbk:1882

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"Depends: libfoo-dbg (= ${binary:Version})\n"
+msgid "Depends: libfoo (= ${binary:Version})\n"

 msgstr ""
 msgstr ""

diff --git a/po4a/po/beyond-pkging.pot b/po4a/po/beyond-pkging.pot
index 34cfba59c12277a6080f8a74be080b0fa6bf1959..581438b9f7dff0b4111624bc8fa36e0138cb1eeb 100644 (file)
--- a/po4a/po/beyond-pkging.pot
+++ b/po4a/po/beyond-pkging.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"POT-Creation-Date: 2008-08-08 11:33-0300\n"
+"POT-Creation-Date: 2010-01-04 00:17+0100\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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -15,12 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING"
 
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING"
 

-# type: Content of: <chapter><title>
+#. type: Content of: <chapter><title>

 #: beyond-pkging.dbk:7
 msgid "Beyond Packaging"
 msgstr ""
 
 #: beyond-pkging.dbk:7
 msgid "Beyond Packaging"
 msgstr ""
 

-# type: Content of: <chapter><para>
+#. type: Content of: <chapter><para>

 #: beyond-pkging.dbk:9
 msgid ""
 "Debian is about a lot more than just packaging software and maintaining "
 #: beyond-pkging.dbk:9
 msgid ""
 "Debian is about a lot more than just packaging software and maintaining "


@@ -29,7 +29,7 @@ msgid ""
 "maintaining packages."
 msgstr ""
 
 "maintaining packages."
 msgstr ""
 

-# type: Content of: <chapter><para>
+#. type: Content of: <chapter><para>

 #: beyond-pkging.dbk:14
 msgid ""
 "As a volunteer organization, Debian relies on the discretion of its members "
 #: beyond-pkging.dbk:14
 msgid ""
 "As a volunteer organization, Debian relies on the discretion of its members "


@@ -37,12 +37,12 @@ msgid ""
 "thing to spend their time on."
 msgstr ""
 
 "thing to spend their time on."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
+#. type: Content of: <chapter><section><title>

 #: beyond-pkging.dbk:19
 msgid "Bug reporting"
 msgstr ""
 
 #: beyond-pkging.dbk:19
 msgid "Bug reporting"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:21
 msgid ""
 "We encourage you to file bugs as you find them in Debian packages.  In fact, "
 #: beyond-pkging.dbk:21
 msgid ""
 "We encourage you to file bugs as you find them in Debian packages.  In fact, "


@@ -50,7 +50,7 @@ msgid ""
 "bugs in other developers' packages improves the quality of Debian."
 msgstr ""
 
 "bugs in other developers' packages improves the quality of Debian."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:26
 msgid ""
 "Read the <ulink url=\"&url-bts-report;\">instructions for reporting "
 #: beyond-pkging.dbk:26
 msgid ""
 "Read the <ulink url=\"&url-bts-report;\">instructions for reporting "


@@ -58,7 +58,7 @@ msgid ""
 "system</ulink>."
 msgstr ""
 
 "system</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:31
 msgid ""
 "Try to submit the bug from a normal user account at which you are likely to "
 #: beyond-pkging.dbk:31
 msgid ""
 "Try to submit the bug from a normal user account at which you are likely to "


@@ -66,7 +66,7 @@ msgid ""
 "about the bug.  Do not submit bugs as root."
 msgstr ""
 
 "about the bug.  Do not submit bugs as root."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:36
 msgid ""
 "You can use a tool like <citerefentry> "
 #: beyond-pkging.dbk:36
 msgid ""
 "You can use a tool like <citerefentry> "


@@ -75,7 +75,7 @@ msgid ""
 "process."
 msgstr ""
 
 "process."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:41
 msgid ""
 "Make sure the bug is not already filed against a package.  Each package has "
 #: beyond-pkging.dbk:41
 msgid ""
 "Make sure the bug is not already filed against a package.  Each package has "


@@ -87,7 +87,7 @@ msgid ""
 "<command>querybts</command> before sending, too)."
 msgstr ""
 
 "<command>querybts</command> before sending, too)."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:50
 msgid ""
 "Try to direct your bugs to the proper location.  When for example your bug "
 #: beyond-pkging.dbk:50
 msgid ""
 "Try to direct your bugs to the proper location.  When for example your bug "


@@ -96,7 +96,7 @@ msgid ""
 "filing duplicate bug reports."
 msgstr ""
 
 "filing duplicate bug reports."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:56
 msgid ""
 "For extra credit, you can go through other packages, merging bugs which are "
 #: beyond-pkging.dbk:56
 msgid ""
 "For extra credit, you can go through other packages, merging bugs which are "


@@ -106,7 +106,7 @@ msgid ""
 "permission from the maintainer)."
 msgstr ""
 
 "permission from the maintainer)."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: beyond-pkging.dbk:63
 msgid ""
 "From time to time you may want to check what has been going on with the bug "
 #: beyond-pkging.dbk:63
 msgid ""
 "From time to time you may want to check what has been going on with the bug "


@@ -116,12 +116,12 @@ msgid ""
 "<literal>http://&bugs-host;/from:<replaceable>&lt;your-email-addr&gt;</replaceable></literal>."
 msgstr ""
 
 "<literal>http://&bugs-host;/from:<replaceable>&lt;your-email-addr&gt;</replaceable></literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
+#. type: Content of: <chapter><section><section><title>

 #: beyond-pkging.dbk:70
 msgid "Reporting lots of bugs at once (mass bug filing)"
 msgstr ""
 
 #: beyond-pkging.dbk:70
 msgid "Reporting lots of bugs at once (mass bug filing)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:72
 msgid ""
 "Reporting a great number of bugs for the same problem on a great number of "
 #: beyond-pkging.dbk:72
 msgid ""
 "Reporting a great number of bugs for the same problem on a great number of "


@@ -132,7 +132,7 @@ msgid ""
 "emitted."
 msgstr ""
 
 "emitted."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:79
 msgid ""
 "If you report more than 10 bugs on the same topic at once, it is recommended "
 #: beyond-pkging.dbk:79
 msgid ""
 "If you report more than 10 bugs on the same topic at once, it is recommended "


@@ -143,16 +143,16 @@ msgid ""
 "maintainers start filing the same bug report simultaneously."
 msgstr ""
 
 "maintainers start filing the same bug report simultaneously."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:87
 msgid ""
 #: beyond-pkging.dbk:87
 msgid ""

-"Please use the programms <command>dd-list</command> and if appropriate "
+"Please use the programs <command>dd-list</command> and if appropriate "

 "<command>whodepends</command> (from the package devscripts) to generate a "
 "list of all affected packages, and include the output in your mail to "
 "&email-debian-devel;."
 msgstr ""
 
 "<command>whodepends</command> (from the package devscripts) to generate a "
 "list of all affected packages, and include the output in your mail to "
 "&email-debian-devel;."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: beyond-pkging.dbk:93
 msgid ""
 "Note that when sending lots of bugs on the same subject, you should send the "
 #: beyond-pkging.dbk:93
 msgid ""
 "Note that when sending lots of bugs on the same subject, you should send the "


@@ -160,18 +160,72 @@ msgid ""
 "not forwarded to the bug distribution mailing list."
 msgstr ""
 
 "not forwarded to the bug distribution mailing list."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: beyond-pkging.dbk:102
+#. type: Content of: <chapter><section><section><section><title>
+#: beyond-pkging.dbk:98
+msgid "Usertags"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: beyond-pkging.dbk:100
+msgid ""
+"You may wish to use BTS usertags when submitting bugs across a number of "
+"packages. Usertags are similar to normal tags such as 'patch' and 'wishlist' "
+"but differ in that they are user-defined and occupy a namespace that is "
+"unique to a particular user. This allows multiple sets of developers to "
+"'usertag' the same bug in different ways without conflicting."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: beyond-pkging.dbk:107
+msgid ""
+"To add usertags when filing bugs, specify the <literal>User</literal> and "
+"<literal>Usertags</literal> pseudo-headers:"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><screen>
+#: beyond-pkging.dbk:111
+#, no-wrap
+msgid ""
+"To: submit@bugs.debian.org\n"
+"Subject: <replaceable>&lt;title-of-bug&gt;</replaceable>\n"
+"\n"
+"Package: <replaceable>&lt;pkgname&gt;</replaceable>\n"
+"<replaceable>[ ... ]</replaceable>\n"
+"User: <replaceable>&lt;email-addr&gt;</replaceable>\n"
+"Usertags: <replaceable>&lt;tag-name&gt; [ &lt;tag-name&gt; "
+"... ]</replaceable>\n"
+"\n"
+"<replaceable>&lt;description-of-bug ...&gt;</replaceable>\n"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: beyond-pkging.dbk:122
+msgid ""
+"Note that tags are seperated by spaces and cannot contain underscores. If "
+"you are filing bugs for for a particular group or team it is recommended "
+"that you set the <literal>User</literal> to an appropriate mailing list "
+"after describing your intention there."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: beyond-pkging.dbk:128
+msgid ""
+"To view bugs tagged with a specific usertag, visit "
+"<literal>http://&bugs-host;/cgi-bin/pkgreport.cgi?users=<replaceable>&lt;email-addr&gt;</replaceable>&amp;tag=<replaceable>&lt;tag-name&gt;</replaceable></literal>."
+msgstr ""
+
+#. type: Content of: <chapter><section><title>
+#: beyond-pkging.dbk:137

 msgid "Quality Assurance effort"
 msgstr ""
 
 msgid "Quality Assurance effort"
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: beyond-pkging.dbk:104
+#. type: Content of: <chapter><section><section><title>
+#: beyond-pkging.dbk:139

 msgid "Daily work"
 msgstr ""
 
 msgid "Daily work"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:106
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:141

 msgid ""
 "Even though there is a dedicated group of people for Quality Assurance, QA "
 "duties are not reserved solely for them.  You can participate in this effort "
 msgid ""
 "Even though there is a dedicated group of people for Quality Assurance, QA "
 "duties are not reserved solely for them.  You can participate in this effort "


@@ -185,13 +239,13 @@ msgid ""
 "linkend=\"collaborative-maint\"/> )."
 msgstr ""
 
 "linkend=\"collaborative-maint\"/> )."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: beyond-pkging.dbk:120
+#. type: Content of: <chapter><section><section><title>
+#: beyond-pkging.dbk:155

 msgid "Bug squashing parties"
 msgstr ""
 
 msgid "Bug squashing parties"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:122
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:157

 msgid ""
 "From time to time the QA group organizes bug squashing parties to get rid of "
 "as many problems as possible.  They are announced on "
 msgid ""
 "From time to time the QA group organizes bug squashing parties to get rid of "
 "as many problems as possible.  They are announced on "


@@ -202,8 +256,8 @@ msgid ""
 "binary modules)."
 msgstr ""
 
 "binary modules)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:131
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:166

 msgid ""
 "The rules for non-maintainer uploads differ during the parties because the "
 "announcement of the party is considered prior notice for NMU.  If you have "
 msgid ""
 "The rules for non-maintainer uploads differ during the parties because the "
 "announcement of the party is considered prior notice for NMU.  If you have "


@@ -215,8 +269,8 @@ msgid ""
 "BTS."
 msgstr ""
 
 "BTS."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:140
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:175

 msgid ""
 "People participating in the party have special rules for NMU, they can NMU "
 "without prior notice if they upload their NMU to DELAYED/3-day at least.  "
 msgid ""
 "People participating in the party have special rules for NMU, they can NMU "
 "without prior notice if they upload their NMU to DELAYED/3-day at least.  "


@@ -226,20 +280,20 @@ msgid ""
 "maintainer."
 msgstr ""
 
 "maintainer."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:147
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:182

 msgid ""
 "If you don't feel confident about doing an NMU, just send a patch to the "
 "BTS.  It's far better than a broken NMU."
 msgstr ""
 
 msgid ""
 "If you don't feel confident about doing an NMU, just send a patch to the "
 "BTS.  It's far better than a broken NMU."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: beyond-pkging.dbk:155
+#. type: Content of: <chapter><section><title>
+#: beyond-pkging.dbk:190

 msgid "Contacting other maintainers"
 msgstr ""
 
 msgid "Contacting other maintainers"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: beyond-pkging.dbk:157
+#. type: Content of: <chapter><section><para>
+#: beyond-pkging.dbk:192

 msgid ""
 "During your lifetime within Debian, you will have to contact other "
 "maintainers for various reasons.  You may want to discuss a new way of "
 msgid ""
 "During your lifetime within Debian, you will have to contact other "
 "maintainers for various reasons.  You may want to discuss a new way of "


@@ -247,8 +301,8 @@ msgid ""
 "someone that a new upstream version is available and that you need it."
 msgstr ""
 
 "someone that a new upstream version is available and that you need it."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: beyond-pkging.dbk:163
+#. type: Content of: <chapter><section><para>
+#: beyond-pkging.dbk:198

 msgid ""
 "Looking up the email address of the maintainer for the package can be "
 "distracting.  Fortunately, there is a simple email alias, "
 msgid ""
 "Looking up the email address of the maintainer for the package can be "
 "distracting.  Fortunately, there is a simple email alias, "


@@ -258,8 +312,8 @@ msgid ""
 "source or a binary package."
 msgstr ""
 
 "source or a binary package."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: beyond-pkging.dbk:171
+#. type: Content of: <chapter><section><para>
+#: beyond-pkging.dbk:206

 msgid ""
 "You may also be interested in contacting the persons who are subscribed to a "
 "given source package via <xref linkend=\"pkg-tracking-system\"/> .  You can "
 msgid ""
 "You may also be interested in contacting the persons who are subscribed to a "
 "given source package via <xref linkend=\"pkg-tracking-system\"/> .  You can "


@@ -267,13 +321,13 @@ msgid ""
 "address."
 msgstr ""
 
 "address."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: beyond-pkging.dbk:180
+#. type: Content of: <chapter><section><title>
+#: beyond-pkging.dbk:215

 msgid "Dealing with inactive and/or unreachable maintainers"
 msgstr ""
 
 msgid "Dealing with inactive and/or unreachable maintainers"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: beyond-pkging.dbk:182
+#. type: Content of: <chapter><section><para>
+#: beyond-pkging.dbk:217

 msgid ""
 "If you notice that a package is lacking maintenance, you should make sure "
 "that the maintainer is active and will continue to work on their packages.  "
 msgid ""
 "If you notice that a package is lacking maintenance, you should make sure "
 "that the maintainer is active and will continue to work on their packages.  "


@@ -282,8 +336,8 @@ msgid ""
 "they just need a reminder."
 msgstr ""
 
 "they just need a reminder."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: beyond-pkging.dbk:189
+#. type: Content of: <chapter><section><para>
+#: beyond-pkging.dbk:224

 msgid ""
 "There is a simple system (the MIA database) in which information about "
 "maintainers who are deemed Missing In Action is recorded.  When a member of "
 msgid ""
 "There is a simple system (the MIA database) in which information about "
 "maintainers who are deemed Missing In Action is recorded.  When a member of "


@@ -297,8 +351,8 @@ msgid ""
 "information, you should generally proceed as follows."
 msgstr ""
 
 "information, you should generally proceed as follows."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: beyond-pkging.dbk:200
+#. type: Content of: <chapter><section><para>
+#: beyond-pkging.dbk:235

 msgid ""
 "The first step is to politely contact the maintainer, and wait a reasonable "
 "time for a response.  It is quite hard to define reasonable time, but it is "
 msgid ""
 "The first step is to politely contact the maintainer, and wait a reasonable "
 "time for a response.  It is quite hard to define reasonable time, but it is "


@@ -306,8 +360,8 @@ msgid ""
 "way to handle this would be to send a reminder after two weeks."
 msgstr ""
 
 "way to handle this would be to send a reminder after two weeks."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: beyond-pkging.dbk:206
+#. type: Content of: <chapter><section><para>
+#: beyond-pkging.dbk:241

 msgid ""
 "If the maintainer doesn't reply within four weeks (a month), one can assume "
 "that a response will probably not happen.  If that happens, you should "
 msgid ""
 "If the maintainer doesn't reply within four weeks (a month), one can assume "
 "that a response will probably not happen.  If that happens, you should "


@@ -315,8 +369,8 @@ msgid ""
 "maintainer in question as possible.  This includes:"
 msgstr ""
 
 "maintainer in question as possible.  This includes:"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: beyond-pkging.dbk:214
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: beyond-pkging.dbk:249

 msgid ""
 "The <literal>echelon</literal> information available through the <ulink "
 "url=\"&url-debian-db;\">developers' LDAP database</ulink>, which indicates "
 msgid ""
 "The <literal>echelon</literal> information available through the <ulink "
 "url=\"&url-debian-db;\">developers' LDAP database</ulink>, which indicates "


@@ -326,8 +380,8 @@ msgid ""
 "the database."
 msgstr ""
 
 "the database."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: beyond-pkging.dbk:224
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: beyond-pkging.dbk:259

 msgid ""
 "The number of packages this maintainer is responsible for, and the condition "
 "of those packages.  In particular, are there any RC bugs that have been open "
 msgid ""
 "The number of packages this maintainer is responsible for, and the condition "
 "of those packages.  In particular, are there any RC bugs that have been open "


@@ -336,16 +390,16 @@ msgid ""
 "whom."
 msgstr ""
 
 "whom."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: beyond-pkging.dbk:233
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: beyond-pkging.dbk:268

 msgid ""
 "Is there any activity of the maintainer outside of Debian? For example, they "
 "might have posted something recently to non-Debian mailing lists or news "
 "groups."
 msgstr ""
 
 msgid ""
 "Is there any activity of the maintainer outside of Debian? For example, they "
 "might have posted something recently to non-Debian mailing lists or news "
 "groups."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: beyond-pkging.dbk:240
+#. type: Content of: <chapter><section><para>
+#: beyond-pkging.dbk:275

 msgid ""
 "A bit of a problem are packages which were sponsored — the maintainer is not "
 "an official Debian developer.  The <literal>echelon</literal> information is "
 msgid ""
 "A bit of a problem are packages which were sponsored — the maintainer is not "
 "an official Debian developer.  The <literal>echelon</literal> information is "


@@ -355,16 +409,16 @@ msgid ""
 "are likely to know what happened to the person they sponsored."
 msgstr ""
 
 "are likely to know what happened to the person they sponsored."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: beyond-pkging.dbk:248
+#. type: Content of: <chapter><section><para>
+#: beyond-pkging.dbk:283

 msgid ""
 "It is also allowed to post a query to &email-debian-devel;, asking if anyone "
 "is aware of the whereabouts of the missing maintainer.  Please Cc: the "
 "person in question."
 msgstr ""
 
 msgid ""
 "It is also allowed to post a query to &email-debian-devel;, asking if anyone "
 "is aware of the whereabouts of the missing maintainer.  Please Cc: the "
 "person in question."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: beyond-pkging.dbk:253
+#. type: Content of: <chapter><section><para>
+#: beyond-pkging.dbk:288

 msgid ""
 "Once you have gathered all of this, you can contact &email-mia;.  People on "
 "this alias will use the information you provide in order to decide how to "
 msgid ""
 "Once you have gathered all of this, you can contact &email-mia;.  People on "
 "this alias will use the information you provide in order to decide how to "


@@ -374,8 +428,8 @@ msgid ""
 "is interested in the package."
 msgstr ""
 
 "is interested in the package."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: beyond-pkging.dbk:261
+#. type: Content of: <chapter><section><para>
+#: beyond-pkging.dbk:296

 msgid ""
 "One last word: please remember to be polite.  We are all volunteers and "
 "cannot dedicate all of our time to Debian.  Also, you are not aware of the "
 msgid ""
 "One last word: please remember to be polite.  We are all volunteers and "
 "cannot dedicate all of our time to Debian.  Also, you are not aware of the "


@@ -385,8 +439,8 @@ msgid ""
 "the deceased and find a very impolite, angry and accusing message!"
 msgstr ""
 
 "the deceased and find a very impolite, angry and accusing message!"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: beyond-pkging.dbk:269
+#. type: Content of: <chapter><section><para>
+#: beyond-pkging.dbk:304

 msgid ""
 "On the other hand, although we are volunteers, we do have a responsibility.  "
 "So you can stress the importance of the greater good — if a maintainer does "
 msgid ""
 "On the other hand, although we are volunteers, we do have a responsibility.  "
 "So you can stress the importance of the greater good — if a maintainer does "


@@ -394,8 +448,8 @@ msgid ""
 "package to someone with more time."
 msgstr ""
 
 "package to someone with more time."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: beyond-pkging.dbk:275
+#. type: Content of: <chapter><section><para>
+#: beyond-pkging.dbk:310

 msgid ""
 "If you are interested in working in the MIA team, please have a look at the "
 "README file in <filename>/org/qa.debian.org/mia</filename> on <literal> "
 msgid ""
 "If you are interested in working in the MIA team, please have a look at the "
 "README file in <filename>/org/qa.debian.org/mia</filename> on <literal> "


@@ -403,13 +457,13 @@ msgid ""
 "are documented and contact &email-mia;."
 msgstr ""
 
 "are documented and contact &email-mia;."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: beyond-pkging.dbk:283
+#. type: Content of: <chapter><section><title>
+#: beyond-pkging.dbk:318

 msgid "Interacting with prospective Debian developers"
 msgstr ""
 
 msgid "Interacting with prospective Debian developers"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: beyond-pkging.dbk:285
+#. type: Content of: <chapter><section><para>
+#: beyond-pkging.dbk:320

 msgid ""
 "Debian's success depends on its ability to attract and retain new and "
 "talented volunteers.  If you are an experienced developer, we recommend that "
 msgid ""
 "Debian's success depends on its ability to attract and retain new and "
 "talented volunteers.  If you are an experienced developer, we recommend that "


@@ -417,21 +471,21 @@ msgid ""
 "section describes how to help new prospective developers."
 msgstr ""
 
 "section describes how to help new prospective developers."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: beyond-pkging.dbk:291
+#. type: Content of: <chapter><section><section><title>
+#: beyond-pkging.dbk:326

 msgid "Sponsoring packages"
 msgstr ""
 
 msgid "Sponsoring packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:293
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:328

 msgid ""
 "Sponsoring a package means uploading a package for a maintainer who is not "
 "able to do it on their own, a new maintainer applicant.  Sponsoring a "
 "package also means accepting responsibility for it."
 msgstr ""
 
 msgid ""
 "Sponsoring a package means uploading a package for a maintainer who is not "
 "able to do it on their own, a new maintainer applicant.  Sponsoring a "
 "package also means accepting responsibility for it."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:304
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:339

 msgid ""
 "New maintainers usually have certain difficulties creating Debian packages — "
 "this is quite understandable.  That is why the sponsor is there, to check "
 msgid ""
 "New maintainers usually have certain difficulties creating Debian packages — "
 "this is quite understandable.  That is why the sponsor is there, to check "


@@ -440,8 +494,8 @@ msgid ""
 "inspect it before letting it in.)"
 msgstr ""
 
 "inspect it before letting it in.)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:311
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:346

 msgid ""
 "Sponsoring merely by signing the upload or just recompiling is <emphasis "
 "role=\"strong\">definitely not recommended</emphasis>.  You need to build "
 msgid ""
 "Sponsoring merely by signing the upload or just recompiling is <emphasis "
 "role=\"strong\">definitely not recommended</emphasis>.  You need to build "


@@ -451,29 +505,29 @@ msgid ""
 "traced to you."
 msgstr ""
 
 "traced to you."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:318
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:353

 msgid ""
 "If you are an application manager for a prospective developer, you can also "
 "be their sponsor.  That way you can also verify how the applicant is "
 "handling the 'Tasks and Skills' part of their application."
 msgstr ""
 
 msgid ""
 "If you are an application manager for a prospective developer, you can also "
 "be their sponsor.  That way you can also verify how the applicant is "
 "handling the 'Tasks and Skills' part of their application."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: beyond-pkging.dbk:325
+#. type: Content of: <chapter><section><section><title>
+#: beyond-pkging.dbk:360

 msgid "Managing sponsored packages"
 msgstr ""
 
 msgid "Managing sponsored packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:327
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:362

 msgid ""
 "By uploading a sponsored package to Debian, you are certifying that the "
 "package meets minimum Debian standards.  That implies that you must build "
 "and test the package on your own system before uploading."
 msgstr ""
 
 msgid ""
 "By uploading a sponsored package to Debian, you are certifying that the "
 "package meets minimum Debian standards.  That implies that you must build "
 "and test the package on your own system before uploading."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:332
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:367

 msgid ""
 "You cannot simply upload a binary <filename>.deb</filename> from the "
 "sponsoree.  In theory, you should only ask for the diff file and the "
 msgid ""
 "You cannot simply upload a binary <filename>.deb</filename> from the "
 "sponsoree.  In theory, you should only ask for the diff file and the "


@@ -484,37 +538,35 @@ msgid ""
 "<filename>.orig.tar.gz</filename> file that they're providing."
 msgstr ""
 
 "<filename>.orig.tar.gz</filename> file that they're providing."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:341
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:376

 msgid ""
 "Do not be afraid to write the sponsoree back and point out changes that need "
 "to be made.  It often takes several rounds of back-and-forth email before "
 "the package is in acceptable shape.  Being a sponsor means being a mentor."
 msgstr ""
 
 msgid ""
 "Do not be afraid to write the sponsoree back and point out changes that need "
 "to be made.  It often takes several rounds of back-and-forth email before "
 "the package is in acceptable shape.  Being a sponsor means being a mentor."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:346
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:381

 msgid "Once the package meets Debian standards, build and sign it with"
 msgstr ""
 
 msgid "Once the package meets Debian standards, build and sign it with"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: beyond-pkging.dbk:348
+#. type: Content of: <chapter><section><section><screen>
+#: beyond-pkging.dbk:384

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"dpkg-buildpackage -k<replaceable>KEY-ID</replaceable>\n"
+msgid "dpkg-buildpackage -k<replaceable>KEY-ID</replaceable>\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:352
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:387

 msgid ""
 "before uploading it to the incoming directory.  Of course, you can also use "
 "any part of your <replaceable>KEY-ID</replaceable>, as long as it's unique "
 "in your secret keyring."
 msgstr ""
 
 msgid ""
 "before uploading it to the incoming directory.  Of course, you can also use "
 "any part of your <replaceable>KEY-ID</replaceable>, as long as it's unique "
 "in your secret keyring."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:357
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:392

 msgid ""
 "The Maintainer field of the <filename>control</filename> file and the "
 "<filename>changelog</filename> should list the person who did the packaging, "
 msgid ""
 "The Maintainer field of the <filename>control</filename> file and the "
 "<filename>changelog</filename> should list the person who did the packaging, "


@@ -522,39 +574,39 @@ msgid ""
 "about the package."
 msgstr ""
 
 "about the package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:363
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:398

 msgid ""
 "If you prefer to leave a more evident trace of your sponsorship job, you can "
 "add a line stating it in the most recent changelog entry."
 msgstr ""
 
 msgid ""
 "If you prefer to leave a more evident trace of your sponsorship job, you can "
 "add a line stating it in the most recent changelog entry."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:367
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:402

 msgid ""
 "You are encouraged to keep tabs on the package you sponsor using <xref "
 "linkend=\"pkg-tracking-system\"/> ."
 msgstr ""
 
 msgid ""
 "You are encouraged to keep tabs on the package you sponsor using <xref "
 "linkend=\"pkg-tracking-system\"/> ."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: beyond-pkging.dbk:373
+#. type: Content of: <chapter><section><section><title>
+#: beyond-pkging.dbk:408

 msgid "Advocating new developers"
 msgstr ""
 
 msgid "Advocating new developers"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:375
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:410

 msgid ""
 "See the page about <ulink url=\"&url-newmaint-advocate;\">advocating a "
 "prospective developer</ulink> at the Debian web site."
 msgstr ""
 
 msgid ""
 "See the page about <ulink url=\"&url-newmaint-advocate;\">advocating a "
 "prospective developer</ulink> at the Debian web site."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: beyond-pkging.dbk:382
+#. type: Content of: <chapter><section><section><title>
+#: beyond-pkging.dbk:417

 msgid "Handling new maintainer applications"
 msgstr ""
 
 msgid "Handling new maintainer applications"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: beyond-pkging.dbk:384
+#. type: Content of: <chapter><section><section><para>
+#: beyond-pkging.dbk:419

 msgid ""
 "Please see <ulink url=\"&url-newmaint-amchecklist;\">Checklist for "
 "Application Managers</ulink> at the Debian web site."
 msgid ""
 "Please see <ulink url=\"&url-newmaint-amchecklist;\">Checklist for "
 "Application Managers</ulink> at the Debian web site."

diff --git a/po4a/po/index.pot b/po4a/po/index.pot
index 958683928ad351a82ee3b1d0ebd737e115659790..070501a3a9aaa19057344423d78dc274f6f96f93 100644 (file)
--- a/po4a/po/index.pot
+++ b/po4a/po/index.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"POT-Creation-Date: 2008-08-08 11:33-0300\n"
+"POT-Creation-Date: 2010-01-04 00:17+0100\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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -15,60 +15,51 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING"
 
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING"
 

-# type: Attribute 'lang' of: <book>
+#. type: Attribute 'lang' of: <book>

 #: index.dbk:7
 msgid "en"
 msgstr ""
 
 #: index.dbk:7
 msgid "en"
 msgstr ""
 

-# type: Content of: <book><title>
+#. type: Content of: <book><title>

 #: index.dbk:9
 msgid "Debian Developer's Reference"
 msgstr ""
 
 #: index.dbk:9
 msgid "Debian Developer's Reference"
 msgstr ""
 

-# type: Content of: <book><bookinfo>
+#. type: Content of: <book><bookinfo>

 #: index.dbk:11
 msgid ""
 "<author> <othername>Developer's Reference Team</othername> &email-devel-ref; "
 "</author> <author> <firstname>Andreas</firstname> <surname>Barth</surname> "
 "</author> <author> <firstname>Adam</firstname> <surname>Di Carlo</surname> "
 "</author> <author> <firstname>Raphaël</firstname> <surname>Hertzog</surname> "
 #: index.dbk:11
 msgid ""
 "<author> <othername>Developer's Reference Team</othername> &email-devel-ref; "
 "</author> <author> <firstname>Andreas</firstname> <surname>Barth</surname> "
 "</author> <author> <firstname>Adam</firstname> <surname>Di Carlo</surname> "
 "</author> <author> <firstname>Raphaël</firstname> <surname>Hertzog</surname> "

+"</author> <author> <firstname>Lucas</firstname> <surname>Nussbaum</surname> "

 "</author> <author> <firstname>Christian</firstname> "
 "<surname>Schwarz</surname> </author> <author> <firstname>Ian</firstname> "
 "<surname>Jackson</surname> </author>"
 msgstr ""
 
 "</author> <author> <firstname>Christian</firstname> "
 "<surname>Schwarz</surname> </author> <author> <firstname>Ian</firstname> "
 "<surname>Jackson</surname> </author>"
 msgstr ""
 

-# type: Content of: <book><bookinfo><releaseinfo>
-#: index.dbk:30
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: index.dbk:33

 msgid "ver. &version;"
 msgstr ""
 
 msgid "ver. &version;"
 msgstr ""
 

-# type: Content of: <book><bookinfo><pubdate>
-#: index.dbk:31
-msgid "&pubdate;"
-msgstr ""
-
-# type: Content of: <book><bookinfo><copyright><holder>
-#: index.dbk:37
-msgid "Andreas Barth"
-msgstr ""
-
-# type: Content of: <book><bookinfo><copyright><holder>
-#: index.dbk:46
-msgid "Adam Di Carlo"
-msgstr ""
-
-# type: Content of: <book><bookinfo><copyright><holder>
-#: index.dbk:51
-msgid "Raphaël Hertzog"
-msgstr ""
-
-# type: Content of: <book><bookinfo><copyright><holder>
-#: index.dbk:56
-msgid "Christian Schwarz"
+#. type: Content of: <book><bookinfo>
+#: index.dbk:34
+msgid ""
+"<pubdate>&pubdate;</pubdate> <copyright> <year>2004</year> <year>2005</year> "
+"<year>2006</year> <year>2007</year> <holder>Andreas Barth</holder> "
+"</copyright> <copyright> <year>1998</year> <year>1999</year> "
+"<year>2000</year> <year>2001</year> <year>2002</year> <year>2003</year> "
+"<holder>Adam Di Carlo</holder> </copyright> <copyright> <year>2002</year> "
+"<year>2003</year> <year>2008</year> <year>2009</year> <holder>Raphaël "
+"Hertzog</holder> </copyright> <copyright> <year>2008</year> "
+"<year>2009</year> <holder>Lucas Nussbaum</holder> </copyright> <copyright> "
+"<year>1997</year> <year>1998</year> <holder>Christian Schwarz</holder> "
+"</copyright>"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <book><bookinfo><legalnotice><para>
-#: index.dbk:60
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: index.dbk:70

 msgid ""
 "This manual is free software; you may redistribute it and/or modify it under "
 "the terms of the GNU General Public License as published by the Free "
 msgid ""
 "This manual is free software; you may redistribute it and/or modify it under "
 "the terms of the GNU General Public License as published by the Free "


@@ -76,8 +67,8 @@ msgid ""
 "version."
 msgstr ""
 
 "version."
 msgstr ""
 

-# type: Content of: <book><bookinfo><legalnotice><para>
-#: index.dbk:65
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: index.dbk:75

 msgid ""
 "This is distributed in the hope that it will be useful, but "
 "<emphasis>without any warranty</emphasis>; without even the implied warranty "
 msgid ""
 "This is distributed in the hope that it will be useful, but "
 "<emphasis>without any warranty</emphasis>; without even the implied warranty "


@@ -85,8 +76,8 @@ msgid ""
 "Public License for more details."
 msgstr ""
 
 "Public License for more details."
 msgstr ""
 

-# type: Content of: <book><bookinfo><legalnotice><para>
-#: index.dbk:71
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: index.dbk:81

 msgid ""
 "A copy of the GNU General Public License is available as &file-GPL; in the "
 "&debian-formal; distribution or on the World Wide Web at <ulink "
 msgid ""
 "A copy of the GNU General Public License is available as &file-GPL; in the "
 "&debian-formal; distribution or on the World Wide Web at <ulink "


@@ -96,8 +87,8 @@ msgstr ""
 
 #.  TODO: Maybe better: "This document has originally been written
 #. in English.  Translations into different languages are available." 
 
 #.  TODO: Maybe better: "This document has originally been written
 #. in English.  Translations into different languages are available." 

-# type: Content of: <book><bookinfo><legalnotice><para>
-#: index.dbk:78
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: index.dbk:88

 msgid ""
 "If you want to print this reference, you should use the <ulink "
 "url=\"developers-reference.pdf\">pdf version</ulink>.  This page is also "
 msgid ""
 "If you want to print this reference, you should use the <ulink "
 "url=\"developers-reference.pdf\">pdf version</ulink>.  This page is also "

diff --git a/po4a/po/pkgs.pot b/po4a/po/pkgs.pot
index 6b408ae214149d18b2a7a7b0139b23b091342863..3e6665ccfe7982f7133353271938ff8912bc7aba 100644 (file)
--- a/po4a/po/pkgs.pot
+++ b/po4a/po/pkgs.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"POT-Creation-Date: 2008-08-08 11:33-0300\n"
+"POT-Creation-Date: 2010-01-04 00:17+0100\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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -15,24 +15,24 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING"
 
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING"
 

-# type: Content of: <chapter><title>
+#. type: Content of: <chapter><title>

 #: pkgs.dbk:7
 msgid "Managing Packages"
 msgstr ""
 
 #: pkgs.dbk:7
 msgid "Managing Packages"
 msgstr ""
 

-# type: Content of: <chapter><para>
+#. type: Content of: <chapter><para>

 #: pkgs.dbk:9
 msgid ""
 "This chapter contains information related to creating, uploading, "
 "maintaining, and porting packages."
 msgstr ""
 
 #: pkgs.dbk:9
 msgid ""
 "This chapter contains information related to creating, uploading, "
 "maintaining, and porting packages."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
+#. type: Content of: <chapter><section><title>

 #: pkgs.dbk:13
 msgid "New packages"
 msgstr ""
 
 #: pkgs.dbk:13
 msgid "New packages"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: pkgs.dbk:15
 msgid ""
 "If you want to create a new package for the Debian distribution, you should "
 #: pkgs.dbk:15
 msgid ""
 "If you want to create a new package for the Debian distribution, you should "


@@ -43,7 +43,7 @@ msgid ""
 "more information."
 msgstr ""
 
 "more information."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: pkgs.dbk:23
 msgid ""
 "Assuming no one else is already working on your prospective package, you "
 #: pkgs.dbk:23
 msgid ""
 "Assuming no one else is already working on your prospective package, you "


@@ -54,7 +54,7 @@ msgid ""
 "the current URL where it can be downloaded from."
 msgstr ""
 
 "the current URL where it can be downloaded from."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: pkgs.dbk:31
 msgid ""
 "You should set the subject of the bug to <literal>ITP: "
 #: pkgs.dbk:31
 msgid ""
 "You should set the subject of the bug to <literal>ITP: "


@@ -71,7 +71,7 @@ msgid ""
 "description and package name."
 msgstr ""
 
 "description and package name."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: pkgs.dbk:45
 msgid ""
 "Please include a <literal>Closes: "
 #: pkgs.dbk:45
 msgid ""
 "Please include a <literal>Closes: "


@@ -81,9 +81,19 @@ msgid ""
 "linkend=\"upload-bugfix\"/> )."
 msgstr ""
 
 "linkend=\"upload-bugfix\"/> )."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: pkgs.dbk:51
 msgid ""
 #: pkgs.dbk:51
 msgid ""

+"If you think your package needs some explanations for the administrators of "
+"the NEW package queue, include them in your changelog, send to "
+"ftpmaster@debian.org a reply to the email you receive as a maintainer after "
+"your upload, or reply to the rejection email in case you are already "
+"re-uploading."
+msgstr ""
+
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:57
+msgid ""

 "When closing security bugs include CVE numbers as well as the Closes: "
 "#nnnnn.  This is useful for the security team to track vulnerabilities.  If "
 "an upload is made to fix the bug before the advisory ID is known, it is "
 "When closing security bugs include CVE numbers as well as the Closes: "
 "#nnnnn.  This is useful for the security team to track vulnerabilities.  If "
 "an upload is made to fix the bug before the advisory ID is known, it is "


@@ -92,64 +102,64 @@ msgid ""
 "information in the original changelog entry."
 msgstr ""
 
 "information in the original changelog entry."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:59
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:65

 msgid ""
 "There are a number of reasons why we ask maintainers to announce their "
 "intentions:"
 msgstr ""
 
 msgid ""
 "There are a number of reasons why we ask maintainers to announce their "
 "intentions:"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:65
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:71

 msgid ""
 "It helps the (potentially new) maintainer to tap into the experience of "
 "people on the list, and lets them know if anyone else is working on it "
 "already."
 msgstr ""
 
 msgid ""
 "It helps the (potentially new) maintainer to tap into the experience of "
 "people on the list, and lets them know if anyone else is working on it "
 "already."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:71
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:77

 msgid ""
 "It lets other people thinking about working on the package know that there "
 "already is a volunteer, so efforts may be shared."
 msgstr ""
 
 msgid ""
 "It lets other people thinking about working on the package know that there "
 "already is a volunteer, so efforts may be shared."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:77
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:83

 msgid ""
 "It lets the rest of the maintainers know more about the package than the one "
 "line description and the usual changelog entry ``Initial release'' that gets "
 "posted to &email-debian-devel-changes;."
 msgstr ""
 
 msgid ""
 "It lets the rest of the maintainers know more about the package than the one "
 "line description and the usual changelog entry ``Initial release'' that gets "
 "posted to &email-debian-devel-changes;."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:84
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:90

 msgid ""
 "It is helpful to the people who live off <literal>unstable</literal> (and "
 "form our first line of testers).  We should encourage these people."
 msgstr ""
 
 msgid ""
 "It is helpful to the people who live off <literal>unstable</literal> (and "
 "form our first line of testers).  We should encourage these people."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:90
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:96

 msgid ""
 "The announcements give maintainers and other interested parties a better "
 "feel of what is going on, and what is new, in the project."
 msgstr ""
 
 msgid ""
 "The announcements give maintainers and other interested parties a better "
 "feel of what is going on, and what is new, in the project."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:96
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:102

 msgid ""
 "Please see <ulink url=\"http://&ftp-master-host;/REJECT-FAQ.html\"></ulink> "
 "for common rejection reasons for a new package."
 msgstr ""
 
 msgid ""
 "Please see <ulink url=\"http://&ftp-master-host;/REJECT-FAQ.html\"></ulink> "
 "for common rejection reasons for a new package."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:102
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:108

 msgid "Recording changes in the package"
 msgstr ""
 
 msgid "Recording changes in the package"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:104
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:110

 msgid ""
 "Changes that you make to the package need to be recorded in the "
 "<filename>debian/changelog</filename>.  These changes should provide a "
 msgid ""
 "Changes that you make to the package need to be recorded in the "
 "<filename>debian/changelog</filename>.  These changes should provide a "


@@ -162,8 +172,8 @@ msgid ""
 "for native packages."
 msgstr ""
 
 "for native packages."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:115
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:121

 msgid ""
 "The <filename>debian/changelog</filename> file conforms to a certain "
 "structure, with a number of different fields.  One field of note, the "
 msgid ""
 "The <filename>debian/changelog</filename> file conforms to a certain "
 "structure, with a number of different fields.  One field of note, the "


@@ -173,65 +183,63 @@ msgid ""
 "<filename>debian/changelog</filename>."
 msgstr ""
 
 "<filename>debian/changelog</filename>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:123
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:129

 msgid ""
 "Changelog entries can be used to automatically close Debian bugs when the "
 "package is installed into the archive.  See <xref "
 "linkend=\"upload-bugfix\"/> ."
 msgstr ""
 
 msgid ""
 "Changelog entries can be used to automatically close Debian bugs when the "
 "package is installed into the archive.  See <xref "
 "linkend=\"upload-bugfix\"/> ."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:127
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:133

 msgid ""
 "It is conventional that the changelog entry of a package that contains a new "
 "upstream version of the software looks like this:"
 msgstr ""
 
 msgid ""
 "It is conventional that the changelog entry of a package that contains a new "
 "upstream version of the software looks like this:"
 msgstr ""
 

-# type: Content of: <chapter><section><screen>
-#: pkgs.dbk:130
+#. type: Content of: <chapter><section><screen>
+#: pkgs.dbk:137

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"  * new upstream version\n"
+msgid "  * new upstream version\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:134
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:140

 msgid ""
 "There are tools to help you create entries and finalize the "
 "<filename>changelog</filename> for release — see <xref "
 "linkend=\"devscripts\"/> and <xref linkend=\"dpkg-dev-el\"/> ."
 msgstr ""
 
 msgid ""
 "There are tools to help you create entries and finalize the "
 "<filename>changelog</filename> for release — see <xref "
 "linkend=\"devscripts\"/> and <xref linkend=\"dpkg-dev-el\"/> ."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:139
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:145

 msgid "See also <xref linkend=\"bpp-debian-changelog\"/> ."
 msgstr ""
 
 msgid "See also <xref linkend=\"bpp-debian-changelog\"/> ."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:144
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:150

 msgid "Testing the package"
 msgstr ""
 
 msgid "Testing the package"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:146
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:152

 msgid ""
 "Before you upload your package, you should do basic testing on it.  At a "
 "minimum, you should try the following activities (you'll need to have an "
 "older version of the same Debian package around):"
 msgstr ""
 
 msgid ""
 "Before you upload your package, you should do basic testing on it.  At a "
 "minimum, you should try the following activities (you'll need to have an "
 "older version of the same Debian package around):"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:153
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:159

 msgid ""
 "Install the package and make sure the software works, or upgrade the package "
 "from an older version to your new version if a Debian package for it already "
 "exists."
 msgstr ""
 
 msgid ""
 "Install the package and make sure the software works, or upgrade the package "
 "from an older version to your new version if a Debian package for it already "
 "exists."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:160
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:166

 msgid ""
 "Run <command>lintian</command> over the package.  You can run "
 "<command>lintian</command> as follows: <literal>lintian -v "
 msgid ""
 "Run <command>lintian</command> over the package.  You can run "
 "<command>lintian</command> as follows: <literal>lintian -v "


@@ -243,41 +251,41 @@ msgid ""
 "problem."
 msgstr ""
 
 "problem."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:169
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:175

 msgid ""
 "Normally, a package should <emphasis>not</emphasis> be uploaded if it causes "
 "lintian to emit errors (they will start with <literal>E</literal>)."
 msgstr ""
 
 msgid ""
 "Normally, a package should <emphasis>not</emphasis> be uploaded if it causes "
 "lintian to emit errors (they will start with <literal>E</literal>)."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:173
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:179

 msgid ""
 "For more information on <command>lintian</command>, see <xref "
 "linkend=\"lintian\"/> ."
 msgstr ""
 
 msgid ""
 "For more information on <command>lintian</command>, see <xref "
 "linkend=\"lintian\"/> ."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:179
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:185

 msgid ""
 "Optionally run <xref linkend=\"debdiff\"/> to analyze changes from an older "
 "version, if one exists."
 msgstr ""
 
 msgid ""
 "Optionally run <xref linkend=\"debdiff\"/> to analyze changes from an older "
 "version, if one exists."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:185
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:191

 msgid ""
 "Downgrade the package to the previous version (if one exists) — this tests "
 "the <filename>postrm</filename> and <filename>prerm</filename> scripts."
 msgstr ""
 
 msgid ""
 "Downgrade the package to the previous version (if one exists) — this tests "
 "the <filename>postrm</filename> and <filename>prerm</filename> scripts."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:191
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:197

 msgid "Remove the package, then reinstall it."
 msgstr ""
 
 msgid "Remove the package, then reinstall it."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:196
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:202

 msgid ""
 "Copy the source package in a different directory and try unpacking it and "
 "rebuilding it.  This tests if the package relies on existing files outside "
 msgid ""
 "Copy the source package in a different directory and try unpacking it and "
 "rebuilding it.  This tests if the package relies on existing files outside "


@@ -285,52 +293,55 @@ msgid ""
 "inside the .diff.gz file."
 msgstr ""
 
 "inside the .diff.gz file."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:206
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:212

 msgid "Layout of the source package"
 msgstr ""
 
 msgid "Layout of the source package"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:208
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:214

 msgid "There are two types of Debian source packages:"
 msgstr ""
 
 msgid "There are two types of Debian source packages:"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:213
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:219

 msgid ""
 "the so-called <literal>native</literal> packages, where there is no "
 "distinction between the original sources and the patches applied for Debian"
 msgstr ""
 
 msgid ""
 "the so-called <literal>native</literal> packages, where there is no "
 "distinction between the original sources and the patches applied for Debian"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:219
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:225

 msgid ""
 "the (more common) packages where there's an original source tarball file "
 msgid ""
 "the (more common) packages where there's an original source tarball file "

-"accompanied by another file that contains the patches applied for Debian"
+"accompanied by another file that contains the changes made by Debian"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:225
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:231

 msgid ""
 "For the native packages, the source package includes a Debian source control "
 "file (<literal>.dsc</literal>) and the source tarball "
 msgid ""
 "For the native packages, the source package includes a Debian source control "
 "file (<literal>.dsc</literal>) and the source tarball "

-"(<literal>.tar.gz</literal>).  A source package of a non-native package "
-"includes a Debian source control file, the original source tarball "
-"(<literal>.orig.tar.gz</literal>) and the Debian patches "
-"(<literal>.diff.gz</literal>)."
+"(<literal>.tar.{gz,bz2,lzma}</literal>). A source package of a non-native "
+"package includes a Debian source control file, the original source tarball "
+"(<literal>.orig.tar.{gz,bz2,lzma}</literal>) and the Debian changes "
+"(<literal>.diff.gz</literal> for the source format “1.0” or "
+"<literal>.debian.tar.{gz,bz2,lzma}</literal> for the source format “3.0 "
+"(quilt)”)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:233
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:240

 msgid ""
 msgid ""

-"Whether a package is native or not is determined when it is built by "
-"<citerefentry> <refentrytitle>dpkg-buildpackage</refentrytitle> "
-"<manvolnum>1</manvolnum> </citerefentry>.  The rest of this section relates "
-"only to non-native packages."
+"With source format “1.0”, whether a package is native or not was determined "
+"by <command>dpkg-source</command> at build time. Nowadays it is recommended "
+"to be explicit about the desired source format by putting either “3.0 "
+"(quilt)” or “3.0 (native)” in <filename>debian/source/format</filename>.  "
+"The rest of this section relates only to non-native packages."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:239
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:247

 msgid ""
 "The first time a version is uploaded which corresponds to a particular "
 "upstream version, the original source tar file should be uploaded and "
 msgid ""
 "The first time a version is uploaded which corresponds to a particular "
 "upstream version, the original source tar file should be uploaded and "


@@ -339,19 +350,19 @@ msgid ""
 "<filename>.dsc</filename> files, and will not need to be re-uploaded."
 msgstr ""
 
 "<filename>.dsc</filename> files, and will not need to be re-uploaded."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:246
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:254

 msgid ""
 "By default, <command>dpkg-genchanges</command> and "
 "<command>dpkg-buildpackage</command> will include the original source tar "
 msgid ""
 "By default, <command>dpkg-genchanges</command> and "
 "<command>dpkg-buildpackage</command> will include the original source tar "

-"file if and only if the Debian revision part of the source version number is "
-"0 or 1, indicating a new upstream version.  This behavior may be modified by "
-"using <literal>-sa</literal> to always include it or <literal>-sd</literal> "
-"to always leave it out."
+"file if and only if the current changelog entry has a different upstream "
+"version from the preceding entry. This behavior may be modified by using "
+"<literal>-sa</literal> to always include it or <literal>-sd</literal> to "
+"always leave it out."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:254
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:262

 msgid ""
 "If no original source is included in the upload, the original source "
 "tar-file used by <command>dpkg-source</command> when constructing the "
 msgid ""
 "If no original source is included in the upload, the original source "
 "tar-file used by <command>dpkg-source</command> when constructing the "


@@ -360,21 +371,23 @@ msgid ""
 "the archive."
 msgstr ""
 
 "the archive."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:261
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:269

 msgid ""
 "Please notice that, in non-native packages, permissions on files that are "
 msgid ""
 "Please notice that, in non-native packages, permissions on files that are "

-"not present in the .orig.tar.gz will not be preserved, as diff does not "
-"store file permissions in the patch."
+"not present in the .orig.tar.{gz,bz2} will not be preserved, as diff does "
+"not store file permissions in the patch. However when using source format "
+"“3.0 (quilt)”, permissions of files inside the <filename>debian</filename> "
+"directory are preserved since they are stored in a tar archive."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:268
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:278

 msgid "Picking a distribution"
 msgstr ""
 
 msgid "Picking a distribution"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:270
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:280

 msgid ""
 "Each upload needs to specify which distribution the package is intended "
 "for.  The package build process extracts this information from the first "
 msgid ""
 "Each upload needs to specify which distribution the package is intended "
 "for.  The package build process extracts this information from the first "


@@ -383,8 +396,8 @@ msgid ""
 "file."
 msgstr ""
 
 "file."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:276
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:286

 msgid ""
 "There are several possible values for this field: <literal>stable</literal>, "
 "<literal>unstable</literal>, <literal>testing-proposed-updates</literal> and "
 msgid ""
 "There are several possible values for this field: <literal>stable</literal>, "
 "<literal>unstable</literal>, <literal>testing-proposed-updates</literal> and "


@@ -392,41 +405,41 @@ msgid ""
 "<literal>unstable</literal>."
 msgstr ""
 
 "<literal>unstable</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:282
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:292

 msgid ""
 "Actually, there are two other possible distributions: "
 "<literal>stable-security </literal> and <literal>testing-security</literal>, "
 "but read <xref linkend=\"bug-security\"/> for more information on those."
 msgstr ""
 
 msgid ""
 "Actually, there are two other possible distributions: "
 "<literal>stable-security </literal> and <literal>testing-security</literal>, "
 "but read <xref linkend=\"bug-security\"/> for more information on those."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:287
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:297

 msgid ""
 "It is not possible to upload a package into several distributions at the "
 "same time."
 msgstr ""
 
 msgid ""
 "It is not possible to upload a package into several distributions at the "
 "same time."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:291
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:301

 msgid ""
 "Special case: uploads to the <literal>stable</literal> and "
 "<literal>oldstable</literal> distributions"
 msgstr ""
 
 msgid ""
 "Special case: uploads to the <literal>stable</literal> and "
 "<literal>oldstable</literal> distributions"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:294
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:304

 msgid ""
 "Uploading to <literal>stable</literal> means that the package will "
 msgid ""
 "Uploading to <literal>stable</literal> means that the package will "

-"transfered to the <literal>proposed-updates-new</literal> queue for review "
+"transferred to the <literal>proposed-updates-new</literal> queue for review "

 "by the stable release managers, and if approved will be installed in "
 "<filename>stable-proposed-updates</filename> directory of the Debian "
 "archive.  From there, it will be included in <literal>stable</literal> with "
 "the next point release."
 msgstr ""
 
 "by the stable release managers, and if approved will be installed in "
 "<filename>stable-proposed-updates</filename> directory of the Debian "
 "archive.  From there, it will be included in <literal>stable</literal> with "
 "the next point release."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:302
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:312

 msgid ""
 "To ensure that your upload will be accepted, you should discuss the changes "
 "with the stable release team before you upload. For that, send a mail to the "
 msgid ""
 "To ensure that your upload will be accepted, you should discuss the changes "
 "with the stable release team before you upload. For that, send a mail to the "


@@ -436,31 +449,31 @@ msgid ""
 "<literal>stable</literal> distribution."
 msgstr ""
 
 "<literal>stable</literal> distribution."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:310
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:320

 msgid ""
 "Extra care should be taken when uploading to <literal>stable</literal>.  "
 "Basically, a package should only be uploaded to <literal>stable</literal> if "
 "one of the following happens:"
 msgstr ""
 
 msgid ""
 "Extra care should be taken when uploading to <literal>stable</literal>.  "
 "Basically, a package should only be uploaded to <literal>stable</literal> if "
 "one of the following happens:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:317
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:327

 msgid "a truly critical functionality problem"
 msgstr ""
 
 msgid "a truly critical functionality problem"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:322
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:332

 msgid "the package becomes uninstallable"
 msgstr ""
 
 msgid "the package becomes uninstallable"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:327
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:337

 msgid "a released architecture lacks the package"
 msgstr ""
 
 msgid "a released architecture lacks the package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:332
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:342

 msgid ""
 "In the past, uploads to <literal>stable</literal> were used to address "
 "security problems as well.  However, this practice is deprecated, as uploads "
 msgid ""
 "In the past, uploads to <literal>stable</literal> were used to address "
 "security problems as well.  However, this practice is deprecated, as uploads "


@@ -473,15 +486,15 @@ msgid ""
 "upload to <literal>stable</literal>."
 msgstr ""
 
 "upload to <literal>stable</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:343
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:353

 msgid ""
 "Changing anything else in the package that isn't important is discouraged, "
 "because even trivial fixes can cause bugs later on."
 msgstr ""
 
 msgid ""
 "Changing anything else in the package that isn't important is discouraged, "
 "because even trivial fixes can cause bugs later on."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:347
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:357

 msgid ""
 "Packages uploaded to <literal>stable</literal> need to be compiled on "
 "systems running <literal>stable</literal>, so that their dependencies are "
 msgid ""
 "Packages uploaded to <literal>stable</literal> need to be compiled on "
 "systems running <literal>stable</literal>, so that their dependencies are "


@@ -494,123 +507,113 @@ msgid ""
 "uninstallable, is strongly discouraged."
 msgstr ""
 
 "uninstallable, is strongly discouraged."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:357
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:367

 msgid ""
 "Uploads to the <literal>oldstable</literal> distributions are possible as "
 "long as it hasn't been archived. The same rules as for <literal>stable "
 "</literal> apply."
 msgstr ""
 
 msgid ""
 "Uploads to the <literal>oldstable</literal> distributions are possible as "
 "long as it hasn't been archived. The same rules as for <literal>stable "
 "</literal> apply."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:364
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:374

 msgid "Special case: uploads to <literal>testing/testing-proposed-updates</literal>"
 msgstr ""
 
 msgid "Special case: uploads to <literal>testing/testing-proposed-updates</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:366
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:376

 msgid ""
 "Please see the information in the <link linkend=\"t-p-u\">testing "
 "section</link> for details."
 msgstr ""
 
 msgid ""
 "Please see the information in the <link linkend=\"t-p-u\">testing "
 "section</link> for details."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:374
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:384

 msgid "Uploading a package"
 msgstr ""
 
 msgid "Uploading a package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:376
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:386

 msgid "Uploading to <literal>ftp-master</literal>"
 msgstr ""
 
 msgid "Uploading to <literal>ftp-master</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:378
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:388

 msgid ""
 "To upload a package, you should upload the files (including the signed "
 "changes and dsc-file) with anonymous ftp to "
 msgid ""
 "To upload a package, you should upload the files (including the signed "
 "changes and dsc-file) with anonymous ftp to "

-"<literal>&ftp-master-host;</literal> in the directory <ulink "
-"url=\"ftp://&ftp-master-host;&upload-queue;\">&upload-queue;</ulink>.  To "
+"<literal>&ftp-upload-host;</literal> in the directory <ulink "
+"url=\"ftp://&ftp-upload-host;&upload-queue;\">&upload-queue;</ulink>.  To "

 "get the files processed there, they need to be signed with a key in the "
 "Debian Developers keyring or the Debian Maintainers keyring (see <ulink "
 "url=\"&url-wiki-dm;\"></ulink>)."
 msgstr ""
 
 "get the files processed there, they need to be signed with a key in the "
 "Debian Developers keyring or the Debian Maintainers keyring (see <ulink "
 "url=\"&url-wiki-dm;\"></ulink>)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:387
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:397

 msgid ""
 "Please note that you should transfer the changes file last.  Otherwise, your "
 "upload may be rejected because the archive maintenance software will parse "
 "the changes file and see that not all files have been uploaded."
 msgstr ""
 
 msgid ""
 "Please note that you should transfer the changes file last.  Otherwise, your "
 "upload may be rejected because the archive maintenance software will parse "
 "the changes file and see that not all files have been uploaded."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:392
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:402

 msgid ""
 "You may also find the Debian packages <xref linkend=\"dupload\"/> or <xref "
 "linkend=\"dput\"/> useful when uploading packages.  These handy programs "
 "help automate the process of uploading packages into Debian."
 msgstr ""
 
 msgid ""
 "You may also find the Debian packages <xref linkend=\"dupload\"/> or <xref "
 "linkend=\"dput\"/> useful when uploading packages.  These handy programs "
 "help automate the process of uploading packages into Debian."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:397
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:407

 msgid ""
 msgid ""

-"For removing packages, please see the README file in that ftp directory, and "
-"the Debian package <xref linkend=\"dcut\"/> ."
+"For removing packages, please see <ulink "
+"url=\"ftp://&ftp-upload-host;&upload-queue;/README\"/> and the Debian "
+"package <xref linkend=\"dcut\"/> ."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:403
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:414

 msgid "Delayed uploads"
 msgstr ""
 
 msgid "Delayed uploads"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:405
-msgid ""
-"Delayed uploads are done for the moment via the delayed queue at "
-"<literal>gluck </literal>. The upload-directory is "
-"<literal>gluck:~tfheen/DELAYED/[012345678]-day</literal>. 0-day is uploaded "
-"multiple times per day to <literal>&ftp-master-host;</literal>."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:411
-msgid "With a fairly recent dput, this section"
-msgstr ""
-
-# type: Content of: <chapter><section><section><screen>
-#: pkgs.dbk:413
-#, no-wrap
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:417

 msgid ""
 msgid ""

-"\n"
-"[tfheen_delayed]\n"
-"method = scp\n"
-"fqdn = gluck.debian.org\n"
-"incoming = ~tfheen\n"
+"It is sometimes useful to upload a package immediately, but to want this "
+"package to arrive in the archive only a few days later. For example, when "
+"preparing a <link linkend=\"nmu\">Non-maintainer Upload</link>, you might "
+"want to give the maintainer a few days to react."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:420
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:424

 msgid ""
 msgid ""

-"in <filename>~/.dput.cf</filename> should work fine for uploading to the "
-"<literal>DELAYED</literal> queue."
+"An upload to the delayed directory keeps the package in <ulink "
+"url=\"http://ftp-master.debian.org/deferred.html\"> the deferred uploads "
+"queue\"</ulink>.  When the specified waiting time is over, the package is "
+"moved into the regular incoming directory for processing.  This is done "
+"through automatic uploading to <literal>&ftp-upload-host;</literal> in "
+"upload-directory <literal>DELAYED/[012345678]-day</literal>. 0-day is "
+"uploaded multiple times per day to <literal>&ftp-upload-host;</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:424
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:435

 msgid ""
 msgid ""

-"<emphasis>Note:</emphasis> Since this upload queue goes to "
-"<literal>&ftp-master-host;</literal>, the prescription found in <xref "
-"linkend=\"upload-ftp-master\"/> applies here as well."
+"With dput, you can use the <literal>--delayed "
+"<replaceable>DELAY</replaceable></literal> parameter to put the package into "
+"one of the queues."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:431
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:441

 msgid "Security uploads"
 msgstr ""
 
 msgid "Security uploads"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:433
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:443

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 "upload queue (<literal>oldstable-security</literal>, "
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 "upload queue (<literal>oldstable-security</literal>, "


@@ -621,42 +624,36 @@ msgid ""
 "linkend=\"bug-security\"/> ."
 msgstr ""
 
 "linkend=\"bug-security\"/> ."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:443
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:453

 msgid "Other upload queues"
 msgstr ""
 
 msgid "Other upload queues"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:445
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:455

 msgid ""
 msgid ""

-"The scp queues on <literal>&ftp-master-host;</literal>, and <literal> "
-"security.debian.org</literal> are mostly unusable due to the login "
-"restrictions on those hosts."
+"There is an alternative upload queue in Europe at <ulink "
+"url=\"ftp://&ftp-eu-upload-host;&upload-queue;\"/>. It operates in the same "
+"way as <literal>&ftp-upload-host;</literal>, but should be faster for "
+"European developers."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:450
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:461

 msgid ""
 msgid ""

-"The anonymous queues on ftp.uni-erlangen.de and ftp.uk.debian.org are "
-"currently down.  Work is underway to resurrect them."
+"Packages can also be uploaded via ssh to "
+"<literal>&ssh-upload-host;</literal>; files should be put "
+"<literal>/srv/upload.debian.org/UploadQueue</literal>. This queue does not "
+"support <xref linkend=\"delayed-incoming\">delayed uploads</xref>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:454
-msgid ""
-"The queues on master.debian.org, samosa.debian.org, master.debian.or.jp, and "
-"ftp.chiark.greenend.org.uk are down permanently, and will not be "
-"resurrected.  The queue in Japan will be replaced with a new queue on "
-"hp.debian.or.jp some day."
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:462
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:469

 msgid "Notification that a new package has been installed"
 msgstr ""
 
 msgid "Notification that a new package has been installed"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:464
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:471

 msgid ""
 "The Debian archive maintainers are responsible for handling package "
 "uploads.  For the most part, uploads are automatically handled on a daily "
 msgid ""
 "The Debian archive maintainers are responsible for handling package "
 "uploads.  For the most part, uploads are automatically handled on a daily "


@@ -668,8 +665,8 @@ msgid ""
 "change to the archive may take up to a month to occur.  Please be patient."
 msgstr ""
 
 "change to the archive may take up to a month to occur.  Please be patient."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:474
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:481

 msgid ""
 "In any case, you will receive an email notification indicating that the "
 "package has been added to the archive, which also indicates which bugs will "
 msgid ""
 "In any case, you will receive an email notification indicating that the "
 "package has been added to the archive, which also indicates which bugs will "


@@ -677,28 +674,28 @@ msgid ""
 "checking if any bugs you meant to close didn't get triggered."
 msgstr ""
 
 "checking if any bugs you meant to close didn't get triggered."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:480
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:487

 msgid ""
 "The installation notification also includes information on what section the "
 "package was inserted into.  If there is a disparity, you will receive a "
 "separate email notifying you of that.  Read on below."
 msgstr ""
 
 msgid ""
 "The installation notification also includes information on what section the "
 "package was inserted into.  If there is a disparity, you will receive a "
 "separate email notifying you of that.  Read on below."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:485
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:492

 msgid ""
 "Note that if you upload via queues, the queue daemon software will also send "
 "you a notification by email."
 msgstr ""
 
 msgid ""
 "Note that if you upload via queues, the queue daemon software will also send "
 "you a notification by email."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:493
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:500

 msgid "Specifying the package section, subsection and priority"
 msgstr ""
 
 msgid "Specifying the package section, subsection and priority"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:495
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:502

 msgid ""
 "The <filename>debian/control</filename> file's <literal>Section</literal> "
 "and <literal>Priority</literal> fields do not actually specify where the "
 msgid ""
 "The <filename>debian/control</filename> file's <literal>Section</literal> "
 "and <literal>Priority</literal> fields do not actually specify where the "


@@ -708,8 +705,8 @@ msgid ""
 "<filename>debian/control</filename> file are actually just hints."
 msgstr ""
 
 "<filename>debian/control</filename> file are actually just hints."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:503
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:510

 msgid ""
 "The archive maintainers keep track of the canonical sections and priorities "
 "for packages in the <literal>override file</literal>.  If there is a "
 msgid ""
 "The archive maintainers keep track of the canonical sections and priorities "
 "for packages in the <literal>override file</literal>.  If there is a "


@@ -721,19 +718,21 @@ msgid ""
 "may wish to make a change in the <literal>override file</literal>."
 msgstr ""
 
 "may wish to make a change in the <literal>override file</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:513
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:520

 msgid ""
 "To alter the actual section that a package is put in, you need to first make "
 "sure that the <filename>debian/control</filename> file in your package is "
 msgid ""
 "To alter the actual section that a package is put in, you need to first make "
 "sure that the <filename>debian/control</filename> file in your package is "

-"accurate.  Next, send an email &email-override; or submit a bug against "
-"<systemitem role=\"package\">ftp.debian.org</systemitem> requesting that the "
-"section or priority for your package be changed from the old section or "
-"priority to the new one.  Be sure to explain your reasoning."
+"accurate.  Next, submit a bug against <systemitem "
+"role=\"package\">ftp.debian.org</systemitem> requesting that the section or "
+"priority for your package be changed from the old section or priority to the "
+"new one. Use a Subject like <literal>override: PACKAGE1:section/priority, "
+"[...], PACKAGEX:section/priority</literal>, and include the justification "
+"for the change in the body of the bug report."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:521
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:531

 msgid ""
 "For more information about <literal>override files</literal>, see "
 "<citerefentry> <refentrytitle>dpkg-scanpackages</refentrytitle> "
 msgid ""
 "For more information about <literal>override files</literal>, see "
 "<citerefentry> <refentrytitle>dpkg-scanpackages</refentrytitle> "


@@ -741,8 +740,8 @@ msgid ""
 "url=\"&url-bts-devel;#maintincorrect\"></ulink>."
 msgstr ""
 
 "url=\"&url-bts-devel;#maintincorrect\"></ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:527
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:537

 msgid ""
 "Note that the <literal>Section</literal> field describes both the section as "
 "well as the subsection, which are described in <xref "
 msgid ""
 "Note that the <literal>Section</literal> field describes both the section as "
 "well as the subsection, which are described in <xref "


@@ -751,13 +750,13 @@ msgid ""
 "url=\"&url-debian-policy;ch-archive.html#s-subsections\"></ulink>."
 msgstr ""
 
 "url=\"&url-debian-policy;ch-archive.html#s-subsections\"></ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:536
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:546

 msgid "Handling bugs"
 msgstr ""
 
 msgid "Handling bugs"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:538
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:548

 msgid ""
 "Every developer has to be able to work with the Debian <ulink "
 "url=\"&url-bts;\">bug tracking system</ulink>.  This includes knowing how to "
 msgid ""
 "Every developer has to be able to work with the Debian <ulink "
 "url=\"&url-bts;\">bug tracking system</ulink>.  This includes knowing how to "


@@ -765,8 +764,8 @@ msgid ""
 "update them and reorder them, and how to process and close them."
 msgstr ""
 
 "update them and reorder them, and how to process and close them."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:544
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:554

 msgid ""
 "The bug tracking system's features are described in the <ulink "
 "url=\"&url-bts-devel;\">BTS documentation for developers</ulink>.  This "
 msgid ""
 "The bug tracking system's features are described in the <ulink "
 "url=\"&url-bts-devel;\">BTS documentation for developers</ulink>.  This "


@@ -774,8 +773,8 @@ msgid ""
 "tags, marking bugs as forwarded, and other issues."
 msgstr ""
 
 "tags, marking bugs as forwarded, and other issues."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:550
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:560

 msgid ""
 "Operations such as reassigning bugs to other packages, merging separate bug "
 "reports about the same issue, or reopening bugs when they are prematurely "
 msgid ""
 "Operations such as reassigning bugs to other packages, merging separate bug "
 "reports about the same issue, or reopening bugs when they are prematurely "


@@ -784,13 +783,13 @@ msgid ""
 "url=\"&url-bts-control;\">BTS control server documentation</ulink>."
 msgstr ""
 
 "url=\"&url-bts-control;\">BTS control server documentation</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:558
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:568

 msgid "Monitoring bugs"
 msgstr ""
 
 msgid "Monitoring bugs"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:560
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:570

 msgid ""
 "If you want to be a good maintainer, you should periodically check the "
 "<ulink url=\"&url-bts;\">Debian bug tracking system (BTS)</ulink> for your "
 msgid ""
 "If you want to be a good maintainer, you should periodically check the "
 "<ulink url=\"&url-bts;\">Debian bug tracking system (BTS)</ulink> for your "


@@ -799,8 +798,8 @@ msgid ""
 "<literal>http://&bugs-host;/<replaceable>yourlogin</replaceable>@debian.org</literal>."
 msgstr ""
 
 "<literal>http://&bugs-host;/<replaceable>yourlogin</replaceable>@debian.org</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:567
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:577

 msgid ""
 "Maintainers interact with the BTS via email addresses at "
 "<literal>&bugs-host;</literal>.  Documentation on available commands can be "
 msgid ""
 "Maintainers interact with the BTS via email addresses at "
 "<literal>&bugs-host;</literal>.  Documentation on available commands can be "


@@ -809,37 +808,36 @@ msgid ""
 "at the local files &file-bts-docs;."
 msgstr ""
 
 "at the local files &file-bts-docs;."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:574
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:584

 msgid ""
 "Some find it useful to get periodic reports on open bugs.  You can add a "
 "cron job such as the following if you want to get a weekly email outlining "
 "all the open bugs against your packages:"
 msgstr ""
 
 msgid ""
 "Some find it useful to get periodic reports on open bugs.  You can add a "
 "cron job such as the following if you want to get a weekly email outlining "
 "all the open bugs against your packages:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: pkgs.dbk:578
+#. type: Content of: <chapter><section><section><screen>
+#: pkgs.dbk:589

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"\n"

 "# ask for weekly reports of bugs in my packages\n"
 "&cron-bug-report;\n"
 msgstr ""
 
 "# ask for weekly reports of bugs in my packages\n"
 "&cron-bug-report;\n"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:583
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:593

 msgid ""
 "Replace <replaceable>address</replaceable> with your official Debian "
 "maintainer address."
 msgstr ""
 
 msgid ""
 "Replace <replaceable>address</replaceable> with your official Debian "
 "maintainer address."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:589
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:599

 msgid "Responding to bugs"
 msgstr ""
 
 msgid "Responding to bugs"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:591
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:601

 msgid ""
 "When responding to bugs, make sure that any discussion you have about bugs "
 "is sent both to the original submitter of the bug, and to the bug itself "
 msgid ""
 "When responding to bugs, make sure that any discussion you have about bugs "
 "is sent both to the original submitter of the bug, and to the bug itself "


@@ -851,15 +849,15 @@ msgid ""
 "<email>123@&bugs-host;</email>)."
 msgstr ""
 
 "<email>123@&bugs-host;</email>)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:600
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:610

 msgid ""
 "If you get a bug which mentions FTBFS, this means Fails to build from "
 "source.  Porters frequently use this acronym."
 msgstr ""
 
 msgid ""
 "If you get a bug which mentions FTBFS, this means Fails to build from "
 "source.  Porters frequently use this acronym."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:604
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:614

 msgid ""
 "Once you've dealt with a bug report (e.g.  fixed it), mark it as "
 "<literal>done</literal> (close it) by sending an explanation message to "
 msgid ""
 "Once you've dealt with a bug report (e.g.  fixed it), mark it as "
 "<literal>done</literal> (close it) by sending an explanation message to "


@@ -868,8 +866,8 @@ msgid ""
 "linkend=\"upload-bugfix\"/> ."
 msgstr ""
 
 "linkend=\"upload-bugfix\"/> ."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:611
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:621

 msgid ""
 "You should <emphasis>never</emphasis> close bugs via the bug server "
 "<literal>close</literal> command sent to &email-bts-control;.  If you do so, "
 msgid ""
 "You should <emphasis>never</emphasis> close bugs via the bug server "
 "<literal>close</literal> command sent to &email-bts-control;.  If you do so, "


@@ -877,13 +875,13 @@ msgid ""
 "was closed."
 msgstr ""
 
 "was closed."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:619
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:629

 msgid "Bug housekeeping"
 msgstr ""
 
 msgid "Bug housekeeping"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:621
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:631

 msgid ""
 "As a package maintainer, you will often find bugs in other packages or have "
 "bugs reported against your packages which are actually bugs in other "
 msgid ""
 "As a package maintainer, you will often find bugs in other packages or have "
 "bugs reported against your packages which are actually bugs in other "


@@ -895,8 +893,8 @@ msgid ""
 "your own bugs, based on the collective Debian developer experience."
 msgstr ""
 
 "your own bugs, based on the collective Debian developer experience."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:632
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:642

 msgid ""
 "Filing bugs for problems that you find in other packages is one of the civic "
 "obligations of maintainership, see <xref linkend=\"submit-bug\"/> for "
 msgid ""
 "Filing bugs for problems that you find in other packages is one of the civic "
 "obligations of maintainership, see <xref linkend=\"submit-bug\"/> for "


@@ -904,13 +902,13 @@ msgid ""
 "important."
 msgstr ""
 
 "important."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:637
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:647

 msgid "Here's a list of steps that you may follow to handle a bug report:"
 msgstr ""
 
 msgid "Here's a list of steps that you may follow to handle a bug report:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:642
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:652

 msgid ""
 "Decide whether the report corresponds to a real bug or not.  Sometimes users "
 "are just calling a program in the wrong way because they haven't read the "
 msgid ""
 "Decide whether the report corresponds to a real bug or not.  Sometimes users "
 "are just calling a program in the wrong way because they haven't read the "


@@ -922,8 +920,8 @@ msgid ""
 "This is an issue that may need to be brought up with the upstream author."
 msgstr ""
 
 "This is an issue that may need to be brought up with the upstream author."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:652
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:662

 msgid ""
 "If the bug submitter disagrees with your decision to close the bug, they may "
 "reopen it until you find an agreement on how to handle it.  If you don't "
 msgid ""
 "If the bug submitter disagrees with your decision to close the bug, they may "
 "reopen it until you find an agreement on how to handle it.  If you don't "


@@ -937,8 +935,8 @@ msgid ""
 "procedure</ulink>."
 msgstr ""
 
 "procedure</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:666
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:676

 msgid ""
 "If the bug is real but it's caused by another package, just reassign the bug "
 "to the right package.  If you don't know which package it should be "
 msgid ""
 "If the bug is real but it's caused by another package, just reassign the bug "
 "to the right package.  If you don't know which package it should be "


@@ -953,8 +951,8 @@ msgid ""
 "for their packages."
 msgstr ""
 
 "for their packages."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:678
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:688

 msgid ""
 "If the bug affects the operation of your package, please consider cloning "
 "the bug and reassigning the clone to the package that really causes the "
 msgid ""
 "If the bug affects the operation of your package, please consider cloning "
 "the bug and reassigning the clone to the package that really causes the "


@@ -964,8 +962,8 @@ msgid ""
 "relationship."
 msgstr ""
 
 "relationship."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:688
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:698

 msgid ""
 "Sometimes you also have to adjust the severity of the bug so that it matches "
 "our definition of the severity.  That's because people tend to inflate the "
 msgid ""
 "Sometimes you also have to adjust the severity of the bug so that it matches "
 "our definition of the severity.  That's because people tend to inflate the "


@@ -974,8 +972,8 @@ msgid ""
 "cosmetic."
 msgstr ""
 
 "cosmetic."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:696
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:706

 msgid ""
 "If the bug is real but the same problem has already been reported by someone "
 "else, then the two relevant bug reports should be merged into one using the "
 msgid ""
 "If the bug is real but the same problem has already been reported by someone "
 "else, then the two relevant bug reports should be merged into one using the "


@@ -986,8 +984,8 @@ msgid ""
 "its relative, the unmerge command, see the BTS control server documentation."
 msgstr ""
 
 "its relative, the unmerge command, see the BTS control server documentation."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:707
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:717

 msgid ""
 "The bug submitter may have forgotten to provide some information, in which "
 "case you have to ask them for the required information.  You may use the "
 msgid ""
 "The bug submitter may have forgotten to provide some information, in which "
 "case you have to ask them for the required information.  You may use the "


@@ -998,8 +996,8 @@ msgid ""
 "been sent by someone, the bug may be closed."
 msgstr ""
 
 "been sent by someone, the bug may be closed."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:718
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:728

 msgid ""
 "If the bug is related to the packaging, you just fix it.  If you are not "
 "able to fix it yourself, then tag the bug as <literal>help</literal>.  You "
 msgid ""
 "If the bug is related to the packaging, you just fix it.  If you are not "
 "able to fix it yourself, then tag the bug as <literal>help</literal>.  You "


@@ -1013,8 +1011,8 @@ msgid ""
 "<literal>patch</literal>."
 msgstr ""
 
 "<literal>patch</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:732
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:742

 msgid ""
 "If you have fixed a bug in your local copy, or if a fix has been committed "
 "to the CVS repository, you may tag the bug as <literal>pending</literal> to "
 msgid ""
 "If you have fixed a bug in your local copy, or if a fix has been committed "
 "to the CVS repository, you may tag the bug as <literal>pending</literal> to "


@@ -1024,21 +1022,21 @@ msgid ""
 "several developers working on the same package."
 msgstr ""
 
 "several developers working on the same package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:742
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:752

 msgid ""
 "Once a corrected package is available in the archive, the bug should be "
 "closed indicating the version in which it was fixed. This can be done "
 "automatically, read <xref linkend=\"upload-bugfix\"/>."
 msgstr ""
 
 msgid ""
 "Once a corrected package is available in the archive, the bug should be "
 "closed indicating the version in which it was fixed. This can be done "
 "automatically, read <xref linkend=\"upload-bugfix\"/>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:751
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:761

 msgid "When bugs are closed by new uploads"
 msgstr ""
 
 msgid "When bugs are closed by new uploads"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:753
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:763

 msgid ""
 "As bugs and problems are fixed in your packages, it is your responsibility "
 "as the package maintainer to close these bugs.  However, you should not "
 msgid ""
 "As bugs and problems are fixed in your packages, it is your responsibility "
 "as the package maintainer to close these bugs.  However, you should not "


@@ -1048,8 +1046,8 @@ msgid ""
 "bug in the BTS.  Also, the bug should be closed with the correct version."
 msgstr ""
 
 "bug in the BTS.  Also, the bug should be closed with the correct version."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:761
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:771

 msgid ""
 "However, it's possible to avoid having to manually close bugs after the "
 "upload — just list the fixed bugs in your "
 msgid ""
 "However, it's possible to avoid having to manually close bugs after the "
 "upload — just list the fixed bugs in your "


@@ -1057,11 +1055,10 @@ msgid ""
 "the archive maintenance software will close the bugs for you.  For example:"
 msgstr ""
 
 "the archive maintenance software will close the bugs for you.  For example:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: pkgs.dbk:766
+#. type: Content of: <chapter><section><section><screen>
+#: pkgs.dbk:777

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"\n"

 "acme-cannon (3.1415) unstable; urgency=low\n"
 "\n"
 "  * Frobbed with options (closes: Bug#98339)\n"
 "acme-cannon (3.1415) unstable; urgency=low\n"
 "\n"
 "  * Frobbed with options (closes: Bug#98339)\n"


@@ -1070,23 +1067,21 @@ msgid ""
 "  * Added man page. Closes: #98725.\n"
 msgstr ""
 
 "  * Added man page. Closes: #98725.\n"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:775
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:785

 msgid ""
 "Technically speaking, the following Perl regular expression describes how "
 "bug closing changelogs are identified:"
 msgstr ""
 
 msgid ""
 "Technically speaking, the following Perl regular expression describes how "
 "bug closing changelogs are identified:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: pkgs.dbk:778
+#. type: Content of: <chapter><section><section><screen>
+#: pkgs.dbk:789

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"  /closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig\n"
+msgid "  /closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:782
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:792

 msgid ""
 "We prefer the <literal>closes: #<replaceable>XXX</replaceable></literal> "
 "syntax, as it is the most concise entry and the easiest to integrate with "
 msgid ""
 "We prefer the <literal>closes: #<replaceable>XXX</replaceable></literal> "
 "syntax, as it is the most concise entry and the easiest to integrate with "


@@ -1097,8 +1092,8 @@ msgid ""
 "the changelog-part in the <filename>.changes</filename> file are closed)."
 msgstr ""
 
 "the changelog-part in the <filename>.changes</filename> file are closed)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:791
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:801

 msgid ""
 "Historically, uploads identified as <link linkend=\"nmu\">Non-maintainer "
 "upload (NMU)</link> were tagged <literal>fixed</literal> instead of being "
 msgid ""
 "Historically, uploads identified as <link linkend=\"nmu\">Non-maintainer "
 "upload (NMU)</link> were tagged <literal>fixed</literal> instead of being "


@@ -1106,8 +1101,8 @@ msgid ""
 "The same applied to the tag <literal>fixed-in-experimental</literal>."
 msgstr ""
 
 "The same applied to the tag <literal>fixed-in-experimental</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:797
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:807

 msgid ""
 "If you happen to mistype a bug number or forget a bug in the changelog "
 "entries, don't hesitate to undo any damage the error caused.  To reopen "
 msgid ""
 "If you happen to mistype a bug number or forget a bug in the changelog "
 "entries, don't hesitate to undo any damage the error caused.  To reopen "


@@ -1121,8 +1116,8 @@ msgid ""
 "first version where the bug has been fixed."
 msgstr ""
 
 "first version where the bug has been fixed."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:809
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:819

 msgid ""
 "Bear in mind that it is not obligatory to close bugs using the changelog as "
 "described above.  If you simply want to close bugs that don't have anything "
 msgid ""
 "Bear in mind that it is not obligatory to close bugs using the changelog as "
 "described above.  If you simply want to close bugs that don't have anything "


@@ -1133,20 +1128,20 @@ msgid ""
 "on the bug."
 msgstr ""
 
 "on the bug."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:817
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:827

 msgid ""
 "For general information on how to write your changelog entries, see <xref "
 "linkend=\"bpp-debian-changelog\"/> ."
 msgstr ""
 
 msgid ""
 "For general information on how to write your changelog entries, see <xref "
 "linkend=\"bpp-debian-changelog\"/> ."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:823
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:833

 msgid "Handling security-related bugs"
 msgstr ""
 
 msgid "Handling security-related bugs"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:825
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:835

 msgid ""
 "Due to their sensitive nature, security-related bugs must be handled "
 "carefully.  The Debian Security Team exists to coordinate this activity, "
 msgid ""
 "Due to their sensitive nature, security-related bugs must be handled "
 "carefully.  The Debian Security Team exists to coordinate this activity, "


@@ -1155,59 +1150,93 @@ msgid ""
 "and maintaining <literal>security.debian.org</literal>."
 msgstr ""
 
 "and maintaining <literal>security.debian.org</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:834
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:842

 msgid ""
 "When you become aware of a security-related bug in a Debian package, whether "
 "or not you are the maintainer, collect pertinent information about the "
 "problem, and promptly contact the security team at &email-security-team; as "
 "soon as possible.  <emphasis role=\"strong\">DO NOT UPLOAD</emphasis> any "
 msgid ""
 "When you become aware of a security-related bug in a Debian package, whether "
 "or not you are the maintainer, collect pertinent information about the "
 "problem, and promptly contact the security team at &email-security-team; as "
 "soon as possible.  <emphasis role=\"strong\">DO NOT UPLOAD</emphasis> any "

-"packages for <literal>stable</literal>; the security team will do that.  "
-"Useful information includes, for example:"
+"packages for <literal>stable</literal> without contacting the team.  Useful "
+"information includes, for example:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:844
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:852

 msgid ""
 "Which versions of the package are known to be affected by the bug.  Check "
 "each version that is present in a supported Debian release, as well as "
 "<literal>testing</literal> and <literal>unstable</literal>."
 msgstr ""
 
 msgid ""
 "Which versions of the package are known to be affected by the bug.  Check "
 "each version that is present in a supported Debian release, as well as "
 "<literal>testing</literal> and <literal>unstable</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:851
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:859

 msgid "The nature of the fix, if any is available (patches are especially helpful)"
 msgstr ""
 
 msgid "The nature of the fix, if any is available (patches are especially helpful)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:856
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:864

 msgid ""
 "Any fixed packages that you have prepared yourself (send only the "
 "<literal>.diff.gz</literal> and <literal>.dsc</literal> files and read <xref "
 "linkend=\"bug-security-building\"/> first)"
 msgstr ""
 
 msgid ""
 "Any fixed packages that you have prepared yourself (send only the "
 "<literal>.diff.gz</literal> and <literal>.dsc</literal> files and read <xref "
 "linkend=\"bug-security-building\"/> first)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:863
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:871

 msgid ""
 "Any assistance you can provide to help with testing (exploits, regression "
 "testing, etc.)"
 msgstr ""
 
 msgid ""
 "Any assistance you can provide to help with testing (exploits, regression "
 "testing, etc.)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:869
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:877

 msgid ""
 "Any information needed for the advisory (see <xref "
 "linkend=\"bug-security-advisories\"/> )"
 msgstr ""
 
 msgid ""
 "Any information needed for the advisory (see <xref "
 "linkend=\"bug-security-advisories\"/> )"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:875
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:882
+msgid ""
+"As the maintainer of the package, you have the responsibility to maintain "
+"it, even in the stable release. You are in the best position to evaluate "
+"patches and test updated packages, so please see the sections below on how "
+"to prepare packages for the Security Team to handle."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:888
+msgid "The Security Tracker"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:890
+msgid ""
+"The security team maintains a central database, the <ulink "
+"url=\"http://security-tracker.debian.org/\">Debian Security "
+"Tracker</ulink>.  This contains all public information that is known about "
+"security issues: which packages and versions are affected or fixed, and thus "
+"whether stable, testing and/or unstable are vulnerable. Information that is "
+"still confidential is not added to the tracker."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:898
+msgid ""
+"You can search it for a specific issue, but also on package name. Look for "
+"your package to see which issues are still open. If you can, please provide "
+"more information about those issues, or help to address them in your "
+"package.  Instructions are on the tracker web pages."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:906

 msgid "Confidentiality"
 msgstr ""
 
 msgid "Confidentiality"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:877
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:908

 msgid ""
 "Unlike most other activities within Debian, information about security "
 "issues must sometimes be kept private for a time.  This allows software "
 msgid ""
 "Unlike most other activities within Debian, information about security "
 "issues must sometimes be kept private for a time.  This allows software "


@@ -1217,28 +1246,28 @@ msgid ""
 "knowledge."
 msgstr ""
 
 "knowledge."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:884
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:915

 msgid "There are several ways developers can learn of a security problem:"
 msgstr ""
 
 msgid "There are several ways developers can learn of a security problem:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:889
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:920

 msgid "they notice it on a public forum (mailing list, web site, etc.)"
 msgstr ""
 
 msgid "they notice it on a public forum (mailing list, web site, etc.)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:894
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:925

 msgid "someone files a bug report"
 msgstr ""
 
 msgid "someone files a bug report"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:899
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:930

 msgid "someone informs them via private email"
 msgstr ""
 
 msgid "someone informs them via private email"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:904
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:935

 msgid ""
 "In the first two cases, the information is public and it is important to "
 "have a fix as soon as possible.  In the last case, however, it might not be "
 msgid ""
 "In the first two cases, the information is public and it is important to "
 "have a fix as soon as possible.  In the last case, however, it might not be "


@@ -1246,23 +1275,23 @@ msgid ""
 "dealing with the problem:"
 msgstr ""
 
 "dealing with the problem:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:912
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:943

 msgid ""
 "If the security exposure is minor, there is sometimes no need to keep the "
 "problem a secret and a fix should be made and released."
 msgstr ""
 
 msgid ""
 "If the security exposure is minor, there is sometimes no need to keep the "
 "problem a secret and a fix should be made and released."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:918
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:949

 msgid ""
 "If the problem is severe, it is preferable to share the information with "
 "other vendors and coordinate a release.  The security team keeps in contact "
 "with the various organizations and individuals and can take care of that."
 msgstr ""
 
 msgid ""
 "If the problem is severe, it is preferable to share the information with "
 "other vendors and coordinate a release.  The security team keeps in contact "
 "with the various organizations and individuals and can take care of that."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:925
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:956

 msgid ""
 "In all cases if the person who reports the problem asks that it not be "
 "disclosed, such requests should be honored, with the obvious exception of "
 msgid ""
 "In all cases if the person who reports the problem asks that it not be "
 "disclosed, such requests should be honored, with the obvious exception of "


@@ -1271,8 +1300,8 @@ msgid ""
 "team, be sure to mention this fact."
 msgstr ""
 
 "team, be sure to mention this fact."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:932
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:963

 msgid ""
 "Please note that if secrecy is needed you may not upload a fix to "
 "<literal>unstable</literal> (or anywhere else, such as a public CVS "
 msgid ""
 "Please note that if secrecy is needed you may not upload a fix to "
 "<literal>unstable</literal> (or anywhere else, such as a public CVS "


@@ -1281,21 +1310,30 @@ msgid ""
 "public."
 msgstr ""
 
 "public."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:939
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:970

 msgid ""
 "There are two reasons for releasing information even though secrecy is "
 "requested: the problem has been known for a while, or the problem or exploit "
 "has become public."
 msgstr ""
 
 msgid ""
 "There are two reasons for releasing information even though secrecy is "
 "requested: the problem has been known for a while, or the problem or exploit "
 "has become public."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:946
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:975
+msgid ""
+"The Security Team has a PGP-key to enable encrypted communication about "
+"sensitive issues. See the <ulink "
+"url=\"http://www.debian.org/security/faq.en.html#contact\">Security Team "
+"FAQ</ulink> for details."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:981

 msgid "Security Advisories"
 msgstr ""
 
 msgid "Security Advisories"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:948
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:983

 msgid ""
 "Security advisories are only issued for the current, released stable "
 "distribution, and <emphasis>not</emphasis> for <literal>testing</literal> or "
 msgid ""
 "Security advisories are only issued for the current, released stable "
 "distribution, and <emphasis>not</emphasis> for <literal>testing</literal> or "


@@ -1308,81 +1346,81 @@ msgid ""
 "in an advisory includes:"
 msgstr ""
 
 "in an advisory includes:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:961
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:996

 msgid "A description of the problem and its scope, including:"
 msgstr ""
 
 msgid "A description of the problem and its scope, including:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: pkgs.dbk:966
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: pkgs.dbk:1001

 msgid "The type of problem (privilege escalation, denial of service, etc.)"
 msgstr ""
 
 msgid "The type of problem (privilege escalation, denial of service, etc.)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: pkgs.dbk:971
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: pkgs.dbk:1006

 msgid "What privileges may be gained, and by whom (if any)"
 msgstr ""
 
 msgid "What privileges may be gained, and by whom (if any)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: pkgs.dbk:976
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: pkgs.dbk:1011

 msgid "How it can be exploited"
 msgstr ""
 
 msgid "How it can be exploited"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: pkgs.dbk:981
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: pkgs.dbk:1016

 msgid "Whether it is remotely or locally exploitable"
 msgstr ""
 
 msgid "Whether it is remotely or locally exploitable"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: pkgs.dbk:986
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: pkgs.dbk:1021

 msgid "How the problem was fixed"
 msgstr ""
 
 msgid "How the problem was fixed"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:991
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1026

 msgid "This information allows users to assess the threat to their systems."
 msgstr ""
 
 msgid "This information allows users to assess the threat to their systems."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:996
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1031

 msgid "Version numbers of affected packages"
 msgstr ""
 
 msgid "Version numbers of affected packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1001
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1036

 msgid "Version numbers of fixed packages"
 msgstr ""
 
 msgid "Version numbers of fixed packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1006
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1041

 msgid ""
 "Information on where to obtain the updated packages (usually from the Debian "
 "security archive)"
 msgstr ""
 
 msgid ""
 "Information on where to obtain the updated packages (usually from the Debian "
 "security archive)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1012
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1047

 msgid ""
 "References to upstream advisories, <ulink "
 "url=\"http://cve.mitre.org\">CVE</ulink> identifiers, and any other "
 "information useful in cross-referencing the vulnerability"
 msgstr ""
 
 msgid ""
 "References to upstream advisories, <ulink "
 "url=\"http://cve.mitre.org\">CVE</ulink> identifiers, and any other "
 "information useful in cross-referencing the vulnerability"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1021
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1056

 msgid "Preparing packages to address security issues"
 msgstr ""
 
 msgid "Preparing packages to address security issues"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1023
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1058

 msgid ""
 "One way that you can assist the security team in their duties is to provide "
 "them with fixed packages suitable for a security advisory for the stable "
 "Debian release."
 msgstr ""
 
 msgid ""
 "One way that you can assist the security team in their duties is to provide "
 "them with fixed packages suitable for a security advisory for the stable "
 "Debian release."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1028
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1063

 msgid ""
 "When an update is made to the stable release, care must be taken to avoid "
 "changing system behavior or introducing new bugs.  In order to do this, make "
 msgid ""
 "When an update is made to the stable release, care must be taken to avoid "
 "changing system behavior or introducing new bugs.  In order to do this, make "


@@ -1392,8 +1430,8 @@ msgid ""
 "sure you never change the API or ABI, no matter how small the change."
 msgstr ""
 
 "sure you never change the API or ABI, no matter how small the change."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1036
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1071

 msgid ""
 "This means that moving to a new upstream version is not a good solution.  "
 "Instead, the relevant changes should be back-ported to the version present "
 msgid ""
 "This means that moving to a new upstream version is not a good solution.  "
 "Instead, the relevant changes should be back-ported to the version present "


@@ -1402,8 +1440,8 @@ msgid ""
 "help."
 msgstr ""
 
 "help."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1042
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1077

 msgid ""
 "In some cases, it is not possible to back-port a security fix, for example "
 "when large amounts of source code need to be modified or rewritten.  If this "
 msgid ""
 "In some cases, it is not possible to back-port a security fix, for example "
 "when large amounts of source code need to be modified or rewritten.  If this "


@@ -1412,8 +1450,8 @@ msgid ""
 "with the security team beforehand."
 msgstr ""
 
 "with the security team beforehand."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1049
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1084

 msgid ""
 "Related to this is another important guideline: always test your changes.  "
 "If you have an exploit available, try it and see if it indeed succeeds on "
 msgid ""
 "Related to this is another important guideline: always test your changes.  "
 "If you have an exploit available, try it and see if it indeed succeeds on "


@@ -1422,8 +1460,8 @@ msgid ""
 "features in subtle ways."
 msgstr ""
 
 "features in subtle ways."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1056
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1091

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> include any changes in your "
 "package which are not directly related to fixing the vulnerability.  These "
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> include any changes in your "
 "package which are not directly related to fixing the vulnerability.  These "


@@ -1435,8 +1473,8 @@ msgid ""
 "do not attempt to do this."
 msgstr ""
 
 "do not attempt to do this."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1066
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1101

 msgid ""
 "Review and test your changes as much as possible.  Check the differences "
 "from the previous version repeatedly (<command>interdiff</command> from the "
 msgid ""
 "Review and test your changes as much as possible.  Check the differences "
 "from the previous version repeatedly (<command>interdiff</command> from the "


@@ -1446,15 +1484,15 @@ msgid ""
 "<xref linkend=\"debdiff\"/> )."
 msgstr ""
 
 "<xref linkend=\"debdiff\"/> )."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1074
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1109

 msgid "Be sure to verify the following items:"
 msgstr ""
 
 msgid "Be sure to verify the following items:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1079
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1114

 msgid ""
 msgid ""

-"Target the right distribution in your "
+"<emphasis role=\"strong\">Target the right distribution</emphasis> in your "

 "<filename>debian/changelog</filename>.  For <literal>stable</literal> this "
 "is <literal>stable-security</literal> and for testing this is "
 "<literal>testing-security</literal>, and for the previous stable release, "
 "<filename>debian/changelog</filename>.  For <literal>stable</literal> this "
 "is <literal>stable-security</literal> and for testing this is "
 "<literal>testing-security</literal>, and for the previous stable release, "


@@ -1463,84 +1501,76 @@ msgid ""
 "or <literal>stable</literal>!"
 msgstr ""
 
 "or <literal>stable</literal>!"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1089
-msgid "The upload should have urgency=high."
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1125
+msgid "The upload should have <emphasis role=\"strong\">urgency=high</emphasis>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1094
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1130

 msgid ""
 "Make descriptive, meaningful changelog entries.  Others will rely on them to "
 msgid ""
 "Make descriptive, meaningful changelog entries.  Others will rely on them to "

-"determine whether a particular bug was fixed.  Always include an external "
-"reference, preferably a CVE identifier, so that it can be cross-referenced.  "
-"Include the same information in the changelog for "
-"<literal>unstable</literal>, so that it is clear that the same bug was "
-"fixed, as this is very helpful when verifying that the bug is fixed in the "
-"next stable release.  If a CVE identifier has not yet been assigned, the "
-"security team will request one so that it can be included in the package and "
-"in the advisory."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1107
-msgid ""
-"Make sure the version number is proper.  It must be greater than the current "
-"package, but less than package versions in later distributions.  If in "
-"doubt, test it with <literal>dpkg --compare-versions</literal>.  Be careful "
-"not to re-use a version number that you have already used for a previous "
-"upload.  For <literal>testing</literal>, there must be a higher version in "
-"<literal>unstable</literal>.  If there is none yet (for example, if "
-"<literal>testing</literal> and <literal>unstable</literal> have the same "
-"version) you must upload a new version to <literal>unstable</literal> first."
+"determine whether a particular bug was fixed.  Add "
+"<literal>closes:</literal> statements for any <emphasis "
+"role=\"strong\">Debian bugs</emphasis> filed.  Always include an external "
+"reference, preferably a <emphasis role=\"strong\">CVE identifier</emphasis>, "
+"so that it can be cross-referenced. However, if a CVE identifier has not yet "
+"been assigned, do not wait for it but continue the process. The identifier "
+"can be cross-referenced later."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1119
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1141

 msgid ""
 msgid ""

-"Do not make source-only uploads if your package has any binary-all packages "
-"(do not use the <literal>-S</literal> option to "
-"<command>dpkg-buildpackage</command>).  The <command>buildd</command> "
-"infrastructure will not build those.  This point applies to normal package "
-"uploads as well."
+"Make sure the <emphasis role=\"strong\">version number</emphasis> is "
+"proper.  It must be greater than the current package, but less than package "
+"versions in later distributions.  If in doubt, test it with <literal>dpkg "
+"--compare-versions</literal>.  Be careful not to re-use a version number "
+"that you have already used for a previous upload, or one that conflicts with "
+"a binNMU. The convention is to append "
+"<literal>+</literal><replaceable>codename</replaceable><literal>1</literal>, "
+"e.g.  <literal>1:2.4.3-4+etch1</literal>, of course increasing 1 for any "
+"subsequent uploads."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1128
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1154

 msgid ""
 "Unless the upstream source has been uploaded to <literal>security.debian.org "
 msgid ""
 "Unless the upstream source has been uploaded to <literal>security.debian.org "

-"</literal> before (by a previous security update), build the upload with "
-"full upstream source (<literal>dpkg-buildpackage -sa</literal>).  If there "
-"has been a previous upload to <literal>security.debian.org</literal> with "
-"the same upstream version, you may upload without upstream source (<literal> "
-"dpkg-buildpackage -sd</literal>)."
+"</literal> before (by a previous security update), build the upload "
+"<emphasis role=\"strong\">with full upstream source</emphasis> "
+"(<literal>dpkg-buildpackage -sa</literal>).  If there has been a previous "
+"upload to <literal>security.debian.org</literal> with the same upstream "
+"version, you may upload without upstream source (<literal> dpkg-buildpackage "
+"-sd</literal>)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1138
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1164

 msgid ""
 msgid ""

-"Be sure to use the exact same <filename>*.orig.tar.gz</filename> as used in "
-"the normal archive, otherwise it is not possible to move the security fix "
-"into the main archives later."
+"Be sure to use the <emphasis role=\"strong\">exact same "
+"<filename>*.orig.tar.{gz,bz2}</filename></emphasis> as used in the normal "
+"archive, otherwise it is not possible to move the security fix into the main "
+"archives later."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1145
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1172

 msgid ""
 msgid ""

-"Build the package on a clean system which only has packages installed from "
-"the distribution you are building for.  If you do not have such a system "
-"yourself, you can use a debian.org machine (see <xref "
-"linkend=\"server-machines\"/> ) or setup a chroot (see <xref "
-"linkend=\"pbuilder\"/> and <xref linkend=\"debootstrap\"/> )."
+"Build the package on a <emphasis role=\"strong\">clean system</emphasis> "
+"which only has packages installed from the distribution you are building "
+"for. If you do not have such a system yourself, you can use a debian.org "
+"machine (see <xref linkend=\"server-machines\"/> ) or setup a chroot (see "
+"<xref linkend=\"pbuilder\"/> and <xref linkend=\"debootstrap\"/> )."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1156
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1183

 msgid "Uploading the fixed package"
 msgstr ""
 
 msgid "Uploading the fixed package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1158
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1185

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 "upload queue (<literal>oldstable-security</literal>, "
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 "upload queue (<literal>oldstable-security</literal>, "


@@ -1550,8 +1580,8 @@ msgid ""
 "unwanted upload."
 msgstr ""
 
 "unwanted upload."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1165
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1192

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload your fix to <literal> "
 "proposed-updates</literal> without coordinating with the security team.  "
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload your fix to <literal> "
 "proposed-updates</literal> without coordinating with the security team.  "


@@ -1563,8 +1593,8 @@ msgid ""
 "package instead."
 msgstr ""
 
 "package instead."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1175
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1202

 msgid ""
 "Once you have created and tested the new package and it has been approved by "
 "the security team, it needs to be uploaded so that it can be installed in "
 msgid ""
 "Once you have created and tested the new package and it has been approved by "
 "the security team, it needs to be uploaded so that it can be installed in "


@@ -1573,24 +1603,24 @@ msgid ""
 "."
 msgstr ""
 
 "."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1181
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1208

 msgid ""
 "Once an upload to the security queue has been accepted, the package will "
 msgid ""
 "Once an upload to the security queue has been accepted, the package will "

-"automatically be rebuilt for all architectures and stored for verification "
-"by the security team."
+"automatically be built for all architectures and stored for verification by "
+"the security team."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1186
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1213

 msgid ""
 "Uploads which are waiting for acceptance or verification are only accessible "
 "by the security team.  This is necessary since there might be fixes for "
 "security problems that cannot be disclosed yet."
 msgstr ""
 
 msgid ""
 "Uploads which are waiting for acceptance or verification are only accessible "
 "by the security team.  This is necessary since there might be fixes for "
 "security problems that cannot be disclosed yet."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1191
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1218

 msgid ""
 "If a member of the security team accepts a package, it will be installed on "
 "<literal>security.debian.org</literal> as well as proposed for the proper "
 msgid ""
 "If a member of the security team accepts a package, it will be installed on "
 "<literal>security.debian.org</literal> as well as proposed for the proper "


@@ -1598,60 +1628,56 @@ msgid ""
 "on <literal>&ftp-master-host;</literal>."
 msgstr ""
 
 "on <literal>&ftp-master-host;</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:1203
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:1230

 msgid "Moving, removing, renaming, adopting, and orphaning packages"
 msgstr ""
 
 msgid "Moving, removing, renaming, adopting, and orphaning packages"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1205
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:1232

 msgid ""
 "Some archive manipulation operations are not automated in the Debian upload "
 "process.  These procedures should be manually followed by maintainers.  This "
 "chapter gives guidelines on what to do in these cases."
 msgstr ""
 
 msgid ""
 "Some archive manipulation operations are not automated in the Debian upload "
 "process.  These procedures should be manually followed by maintainers.  This "
 "chapter gives guidelines on what to do in these cases."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1210
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1237

 msgid "Moving packages"
 msgstr ""
 
 msgid "Moving packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para><footnote>
-#: pkgs.dbk:1212
-msgid ""
-"Sometimes a package will change its section.  For instance, a package from "
-"the `non-free' section might be GPL'd in a later version, in which case the "
-"package should be moved to `main' or `contrib'.<footnote>"
-msgstr ""
-
-# type: Content of: <chapter><section><section><para><footnote><para>
-#: pkgs.dbk:1214
+#. type: Content of: <chapter><section><section><para><footnote><para>
+#: pkgs.dbk:1241

 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "guidelines on what section a package belongs in."
 msgstr ""
 
 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "guidelines on what section a package belongs in."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1216 pkgs.dbk:1648
-msgid "</footnote>"
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1239
+msgid ""
+"Sometimes a package will change its section.  For instance, a package from "
+"the `non-free' section might be GPL'd in a later version, in which case the "
+"package should be moved to `main' or `contrib'.<placeholder "
+"type=\"footnote\" id=\"0\"/>"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1219
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1246

 msgid ""
 "If you need to change the section for one of your packages, change the "
 "package control information to place the package in the desired section, and "
 "re-upload the package (see the <ulink url=\"&url-debian-policy;\">Debian "
 "Policy Manual</ulink> for details).  You must ensure that you include the "
 msgid ""
 "If you need to change the section for one of your packages, change the "
 "package control information to place the package in the desired section, and "
 "re-upload the package (see the <ulink url=\"&url-debian-policy;\">Debian "
 "Policy Manual</ulink> for details).  You must ensure that you include the "

-"<filename>.orig.tar.gz</filename> in your upload (even if you are not "
+"<filename>.orig.tar.{gz,bz2}</filename> in your upload (even if you are not "

 "uploading a new upstream version), or it will not appear in the new section "
 "together with the rest of the package.  If your new section is valid, it "
 "will be moved automatically.  If it does not, then contact the ftpmasters in "
 "order to understand what happened."
 msgstr ""
 
 "uploading a new upstream version), or it will not appear in the new section "
 "together with the rest of the package.  If your new section is valid, it "
 "will be moved automatically.  If it does not, then contact the ftpmasters in "
 "order to understand what happened."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1231
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1258

 msgid ""
 "If, on the other hand, you need to change the <literal>subsection</literal> "
 "of one of your packages (e.g., ``devel'', ``admin''), the procedure is "
 msgid ""
 "If, on the other hand, you need to change the <literal>subsection</literal> "
 "of one of your packages (e.g., ``devel'', ``admin''), the procedure is "


@@ -1660,13 +1686,13 @@ msgid ""
 "updated, as described in <xref linkend=\"override-file\"/> ."
 msgstr ""
 
 "updated, as described in <xref linkend=\"override-file\"/> ."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1240
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1267

 msgid "Removing packages"
 msgstr ""
 
 msgid "Removing packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1242
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1269

 msgid ""
 "If for some reason you want to completely remove a package (say, if it is an "
 "old compatibility library which is no longer required), you need to file a "
 msgid ""
 "If for some reason you want to completely remove a package (say, if it is an "
 "old compatibility library which is no longer required), you need to file a "


@@ -1684,8 +1710,8 @@ msgid ""
 "<literal> ftp.debian.org</literal> pseudo-package."
 msgstr ""
 
 "<literal> ftp.debian.org</literal> pseudo-package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1259
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1286

 msgid ""
 "If you want to remove a package you maintain, you should note this in the "
 "bug title by prepending <literal>ROM</literal> (Request Of Maintainer).  "
 msgid ""
 "If you want to remove a package you maintain, you should note this in the "
 "bug title by prepending <literal>ROM</literal> (Request Of Maintainer).  "


@@ -1696,8 +1722,8 @@ msgid ""
 "requests."
 msgstr ""
 
 "requests."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1268
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1295

 msgid ""
 "Note that removals can only be done for the <literal>unstable </literal>, "
 "<literal>experimental</literal> and <literal>stable </literal> "
 msgid ""
 "Note that removals can only be done for the <literal>unstable </literal>, "
 "<literal>experimental</literal> and <literal>stable </literal> "


@@ -1707,8 +1733,8 @@ msgid ""
 "<literal>testing </literal> depends on it."
 msgstr ""
 
 "<literal>testing </literal> depends on it."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1277
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1304

 msgid ""
 "There is one exception when an explicit removal request is not necessary: If "
 "a (source or binary) package is an orphan, it will be removed "
 msgid ""
 "There is one exception when an explicit removal request is not necessary: If "
 "a (source or binary) package is an orphan, it will be removed "


@@ -1719,8 +1745,8 @@ msgid ""
 "refers to have been taken over by another source package."
 msgstr ""
 
 "refers to have been taken over by another source package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1286
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1313

 msgid ""
 "In your removal request, you have to detail the reasons justifying the "
 "request.  This is to avoid unwanted removals and to keep a trace of why a "
 msgid ""
 "In your removal request, you have to detail the reasons justifying the "
 "request.  This is to avoid unwanted removals and to keep a trace of why a "


@@ -1728,8 +1754,8 @@ msgid ""
 "package that supersedes the one to be removed."
 msgstr ""
 
 "package that supersedes the one to be removed."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1292
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1319

 msgid ""
 "Usually you only ask for the removal of a package maintained by yourself.  "
 "If you want to remove another package, you have to get the approval of its "
 msgid ""
 "Usually you only ask for the removal of a package maintained by yourself.  "
 "If you want to remove another package, you have to get the approval of its "


@@ -1741,8 +1767,8 @@ msgid ""
 "request."
 msgstr ""
 
 "request."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1302
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1329

 msgid ""
 "Further information relating to these and other package removal related "
 "topics may be found at <ulink "
 msgid ""
 "Further information relating to these and other package removal related "
 "topics may be found at <ulink "


@@ -1750,8 +1776,8 @@ msgid ""
 "url=\"&url-debian-qa;howto-remove.html\"></ulink>."
 msgstr ""
 
 "url=\"&url-debian-qa;howto-remove.html\"></ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1307
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1334

 msgid ""
 "If in doubt concerning whether a package is disposable, email "
 "&email-debian-devel; asking for opinions.  Also of interest is the "
 msgid ""
 "If in doubt concerning whether a package is disposable, email "
 "&email-debian-devel; asking for opinions.  Also of interest is the "


@@ -1767,23 +1793,27 @@ msgid ""
 "&email-debian-qa;."
 msgstr ""
 
 "&email-debian-qa;."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1320
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1347

 msgid ""
 "Once the package has been removed, the package's bugs should be handled.  "
 "They should either be reassigned to another package in the case where the "
 "actual code has evolved into another package (e.g.  "
 "<literal>libfoo12</literal> was removed because <literal>libfoo13</literal> "
 msgid ""
 "Once the package has been removed, the package's bugs should be handled.  "
 "They should either be reassigned to another package in the case where the "
 "actual code has evolved into another package (e.g.  "
 "<literal>libfoo12</literal> was removed because <literal>libfoo13</literal> "

-"supersedes it) or closed if the software is simply no longer part of Debian."
+"supersedes it) or closed if the software is simply no longer part of "
+"Debian.  When closing the bugs, to avoid marking the bugs as fixed in "
+"versions of the packages in previous Debian releases, they should be marked "
+"as fixed in the version "
+"<literal>&lt;most-recent-version-ever-in-Debian&gt;+rm</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1327
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1358

 msgid "Removing packages from <filename>Incoming</filename>"
 msgstr ""
 
 msgid "Removing packages from <filename>Incoming</filename>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1329
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1360

 msgid ""
 "In the past, it was possible to remove packages from "
 "<filename>incoming</filename>.  However, with the introduction of the new "
 msgid ""
 "In the past, it was possible to remove packages from "
 "<filename>incoming</filename>.  However, with the introduction of the new "


@@ -1796,13 +1826,13 @@ msgid ""
 "package should not occur too often anyway."
 msgstr ""
 
 "package should not occur too often anyway."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1344
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1375

 msgid "Replacing or renaming packages"
 msgstr ""
 
 msgid "Replacing or renaming packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1346
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1377

 msgid ""
 "When the upstream maintainers for one of your packages chose to rename their "
 "software (or you made a mistake naming your package), you should follow a "
 msgid ""
 "When the upstream maintainers for one of your packages chose to rename their "
 "software (or you made a mistake naming your package), you should follow a "


@@ -1819,8 +1849,8 @@ msgid ""
 "the package's bugs at the same time."
 msgstr ""
 
 "the package's bugs at the same time."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1362
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1393

 msgid ""
 "At other times, you may make a mistake in constructing your package and wish "
 "to replace it.  The only way to do this is to increase the version number "
 msgid ""
 "At other times, you may make a mistake in constructing your package and wish "
 "to replace it.  The only way to do this is to increase the version number "


@@ -1829,18 +1859,19 @@ msgid ""
 "sources: if you wish to replace the upstream source tarball of your package, "
 "you will need to upload it with a different version.  An easy possibility is "
 "to replace <filename>foo_1.00.orig.tar.gz</filename> with "
 "sources: if you wish to replace the upstream source tarball of your package, "
 "you will need to upload it with a different version.  An easy possibility is "
 "to replace <filename>foo_1.00.orig.tar.gz</filename> with "

-"<filename>foo_1.00+0.orig.tar.gz</filename>.  This restriction gives each "
+"<filename>foo_1.00+0.orig.tar.gz</filename> or "
+"<filename>foo_1.00.orig.tar.bz2</filename>.  This restriction gives each "

 "file on the ftp site a unique name, which helps to ensure consistency across "
 "the mirror network."
 msgstr ""
 
 "file on the ftp site a unique name, which helps to ensure consistency across "
 "the mirror network."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1376
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1408

 msgid "Orphaning a package"
 msgstr ""
 
 msgid "Orphaning a package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1378
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1410

 msgid ""
 "If you can no longer maintain a package, you need to inform others, and see "
 "that the package is marked as orphaned.  You should set the package "
 msgid ""
 "If you can no longer maintain a package, you need to inform others, and see "
 "that the package is marked as orphaned.  You should set the package "


@@ -1857,8 +1888,8 @@ msgid ""
 "subject won't indicate the bug number)."
 msgstr ""
 
 "subject won't indicate the bug number)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1393
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1425

 msgid ""
 "If you just intend to give the package away, but you can keep maintainership "
 "for the moment, then you should instead submit a bug against <systemitem "
 msgid ""
 "If you just intend to give the package away, but you can keep maintainership "
 "for the moment, then you should instead submit a bug against <systemitem "


@@ -1868,18 +1899,18 @@ msgid ""
 "<literal>Request For Adoption</literal>."
 msgstr ""
 
 "<literal>Request For Adoption</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1401
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1433

 msgid "More information is on the <ulink url=\"&url-wnpp;\">WNPP web pages</ulink>."
 msgstr ""
 
 msgid "More information is on the <ulink url=\"&url-wnpp;\">WNPP web pages</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1407
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1439

 msgid "Adopting a package"
 msgstr ""
 
 msgid "Adopting a package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1409
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1441

 msgid ""
 "A list of packages in need of a new maintainer is available in the <ulink "
 "url=\"&url-wnpp;\">Work-Needing and Prospective Packages list "
 msgid ""
 "A list of packages in need of a new maintainer is available in the <ulink "
 "url=\"&url-wnpp;\">Work-Needing and Prospective Packages list "


@@ -1888,8 +1919,8 @@ msgid ""
 "information and procedures."
 msgstr ""
 
 "information and procedures."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1416
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1448

 msgid ""
 "It is not OK to simply take over a package that you feel is neglected — that "
 "would be package hijacking.  You can, of course, contact the current "
 msgid ""
 "It is not OK to simply take over a package that you feel is neglected — that "
 "would be package hijacking.  You can, of course, contact the current "


@@ -1898,8 +1929,8 @@ msgid ""
 "<xref linkend=\"mia-qa\"/> ."
 msgstr ""
 
 "<xref linkend=\"mia-qa\"/> ."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1422
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1454

 msgid ""
 "Generally, you may not take over the package without the assent of the "
 "current maintainer.  Even if they ignore you, that is still not grounds to "
 msgid ""
 "Generally, you may not take over the package without the assent of the "
 "current maintainer.  Even if they ignore you, that is still not grounds to "


@@ -1911,8 +1942,8 @@ msgid ""
 "information)."
 msgstr ""
 
 "information)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1432
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1464

 msgid ""
 "If you take over an old package, you probably want to be listed as the "
 "package's official maintainer in the bug system.  This will happen "
 msgid ""
 "If you take over an old package, you probably want to be listed as the "
 "package's official maintainer in the bug system.  This will happen "


@@ -1924,13 +1955,13 @@ msgid ""
 "fact that they will continue to receive the bugs during that time."
 msgstr ""
 
 "fact that they will continue to receive the bugs during that time."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:1446
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:1478

 msgid "Porting and being ported"
 msgstr ""
 
 msgid "Porting and being ported"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1448
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:1480

 msgid ""
 "Debian supports an ever-increasing number of architectures.  Even if you are "
 "not a porter, and you don't use any architecture but one, it is part of your "
 msgid ""
 "Debian supports an ever-increasing number of architectures.  Even if you are "
 "not a porter, and you don't use any architecture but one, it is part of your "


@@ -1938,8 +1969,8 @@ msgid ""
 "if you are not a porter, you should read most of this chapter."
 msgstr ""
 
 "if you are not a porter, you should read most of this chapter."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1454
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:1486

 msgid ""
 "Porting is the act of building Debian packages for architectures that are "
 "different from the original architecture of the package maintainer's binary "
 msgid ""
 "Porting is the act of building Debian packages for architectures that are "
 "different from the original architecture of the package maintainer's binary "


@@ -1950,13 +1981,13 @@ msgid ""
 "architectures, amounting to &number-of-arches; more builds."
 msgstr ""
 
 "architectures, amounting to &number-of-arches; more builds."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1463
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1495

 msgid "Being kind to porters"
 msgstr ""
 
 msgid "Being kind to porters"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1465
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1497

 msgid ""
 "Porters have a difficult and unique task, since they are required to deal "
 "with a large volume of packages.  Ideally, every source package should build "
 msgid ""
 "Porters have a difficult and unique task, since they are required to deal "
 "with a large volume of packages.  Ideally, every source package should build "


@@ -1966,8 +1997,8 @@ msgid ""
 "jobs unnecessarily difficult."
 msgstr ""
 
 "jobs unnecessarily difficult."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1473
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1505

 msgid ""
 "The first and most important thing is to respond quickly to bug or issues "
 "raised by porters.  Please treat porters with courtesy, as if they were in "
 msgid ""
 "The first and most important thing is to respond quickly to bug or issues "
 "raised by porters.  Please treat porters with courtesy, as if they were in "


@@ -1976,16 +2007,16 @@ msgid ""
 "whatever the problem is."
 msgstr ""
 
 "whatever the problem is."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1480
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1512

 msgid ""
 "By far, most of the problems encountered by porters are caused by "
 "<emphasis>packaging bugs</emphasis> in the source packages.  Here is a "
 "checklist of things you should check or be aware of."
 msgstr ""
 
 msgid ""
 "By far, most of the problems encountered by porters are caused by "
 "<emphasis>packaging bugs</emphasis> in the source packages.  Here is a "
 "checklist of things you should check or be aware of."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1487
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1519

 msgid ""
 "Make sure that your <literal>Build-Depends</literal> and "
 "<literal>Build-Depends-Indep</literal> settings in "
 msgid ""
 "Make sure that your <literal>Build-Depends</literal> and "
 "<literal>Build-Depends-Indep</literal> settings in "


@@ -2002,22 +2033,22 @@ msgid ""
 "of the same name (see <xref linkend=\"pbuilder\"/> )."
 msgstr ""
 
 "of the same name (see <xref linkend=\"pbuilder\"/> )."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1502
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1534

 msgid ""
 "If you can't set up a proper chroot, <command>dpkg-depcheck</command> may be "
 "of assistance (see <xref linkend=\"dpkg-depcheck\"/> )."
 msgstr ""
 
 msgid ""
 "If you can't set up a proper chroot, <command>dpkg-depcheck</command> may be "
 "of assistance (see <xref linkend=\"dpkg-depcheck\"/> )."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1506
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1538

 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "instructions on setting build dependencies."
 msgstr ""
 
 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "instructions on setting build dependencies."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1512
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1544

 msgid ""
 "Don't set architecture to a value other than <literal>all</literal> or "
 "<literal>any</literal> unless you really mean it.  In too many cases, "
 msgid ""
 "Don't set architecture to a value other than <literal>all</literal> or "
 "<literal>any</literal> unless you really mean it.  In too many cases, "


@@ -2027,8 +2058,8 @@ msgid ""
 "<literal>amd64</literal>) is usually incorrect."
 msgstr ""
 
 "<literal>amd64</literal>) is usually incorrect."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1522
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1554

 msgid ""
 "Make sure your source package is correct.  Do <literal>dpkg-source -x "
 "<replaceable>package</replaceable>.dsc</literal> to make sure your source "
 msgid ""
 "Make sure your source package is correct.  Do <literal>dpkg-source -x "
 "<replaceable>package</replaceable>.dsc</literal> to make sure your source "


@@ -2036,8 +2067,8 @@ msgid ""
 "scratch with <command>dpkg-buildpackage</command>."
 msgstr ""
 
 "scratch with <command>dpkg-buildpackage</command>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1530
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1562

 msgid ""
 "Make sure you don't ship your source package with the "
 "<filename>debian/files</filename> or <filename>debian/substvars</filename> "
 msgid ""
 "Make sure you don't ship your source package with the "
 "<filename>debian/files</filename> or <filename>debian/substvars</filename> "


@@ -2045,8 +2076,8 @@ msgid ""
 "<filename>debian/rules</filename>."
 msgstr ""
 
 "<filename>debian/rules</filename>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1538
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1570

 msgid ""
 "Make sure you don't rely on locally installed or hacked configurations or "
 "programs.  For instance, you should never be calling programs in "
 msgid ""
 "Make sure you don't rely on locally installed or hacked configurations or "
 "programs.  For instance, you should never be calling programs in "


@@ -2055,8 +2086,8 @@ msgid ""
 "machine, even if it's the same architecture."
 msgstr ""
 
 "machine, even if it's the same architecture."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1547
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1579

 msgid ""
 "Don't depend on the package you're building being installed already (a "
 "sub-case of the above issue). There are, of course, exceptions to this rule, "
 msgid ""
 "Don't depend on the package you're building being installed already (a "
 "sub-case of the above issue). There are, of course, exceptions to this rule, "


@@ -2064,8 +2095,8 @@ msgid ""
 "be done by automated package builders."
 msgstr ""
 
 "be done by automated package builders."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1555
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1587

 msgid ""
 "Don't rely on the compiler being a certain version, if possible.  If not, "
 "then make sure your build dependencies reflect the restrictions, although "
 msgid ""
 "Don't rely on the compiler being a certain version, if possible.  If not, "
 "then make sure your build dependencies reflect the restrictions, although "


@@ -2073,8 +2104,8 @@ msgid ""
 "standardize on different compilers."
 msgstr ""
 
 "standardize on different compilers."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1563
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1595

 msgid ""
 "Make sure your debian/rules contains separate <literal>binary-arch</literal> "
 "and <literal>binary-indep</literal> targets, as the Debian Policy Manual "
 msgid ""
 "Make sure your debian/rules contains separate <literal>binary-arch</literal> "
 "and <literal>binary-indep</literal> targets, as the Debian Policy Manual "


@@ -2083,13 +2114,13 @@ msgid ""
 "try to run <command>dpkg-buildpackage -B</command>."
 msgstr ""
 
 "try to run <command>dpkg-buildpackage -B</command>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1574
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1606

 msgid "Guidelines for porter uploads"
 msgstr ""
 
 msgid "Guidelines for porter uploads"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1576
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1608

 msgid ""
 "If the package builds out of the box for the architecture to be ported to, "
 "you are in luck and your job is easy.  This section applies to that case; it "
 msgid ""
 "If the package builds out of the box for the architecture to be ported to, "
 "you are in luck and your job is easy.  This section applies to that case; it "


@@ -2099,16 +2130,16 @@ msgid ""
 "source NMU, so consult <xref linkend=\"nmu-guidelines\"/> instead."
 msgstr ""
 
 "source NMU, so consult <xref linkend=\"nmu-guidelines\"/> instead."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1584
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1616

 msgid ""
 "For a porter upload, no changes are being made to the source.  You do not "
 "need to touch any of the files in the source package.  This includes "
 "<filename>debian/changelog</filename>."
 msgstr ""
 
 msgid ""
 "For a porter upload, no changes are being made to the source.  You do not "
 "need to touch any of the files in the source package.  This includes "
 "<filename>debian/changelog</filename>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1589
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1621

 msgid ""
 "The way to invoke <command>dpkg-buildpackage</command> is as "
 "<literal>dpkg-buildpackage -B "
 msgid ""
 "The way to invoke <command>dpkg-buildpackage</command> is as "
 "<literal>dpkg-buildpackage -B "


@@ -2119,8 +2150,8 @@ msgid ""
 "<filename>debian/rules </filename>."
 msgstr ""
 
 "<filename>debian/rules </filename>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1598
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1630

 msgid ""
 "If you are working on a Debian machine for your porting efforts and you need "
 "to sign your upload locally for its acceptance in the archive, you can run "
 msgid ""
 "If you are working on a Debian machine for your porting efforts and you need "
 "to sign your upload locally for its acceptance in the archive, you can run "


@@ -2129,13 +2160,13 @@ msgid ""
 "<command>dpkg-sig</command>."
 msgstr ""
 
 "<command>dpkg-sig</command>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1605
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1637

 msgid "Recompilation or binary-only NMU"
 msgstr ""
 
 msgid "Recompilation or binary-only NMU"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1607
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1639

 msgid ""
 "Sometimes the initial porter upload is problematic because the environment "
 "in which the package was built was not good enough (outdated or obsolete "
 msgid ""
 "Sometimes the initial porter upload is problematic because the environment "
 "in which the package was built was not good enough (outdated or obsolete "


@@ -2146,8 +2177,8 @@ msgid ""
 "version number greater than the currently available one)."
 msgstr ""
 
 "version number greater than the currently available one)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1616
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1648

 msgid ""
 "You have to make sure that your binary-only NMU doesn't render the package "
 "uninstallable.  This could happen when a source package generates "
 msgid ""
 "You have to make sure that your binary-only NMU doesn't render the package "
 "uninstallable.  This could happen when a source package generates "


@@ -2156,16 +2187,16 @@ msgid ""
 "</literal>."
 msgstr ""
 
 "</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1623
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1655

 msgid ""
 "Despite the required modification of the changelog, these are called "
 "binary-only NMUs — there is no need in this case to trigger all other "
 "architectures to consider themselves out of date or requiring recompilation."
 msgstr ""
 
 msgid ""
 "Despite the required modification of the changelog, these are called "
 "binary-only NMUs — there is no need in this case to trigger all other "
 "architectures to consider themselves out of date or requiring recompilation."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1628
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1660

 msgid ""
 "Such recompilations require special ``magic'' version numbering, so that the "
 "archive maintenance tools recognize that, even though there is a new Debian "
 msgid ""
 "Such recompilations require special ``magic'' version numbering, so that the "
 "archive maintenance tools recognize that, even though there is a new Debian "


@@ -2174,8 +2205,18 @@ msgid ""
 "corresponding source code)."
 msgstr ""
 
 "corresponding source code)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para><footnote>
-#: pkgs.dbk:1635
+#. type: Content of: <chapter><section><section><section><para><footnote><para>
+#: pkgs.dbk:1675
+msgid ""
+"In the past, such NMUs used the third-level number on the Debian part of the "
+"revision to denote their recompilation-only status; however, this syntax was "
+"ambiguous with native packages and did not allow proper ordering of "
+"recompile-only NMUs, source NMUs, and security NMUs on the same package, and "
+"has therefore been abandoned in favor of this new syntax."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1667

 msgid ""
 "The ``magic'' for a recompilation-only NMU is triggered by using a suffix "
 "appended to the package version number, following the form <literal> "
 msgid ""
 "The ``magic'' for a recompilation-only NMU is triggered by using a suffix "
 "appended to the package version number, following the form <literal> "


@@ -2184,34 +2225,25 @@ msgid ""
 "your binary-only NMU should carry a version of <literal>2.9-3+b1</literal>.  "
 "If the latest version was <literal>3.4+b1 </literal> (i.e, a native package "
 "with a previous recompilation NMU), your binary-only NMU should have a "
 "your binary-only NMU should carry a version of <literal>2.9-3+b1</literal>.  "
 "If the latest version was <literal>3.4+b1 </literal> (i.e, a native package "
 "with a previous recompilation NMU), your binary-only NMU should have a "

-"version number of <literal>3.4+b2</literal>.  <footnote>"
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para><footnote><para>
-#: pkgs.dbk:1643
-msgid ""
-"In the past, such NMUs used the third-level number on the Debian part of the "
-"revision to denote their recompilation-only status; however, this syntax was "
-"ambiguous with native packages and did not allow proper ordering of "
-"recompile-only NMUs, source NMUs, and security NMUs on the same package, and "
-"has therefore been abandoned in favor of this new syntax."
+"version number of <literal>3.4+b2</literal>.  <placeholder type=\"footnote\" "
+"id=\"0\"/>"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1651
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1683

 msgid ""
 "Similar to initial porter uploads, the correct way of invoking "
 "<command>dpkg-buildpackage</command> is <literal>dpkg-buildpackage "
 "-B</literal> to only build the architecture-dependent parts of the package."
 msgstr ""
 
 msgid ""
 "Similar to initial porter uploads, the correct way of invoking "
 "<command>dpkg-buildpackage</command> is <literal>dpkg-buildpackage "
 "-B</literal> to only build the architecture-dependent parts of the package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1658
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1690

 msgid "When to do a source NMU if you are a porter"
 msgstr ""
 
 msgid "When to do a source NMU if you are a porter"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1660
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1692

 msgid ""
 "Porters doing a source NMU generally follow the guidelines found in <xref "
 "linkend=\"nmu\"/> , just like non-porters.  However, it is expected that the "
 msgid ""
 "Porters doing a source NMU generally follow the guidelines found in <xref "
 "linkend=\"nmu\"/> , just like non-porters.  However, it is expected that the "


@@ -2223,8 +2255,8 @@ msgid ""
 "architectures are candidates."
 msgstr ""
 
 "architectures are candidates."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1669
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1701

 msgid ""
 "If you are a porter doing an NMU for <literal>unstable</literal>, the above "
 "guidelines for porting should be followed, with two variations.  Firstly, "
 msgid ""
 "If you are a porter doing an NMU for <literal>unstable</literal>, the above "
 "guidelines for porting should be followed, with two variations.  Firstly, "


@@ -2238,8 +2270,8 @@ msgid ""
 "with the appropriate release team first."
 msgstr ""
 
 "with the appropriate release team first."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1681
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1713

 msgid ""
 "Secondly, porters doing source NMUs should make sure that the bug they "
 "submit to the BTS should be of severity <literal>serious</literal> or "
 msgid ""
 "Secondly, porters doing source NMUs should make sure that the bug they "
 "submit to the BTS should be of severity <literal>serious</literal> or "


@@ -2249,8 +2281,8 @@ msgid ""
 "architectures in order to comply with many licenses."
 msgstr ""
 
 "architectures in order to comply with many licenses."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1689
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1721

 msgid ""
 "Porters should try to avoid patches which simply kludge around bugs in the "
 "current version of the compile environment, kernel, or libc.  Sometimes such "
 msgid ""
 "Porters should try to avoid patches which simply kludge around bugs in the "
 "current version of the compile environment, kernel, or libc.  Sometimes such "


@@ -2260,8 +2292,8 @@ msgid ""
 "problems have been fixed."
 msgstr ""
 
 "problems have been fixed."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1697
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1729

 msgid ""
 "Porters may also have an unofficial location where they can put the results "
 "of their work during the waiting period.  This helps others running the port "
 msgid ""
 "Porters may also have an unofficial location where they can put the results "
 "of their work during the waiting period.  This helps others running the port "


@@ -2269,13 +2301,13 @@ msgid ""
 "course, such locations have no official blessing or status, so buyer beware."
 msgstr ""
 
 "course, such locations have no official blessing or status, so buyer beware."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1707
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1739

 msgid "Porting infrastructure and automation"
 msgstr ""
 
 msgid "Porting infrastructure and automation"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1709
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1741

 msgid ""
 "There is infrastructure and several tools to help automate package porting.  "
 "This section contains a brief overview of this automation and porting to "
 msgid ""
 "There is infrastructure and several tools to help automate package porting.  "
 "This section contains a brief overview of this automation and porting to "


@@ -2283,20 +2315,20 @@ msgid ""
 "information."
 msgstr ""
 
 "information."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1714
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1746

 msgid "Mailing lists and web pages"
 msgstr ""
 
 msgid "Mailing lists and web pages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1716
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1748

 msgid ""
 "Web pages containing the status of each port can be found at <ulink "
 "url=\"&url-debian-ports;\"></ulink>."
 msgstr ""
 
 msgid ""
 "Web pages containing the status of each port can be found at <ulink "
 "url=\"&url-debian-ports;\"></ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1720
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1752

 msgid ""
 "Each port of Debian has a mailing list.  The list of porting mailing lists "
 "can be found at <ulink url=\"&url-debian-port-lists;\"></ulink>.  These "
 msgid ""
 "Each port of Debian has a mailing list.  The list of porting mailing lists "
 "can be found at <ulink url=\"&url-debian-port-lists;\"></ulink>.  These "


@@ -2304,25 +2336,25 @@ msgid ""
 "port with the porters."
 msgstr ""
 
 "port with the porters."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1728
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1760

 msgid "Porter tools"
 msgstr ""
 
 msgid "Porter tools"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1730
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1762

 msgid ""
 "Descriptions of several porting tools can be found in <xref "
 "linkend=\"tools-porting\"/> ."
 msgstr ""
 
 msgid ""
 "Descriptions of several porting tools can be found in <xref "
 "linkend=\"tools-porting\"/> ."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1736
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1768

 msgid "<systemitem role=\"package\">wanna-build</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">wanna-build</systemitem>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1738
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1770

 msgid ""
 "The <systemitem role=\"package\">wanna-build</systemitem> system is used as "
 "a distributed, client-server build distribution system.  It is usually used "
 msgid ""
 "The <systemitem role=\"package\">wanna-build</systemitem> system is used as "
 "a distributed, client-server build distribution system.  It is usually used "


@@ -2333,8 +2365,8 @@ msgid ""
 "packages that need to be built."
 msgstr ""
 
 "packages that need to be built."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1746
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1778

 msgid ""
 "<systemitem role=\"package\">wanna-build</systemitem> is not yet available "
 "as a package; however, all Debian porting efforts are using it for automated "
 msgid ""
 "<systemitem role=\"package\">wanna-build</systemitem> is not yet available "
 "as a package; however, all Debian porting efforts are using it for automated "


@@ -2345,8 +2377,8 @@ msgid ""
 "close enough to reproduce problems."
 msgstr ""
 
 "close enough to reproduce problems."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1755
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1787

 msgid ""
 "Most of the data produced by <systemitem role=\"package\">wanna-build "
 "</systemitem> which is generally useful to porters is available on the web "
 msgid ""
 "Most of the data produced by <systemitem role=\"package\">wanna-build "
 "</systemitem> which is generally useful to porters is available on the web "


@@ -2354,8 +2386,8 @@ msgid ""
 "statistics, queueing information and logs for build attempts."
 msgstr ""
 
 "statistics, queueing information and logs for build attempts."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1761
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1793

 msgid ""
 "We are quite proud of this system, since it has so many possible uses.  "
 "Independent development groups can use the system for different sub-flavors "
 msgid ""
 "We are quite proud of this system, since it has so many possible uses.  "
 "Independent development groups can use the system for different sub-flavors "


@@ -2364,20 +2396,29 @@ msgid ""
 "will also enable Debian to recompile entire distributions quickly."
 msgstr ""
 
 "will also enable Debian to recompile entire distributions quickly."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1768
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1800

 msgid ""
 msgid ""

-"The buildds admins of each arch can be contacted at the mail address "
-"<literal><replaceable>arch</replaceable>@buildd.debian.org</literal>."
+"The wanna-build team, in charge of the buildds, can be reached at "
+"<literal>debian-wb-team@lists.debian.org</literal>.  To determine who "
+"(wanna-build team, release team) and how (mail, BTS)  to contact, refer to "
+"<ulink url=\"&url-wb-team;\"></ulink>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1776
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1807
+msgid ""
+"When requesting binNMUs or give-backs (retries after a failed build), please "
+"use the format described at <ulink url=\"&url-release-wb;\"/>."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1816

 msgid "When your package is <emphasis>not</emphasis> portable"
 msgstr ""
 
 msgid "When your package is <emphasis>not</emphasis> portable"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1778
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1818

 msgid ""
 "Some packages still have issues with building and/or working on some of the "
 "architectures supported by Debian, and cannot be ported at all, or not "
 msgid ""
 "Some packages still have issues with building and/or working on some of the "
 "architectures supported by Debian, and cannot be ported at all, or not "


@@ -2387,15 +2428,15 @@ msgid ""
 "supported on all architectures."
 msgstr ""
 
 "supported on all architectures."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1785
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1825

 msgid ""
 "In order to prevent broken packages from being uploaded to the archive, and "
 "wasting buildd time, you need to do a few things:"
 msgstr ""
 
 msgid ""
 "In order to prevent broken packages from being uploaded to the archive, and "
 "wasting buildd time, you need to do a few things:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1791
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1831

 msgid ""
 "First, make sure your package <emphasis>does</emphasis> fail to build on "
 "architectures that it cannot support.  There are a few ways to achieve "
 msgid ""
 "First, make sure your package <emphasis>does</emphasis> fail to build on "
 "architectures that it cannot support.  There are a few ways to achieve "


@@ -2406,8 +2447,8 @@ msgid ""
 "required functionality is available."
 msgstr ""
 
 "required functionality is available."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1799
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1839

 msgid ""
 "Additionally, if you believe the list of supported architectures is pretty "
 "constant, you should change <literal>any</literal> to a list of supported "
 msgid ""
 "Additionally, if you believe the list of supported architectures is pretty "
 "constant, you should change <literal>any</literal> to a list of supported "


@@ -2415,19 +2456,18 @@ msgid ""
 "will fail also, and indicate this to a human reader without actually trying."
 msgstr ""
 
 "will fail also, and indicate this to a human reader without actually trying."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1807
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1847

 msgid ""
 "In order to prevent autobuilders from needlessly trying to build your "
 "package, it must be included in <filename>packages-arch-specific</filename>, "
 "a list used by the <command>wanna-build</command> script.  The current "
 msgid ""
 "In order to prevent autobuilders from needlessly trying to build your "
 "package, it must be included in <filename>packages-arch-specific</filename>, "
 "a list used by the <command>wanna-build</command> script.  The current "

-"version is available as <ulink "
-"url=\"&url-cvsweb;srcdep/Packages-arch-specific?cvsroot=dak\"></ulink>; "
-"please see the top of the file for whom to contact for changes."
+"version is available as <ulink url=\"&url-buildd-p-a-s;\"/>; please see the "
+"top of the file for whom to contact for changes."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1817
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1856

 msgid ""
 "Please note that it is insufficient to only add your package to "
 "Packages-arch-specific without making it fail to build on unsupported "
 msgid ""
 "Please note that it is insufficient to only add your package to "
 "Packages-arch-specific without making it fail to build on unsupported "


@@ -2438,468 +2478,412 @@ msgid ""
 "role=\"package\">ftp.debian.org</systemitem>"
 msgstr ""
 
 "role=\"package\">ftp.debian.org</systemitem>"
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:1830
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:1869

 msgid "Non-Maintainer Uploads (NMUs)"
 msgstr ""
 
 msgid "Non-Maintainer Uploads (NMUs)"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1832
-msgid ""
-"Under certain circumstances it is necessary for someone other than the "
-"official package maintainer to make a release of a package.  This is called "
-"a non-maintainer upload, or NMU."
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1837
-msgid ""
-"This section handles only source NMUs, i.e.  NMUs which upload a new version "
-"of the package.  For binary-only NMUs by porters or QA members, please see "
-"<xref linkend=\"binary-only-nmu\"/> .  If a buildd builds and uploads a "
-"package, that too is strictly speaking a binary NMU.  See <xref "
-"linkend=\"wanna-build\"/> for some more information."
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1844
-msgid ""
-"The main reason why NMUs are done is when a developer needs to fix another "
-"developer's package in order to address serious problems or crippling bugs "
-"or when the package maintainer is unable to release a fix in a timely "
-"fashion."
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1849
-msgid ""
-"First and foremost, it is critical that NMU patches to source should be as "
-"non-disruptive as possible.  Do not do housekeeping tasks, do not change the "
-"name of modules or files, do not move directories; in general, do not fix "
-"things which are not broken.  Keep the patch as small as possible.  If "
-"things bother you aesthetically, talk to the Debian maintainer, talk to the "
-"upstream maintainer, or submit a bug.  However, aesthetic changes must "
-"<emphasis>not</emphasis> be made in a non-maintainer upload."
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1858
-msgid ""
-"And please remember the Hippocratic Oath: Above all, do no harm.  It is "
-"better to leave a package with an open grave bug than applying a "
-"non-functional patch, or one that hides the bug instead of resolving it."
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1863
-msgid "How to do a NMU"
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1865
-msgid ""
-"NMUs which fix important, serious or higher severity bugs are encouraged and "
-"accepted.  You should endeavor to reach the current maintainer of the "
-"package; they might be just about to upload a fix for the problem, or have a "
-"better solution."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><para>

 #: pkgs.dbk:1871
 msgid ""
 #: pkgs.dbk:1871
 msgid ""

-"NMUs should be made to assist a package's maintainer in resolving bugs.  "
-"Maintainers should be thankful for that help, and NMUers should respect the "
-"decisions of maintainers, and try to personally help the maintainer by their "
-"work."
+"Every package has one or more maintainers. Normally, these are the people "
+"who work on and upload new versions of the package. In some situations, it "
+"is useful that other developers can upload a new version as well, for "
+"example if they want to fix a bug in a package they don't maintain, when the "
+"maintainer needs help to respond to issues.  Such uploads are called "
+"<emphasis>Non-Maintainer Uploads (NMU)</emphasis>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1877
-msgid ""
-"A NMU should follow all conventions, written down in this section.  For an "
-"upload to <literal>testing</literal> or <literal>unstable</literal>, this "
-"order of steps is recommended:"
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1880
+msgid "When and how to do an NMU"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1884
-msgid ""
-"Make sure that the package's bugs that the NMU is meant to address are all "
-"filed in the Debian Bug Tracking System (BTS).  If they are not, submit them "
-"immediately."
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1883
+msgid "Before doing an NMU, consider the following questions:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1891
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1888

 msgid ""
 msgid ""

-"Wait a few days for the response from the maintainer.  If you don't get any "
-"response, you may want to help them by sending the patch that fixes the "
-"bug.  Don't forget to tag the bug with the patch keyword."
+"Does your NMU really fix bugs? Fixing cosmetic issues or changing the "
+"packaging style in NMUs is discouraged."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1898
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1894

 msgid ""
 msgid ""

-"Wait a few more days.  If you still haven't got an answer from the "
-"maintainer, send them a mail announcing your intent to NMU the package.  "
-"Prepare an NMU as described in this section, and test it carefully on your "
-"machine (cf.  <xref linkend=\"sanitycheck\"/> ).  Double check that your "
-"patch doesn't have any unexpected side effects.  Make sure your patch is as "
-"small and as non-disruptive as it can be."
+"Did you give enough time to the maintainer? When was the bug reported to the "
+"BTS? Being busy for a week or two isn't unusual.  Is the bug so severe that "
+"it needs to be fixed right now, or can it wait a few more days?"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1908
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1901

 msgid ""
 msgid ""

-"Upload your package to incoming in <filename>DELAYED/7-day</filename> (cf.  "
-"<xref linkend=\"delayed-incoming\"/> ), send the final patch to the "
-"maintainer via the BTS, and explain to them that they have 7 days to react "
-"if they want to cancel the NMU."
+"How confident are you about your changes? Please remember the Hippocratic "
+"Oath: \"Above all, do no harm.\" It is better to leave a package with an "
+"open grave bug than applying a non-functional patch, or one that hides the "
+"bug instead of resolving it. If you are not 100% sure of what you did, it "
+"might be a good idea to seek advice from others. Remember that if you break "
+"something in your NMU, many people will be very unhappy about it."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1916
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1911

 msgid ""
 msgid ""

-"Follow what happens, you're responsible for any bug that you introduced with "
-"your NMU.  You should probably use <xref linkend=\"pkg-tracking-system\"/> "
-"(PTS)  to stay informed of the state of the package after your NMU."
+"Have you clearly expressed your intention to NMU, at least in the BTS? It is "
+"also a good idea to try to contact the maintainer by other means (private "
+"email, IRC)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1923
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1918

 msgid ""
 msgid ""

-"At times, the release manager or an organized group of developers can "
-"announce a certain period of time in which the NMU rules are relaxed.  This "
-"usually involves shortening the period during which one is to wait before "
-"uploading the fixes, and shortening the DELAYED period.  It is important to "
-"notice that even in these so-called bug squashing party times, the NMU'er "
-"has to file bugs and contact the developer first, and act later.  Please see "
-"<xref linkend=\"qa-bsp\"/> for details."
+"If the maintainer is usually active and responsive, have you tried to "
+"contact him? In general it should be considered preferable that a maintainer "
+"takes care of an issue himself and that he is given the chance to review and "
+"correct your patch, because he can be expected to be more aware of potential "
+"issues which an NMUer might miss. It is often a better use of everyone's "
+"time if the maintainer is given an opportunity to upload a fix on their own."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1932
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1928

 msgid ""
 msgid ""

-"For the <literal>testing</literal> distribution, the rules may be changed by "
-"the release managers.  Please take additional care, and acknowledge that the "
-"usual way for a package to enter <literal>testing</literal> is through "
-"<literal>unstable</literal>."
+"When doing an NMU, you must first make sure that your intention to NMU is "
+"clear.  Then, you must send a patch with the differences between the current "
+"package and your proposed NMU to the BTS. The <literal>nmudiff</literal> "
+"script in the <literal>devscripts</literal> package might be helpful."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1938
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1935

 msgid ""
 msgid ""

-"For the stable distribution, please take extra care.  Of course, the release "
-"managers may also change the rules here.  Please verify before you upload "
-"that all your changes are OK for inclusion into the next stable release by "
-"the release manager."
+"While preparing the patch, you should better be aware of any "
+"package-specific practices that the maintainer might be using. Taking them "
+"into account reduces the burden of getting your changes integrated back in "
+"the normal package workflow and thus increases the possibilities that that "
+"will happen. A good place where to look for for possible package-specific "
+"practices is <ulink "
+"url=\"&url-debian-policy;ch-source.html#s-readmesource\"><literal>debian/README.source</literal></ulink>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1944
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1943

 msgid ""
 msgid ""

-"When a security bug is detected, the security team may do an NMU, using "
-"their own rules.  Please refer to <xref linkend=\"bug-security\"/> for more "
-"information."
+"Unless you have an excellent reason not to do so, you must then give some "
+"time to the maintainer to react (for example, by uploading to the "
+"<literal>DELAYED</literal> queue).  Here are some recommended values to use "
+"for delays:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1949
-msgid ""
-"For the differences for Porters NMUs, please see <xref "
-"linkend=\"source-nmu-when-porter\"/> ."
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1950
+msgid "Upload fixing only release-critical bugs older than 7 days: 2 days"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1953
-msgid ""
-"Of course, it is always possible to agree on special rules with a maintainer "
-"(like the maintainer asking please upload this fix directly for me, and no "
-"diff required)."
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1955
+msgid "Upload fixing only release-critical and important bugs: 5 days"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

 #: pkgs.dbk:1960
 #: pkgs.dbk:1960

-msgid "NMU version numbering"
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1962
-msgid ""
-"Whenever you have made a change to a package, no matter how trivial, the "
-"version number needs to change.  This enables our packing system to "
-"function."
+msgid "Other NMUs: 10 days"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: pkgs.dbk:1966
 msgid ""
 #: pkgs.dbk:1966
 msgid ""

-"If you are doing a non-maintainer upload (NMU), you should add a new minor "
-"version number to the <replaceable>debian-revision</replaceable> part of the "
-"version number (the portion after the last hyphen).  This extra minor number "
-"will start at `1'.  For example, consider the package `foo', which is at "
-"version 1.1-3.  In the archive, the source package control file would be "
-"<filename>foo_1.1-3.dsc</filename>.  The upstream version is `1.1' and the "
-"Debian revision is `3'.  The next NMU would add a new minor number `.1' to "
-"the Debian revision; the new source control file would be "
-"<filename>foo_1.1-3.1.dsc</filename>."
+"Those delays are only examples. In some cases, such as uploads fixing "
+"security issues, or fixes for trivial bugs that blocking a transition, it is "
+"desirable that the fixed package reaches <literal>unstable</literal> sooner."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1977
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1972

 msgid ""
 msgid ""

-"The Debian revision minor number is needed to avoid stealing one of the "
-"package maintainer's version numbers, which might disrupt their work.  It "
-"also has the benefit of making it visually clear that a package in the "
-"archive was not made by the official maintainer."
+"Sometimes, release managers decide to allow NMUs with shorter delays for a "
+"subset of bugs (e.g release-critical bugs older than 7 days). Also, some "
+"maintainers list themselves in the <ulink "
+"url=\"&url-low-threshold-nmu;\">Low Threshold NMU list</ulink>, and accept "
+"that NMUs are uploaded without delay. But even in those cases, it's still a "
+"good idea to give the maintainer a few days to react before you upload, "
+"especially if the patch wasn't available in the BTS before, or if you know "
+"that the maintainer is generally active."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1983
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1982

 msgid ""
 msgid ""

-"If there is no <replaceable>debian-revision</replaceable> component in the "
-"version number then one should be created, starting at `0.1' (but in case of "
-"a debian native package still upload it as native package).  If it is "
-"absolutely necessary for someone other than the usual maintainer to make a "
-"release based on a new upstream version then the person making the release "
-"should start with the <replaceable>debian-revision</replaceable> value "
-"`0.1'.  The usual maintainer of a package should start their "
-"<replaceable>debian-revision</replaceable> numbering at `1'."
+"After you upload an NMU, you are responsible for the possible problems that "
+"you might have introduced. You must keep an eye on the package (subscribing "
+"to the package on the PTS is a good way to achieve this)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1993
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1988

 msgid ""
 msgid ""

-"If you upload a package to <literal>testing</literal> or <literal>stable "
-"</literal>, sometimes, you need to fork the version number tree.  For this, "
-"version numbers like 1.1-3sarge0.1 could be used."
+"This is not a license to perform NMUs thoughtlessly.  If you NMU when it is "
+"clear that the maintainers are active and would have acknowledged a patch in "
+"a timely manner, or if you ignore the recommendations of this document, your "
+"upload might be a cause of conflict with the maintainer.  You should always "
+"be prepared to defend the wisdom of any NMU you perform on its own merits."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2000
-msgid "Source NMUs must have a new changelog entry"
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1998
+msgid "NMUs and debian/changelog"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2002
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2000

 msgid ""
 msgid ""

-"Anyone who is doing a source NMU must create a changelog entry, describing "
-"which bugs are fixed by the NMU, and generally why the NMU was required and "
-"what it fixed.  The changelog entry will have the email address of the "
-"person who uploaded it in the log entry and the NMU version number in it."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2008
-msgid "By convention, source NMU changelog entries start with the line"
+"Just like any other (source) upload, NMUs must add an entry to "
+"<literal>debian/changelog</literal>, telling what has changed with this "
+"upload.  The first line of this entry must explicitely mention that this "
+"upload is an NMU, e.g.:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: pkgs.dbk:2010
+#. type: Content of: <chapter><section><section><screen>
+#: pkgs.dbk:2005

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"  * Non-maintainer upload\n"
+msgid "  * Non-maintainer upload.\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2016
-msgid "Source NMUs and the Bug Tracking System"
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2009
+msgid "The way to version NMUs differs for native and non-native packages."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2018
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2012

 msgid ""
 msgid ""

-"Maintainers other than the official package maintainer should make as few "
-"changes to the package as possible, and they should always send a patch as a "
-"unified context diff (<literal>diff -u</literal>) detailing their changes to "
-"the Bug Tracking System."
+"If the package is a native package (without a debian revision in the version "
+"number), the version must be the version of the last maintainer upload, plus "
+"<literal>+nmu<replaceable>X</replaceable></literal>, where "
+"<replaceable>X</replaceable> is a counter starting at <literal>1</literal>.  "
+"If the last upload was also an NMU, the counter should be increased.  For "
+"example, if the current version is <literal>1.5</literal>, then an NMU would "
+"get version <literal>1.5+nmu1</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2024
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2022

 msgid ""
 msgid ""

-"What if you are simply recompiling the package? If you just need to "
-"recompile it for a single architecture, then you may do a binary-only NMU as "
-"described in <xref linkend=\"binary-only-nmu\"/> which doesn't require any "
-"patch to be sent.  If you want the package to be recompiled for all "
-"architectures, then you do a source NMU as usual and you will have to send a "
-"patch."
+"If the package is a not a native package, you should add a minor version "
+"number to the debian revision part of the version number (the portion after "
+"the last hyphen). This extra number must start at 1.  For example, if the "
+"current version is <literal>1.5-2</literal>, then an NMU would get version "
+"<literal>1.5-2.1</literal>. If a new upstream version is packaged in the "
+"NMU, the debian revision is set to <literal>0</literal>, for example "
+"<literal>1.6-0.1</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: pkgs.dbk:2031
 msgid ""
 #: pkgs.dbk:2031
 msgid ""

-"Bugs fixed by source NMUs used to be tagged fixed instead of closed, but "
-"since version tracking is in place, such bugs are now also closed with the "
-"NMU version."
+"In both cases, if the last upload was also an NMU, the counter should be "
+"increased. For example, if the current version is "
+"<literal>1.5+nmu3</literal> (a native package which has already been NMUed), "
+"the NMU would get version <literal>1.5+nmu4</literal>.  ."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2036
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2037

 msgid ""
 msgid ""

-"Also, after doing an NMU, you have to send the information to the existing "
-"bugs that are fixed by your NMU, including the unified diff.  Historically, "
-"it was custom to open a new bug and include a patch showing all the changes "
-"you have made.  The normal maintainer will either apply the patch or employ "
-"an alternate method of fixing the problem.  Sometimes bugs are fixed "
-"independently upstream, which is another good reason to back out an NMU's "
-"patch.  If the maintainer decides not to apply the NMU's patch but to "
-"release a new version, the maintainer needs to ensure that the new upstream "
-"version really fixes each problem that was fixed in the non-maintainer "
-"release."
+"A special versioning scheme is needed to avoid disrupting the maintainer's "
+"work, since using an integer for the Debian revision will potentially "
+"conflict with a maintainer upload already in preparation at the time of an "
+"NMU, or even one sitting in the ftp NEW queue.  It also has the benefit of "
+"making it visually clear that a package in the archive was not made by the "
+"official maintainer."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: pkgs.dbk:2047
 msgid ""
 #: pkgs.dbk:2047
 msgid ""

-"In addition, the normal maintainer should <emphasis>always</emphasis> retain "
-"the entry in the changelog file documenting the non-maintainer upload -- and "
-"of course, also keep the changes.  If you revert some of the changes, please "
-"reopen the relevant bug reports."
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2055
-msgid "Building source NMUs"
+"If you upload a package to testing or stable, you sometimes need to \"fork\" "
+"the version number tree. This is the case for security uploads, for "
+"example.  For this, a version of the form "
+"<literal>+deb<replaceable>XY</replaceable>u<replaceable>Z</replaceable></literal> "
+"should be used, where <replaceable>X</replaceable> and "
+"<replaceable>Y</replaceable> are the major and minor release numbers, and "
+"<replaceable>Z</replaceable> is a counter starting at <literal>1</literal>.  "
+"When the release number is not yet known (often the case for "
+"<literal>testing</literal>, at the beginning of release cycles), the lowest "
+"release number higher than the last stable release number must be used.  For "
+"example, while Etch (Debian 4.0) is stable, a security NMU to stable for a "
+"package at version <literal>1.5-3</literal> would have version "
+"<literal>1.5-3+deb40u1</literal>, whereas a security NMU to Lenny would get "
+"version <literal>1.5-3+deb50u1</literal>. After the release of Lenny, "
+"security uploads to the <literal>testing</literal> distribution will be "
+"versioned <literal>+deb51uZ</literal>, until it is known whether that "
+"release will be Debian 5.1 or Debian 6.0 (if that becomes the case, uploads "
+"will be versioned as <literal>+deb60uZ</literal>."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2069
+msgid "Using the <literal>DELAYED/</literal> queue"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2072
+msgid ""
+"Having to wait for a response after you request permission to NMU is "
+"inefficient, because it costs the NMUer a context switch to come back to the "
+"issue.  The <literal>DELAYED</literal> queue (see <xref "
+"linkend=\"delayed-incoming\"/>)  allows the developer doing the NMU to "
+"perform all the necessary tasks at the same time. For instance, instead of "
+"telling the maintainer that you will upload the updated package in 7 days, "
+"you should upload the package to <literal>DELAYED/7</literal> and tell the "
+"maintainer that he has 7 days to react.  During this time, the maintainer "
+"can ask you to delay the upload some more, or cancel your upload."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2057
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2086

 msgid ""
 msgid ""

-"Source NMU packages are built normally.  Pick a distribution using the same "
-"rules as found in <xref linkend=\"distribution\"/> , follow the other "
-"instructions in <xref linkend=\"upload\"/> ."
+"The <literal>DELAYED</literal> queue should not be used to put additional "
+"pressure on the maintainer. In particular, it's important that you are "
+"available to cancel or delay the upload before the delay expires since the "
+"maintainer cannot cancel the upload himself."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2062
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2093

 msgid ""
 msgid ""

-"Make sure you do <emphasis>not</emphasis> change the value of the maintainer "
-"in the <filename>debian/control</filename> file.  Your name as given in the "
-"NMU entry of the <filename>debian/changelog</filename> file will be used for "
-"signing the changes file."
+"If you make an NMU to <literal>DELAYED</literal> and the maintainer updates "
+"his package before the delay expires, your upload will be rejected because a "
+"newer version is already available in the archive.  Ideally, the maintainer "
+"will take care to include your proposed changes (or at least a solution for "
+"the problems they address) in that upload."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2070
-msgid "Acknowledging an NMU"
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2103
+msgid "NMUs from the maintainer's point of view"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2072
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2106

 msgid ""
 msgid ""

-"If one of your packages has been NMU'ed, you have to incorporate the changes "
-"in your copy of the sources.  This is easy, you just have to apply the patch "
-"that has been sent to you.  Once this is done, you have to close the bugs "
-"that have been tagged fixed by the NMU.  The easiest way is to use the "
-"<literal>-v</literal> option of <command>dpkg-buildpackage</command>, as "
-"this allows you to include just all changes since your last maintainer "
-"upload.  Alternatively, you can close them manually by sending the required "
-"mails to the BTS or by adding the required <literal>closes: #nnnn</literal> "
-"in the changelog entry of your next upload."
+"When someone NMUs your package, this means they want to help you to keep it "
+"in good shape.  This gives users fixed packages faster.  You can consider "
+"asking the NMUer to become a co-maintainer of the package.  Receiving an NMU "
+"on a package is not a bad thing; it just means that the package is "
+"interesting enough for other people to work on it."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2083
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2115

 msgid ""
 msgid ""

-"In any case, you should not be upset by the NMU.  An NMU is not a personal "
-"attack against the maintainer.  It is a proof that someone cares enough "
-"about the package that they were willing to help you in your work, so you "
-"should be thankful.  You may also want to ask them if they would be "
-"interested in helping you on a more frequent basis as co-maintainer or "
-"backup maintainer (see <xref linkend=\"collaborative-maint\"/> )."
+"To acknowledge an NMU, include its changes and changelog entry in your next "
+"maintainer upload.  If you do not acknowledge the NMU by including the NMU "
+"changelog entry in your changelog, the bugs will remain closed in the BTS "
+"but will be listed as affecting your maintainer version of the package."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2093
-msgid "NMU vs QA uploads"
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2124
+msgid "Source NMUs vs Binary-only NMUs (binNMUs)"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2127
+msgid ""
+"The full name of an NMU is <emphasis>source NMU</emphasis>.  There is also "
+"another type, namely the <emphasis>binary-only NMU</emphasis>, or "
+"<emphasis>binNMU</emphasis>.  A binNMU is also a package upload by someone "
+"other than the package's maintainer.  However, it is a binary-only upload."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2095
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2134

 msgid ""
 msgid ""

-"Unless you know the maintainer is still active, it is wise to check the "
-"package to see if it has been orphaned.  The current list of orphaned "
-"packages which haven't had their maintainer set correctly is available at "
-"<ulink url=\"&url-debian-qa-orphaned;\"></ulink>.  If you perform an NMU on "
-"an improperly orphaned package, please set the maintainer to <literal>Debian "
-"QA Group &lt;packages@qa.debian.org&gt;</literal>."
+"When a library (or other dependency) is updated, the packages using it may "
+"need to be rebuilt.  Since no changes to the source are needed, the same "
+"source package is used."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2105
-msgid "Who can do an NMU"
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2140
+msgid ""
+"BinNMUs are usually triggered on the buildds by wanna-build.  An entry is "
+"added to debian/changelog, explaining why the upload was needed and "
+"increasing the version number as described in <xref "
+"linkend=\"binary-only-nmu\"/>.  This entry should not be included in the "
+"next upload."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2107
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2148

 msgid ""
 msgid ""

-"Only official, registered Debian Developers can do binary or source NMUs.  A "
-"Debian Developer is someone who has their key in the Debian key ring.  "
-"Non-developers, however, are encouraged to download the source package and "
-"start hacking on it to fix problems; however, rather than doing an NMU, they "
-"should just submit worthwhile patches to the Bug Tracking System.  "
-"Maintainers almost always appreciate quality patches and bug reports."
+"Buildds upload packages for their architecture to the archive as binary-only "
+"uploads.  Strictly speaking, these are binNMUs.  However, they are not "
+"normally called NMU, and they don't add an entry to debian/changelog."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2117
-msgid "Terminology"
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2156
+msgid "NMUs vs QA uploads"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2119
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2159

 msgid ""
 msgid ""

-"There are two new terms used throughout this section: ``binary-only NMU'' "
-"and ``source NMU''.  These terms are used with specific technical meaning "
-"throughout this document.  Both binary-only and source NMUs are similar, "
-"since they involve an upload of a package by a developer who is not the "
-"official maintainer of that package.  That is why it's a "
-"<literal>non-maintainer</literal> upload."
+"NMUs are uploads of packages by somebody else than their assigned "
+"maintainer.  There is another type of upload where the uploaded package is "
+"not yours: QA uploads. QA uploads are uploads of orphaned packages."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2127
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2166

 msgid ""
 msgid ""

-"A source NMU is an upload of a package by a developer who is not the "
-"official maintainer, for the purposes of fixing a bug in the package.  "
-"Source NMUs always involves changes to the source (even if it is just a "
-"change to <filename>debian/changelog</filename>).  This can be either a "
-"change to the upstream source, or a change to the Debian bits of the "
-"source.  Note, however, that source NMUs may also include "
-"architecture-dependent packages, as well as an updated Debian diff."
+"QA uploads are very much like normal maintainer uploads: they may fix "
+"anything, even minor issues; the version numbering is normal, and there is "
+"no need to use a delayed upload.  The difference is that you are not listed "
+"as the Maintainer or Uploader for the package.  Also, the changelog entry of "
+"a QA upload has a special first line:"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><screen>
+#: pkgs.dbk:2174
+#, no-wrap
+msgid " * QA upload.\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2136
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2178

 msgid ""
 msgid ""

-"A binary-only NMU is a recompilation and upload of a binary package for a "
-"given architecture.  As such, it is usually part of a porting effort.  A "
-"binary-only NMU is a non-maintainer uploaded binary version of a package, "
-"with no source changes required.  There are many cases where porters must "
-"fix problems in the source in order to get them to compile for their target "
-"architecture; that would be considered a source NMU rather than a "
-"binary-only NMU.  As you can see, we don't distinguish in terminology "
-"between porter NMUs and non-porter NMUs."
+"If you want to do an NMU, and it seems that the maintainer is not active, it "
+"is wise to check if the package is orphaned (this information is displayed "
+"on the package's Package Tracking System page).  When doing the first QA "
+"upload to an orphaned package, the maintainer should be set to "
+"<literal>Debian QA Group &lt;packages@qa.debian.org&gt;</literal>.  Orphaned "
+"packages which did not yet have a QA upload still have their old maintainer "
+"set.  There is a list of them at <ulink url=\"&url-orphaned-not-qa;\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2146
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2189

 msgid ""
 msgid ""

-"Both classes of NMUs, source and binary-only, can be lumped under the term "
-"``NMU''.  However, this often leads to confusion, since most people think "
-"``source NMU'' when they think ``NMU''.  So it's best to be careful: always "
-"use ``binary NMU'' or ``binNMU'' for binary-only NMUs."
+"Instead of doing a QA upload, you can also consider adopting the package by "
+"making yourself the maintainer.  You don't need permission from anybody to "
+"adopt an orphaned package, you can just set yourself as maintainer and "
+"upload the new version (see <xref linkend=\"adopting\"/>)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:2156
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:2200

 msgid "Collaborative maintenance"
 msgstr ""
 
 msgid "Collaborative maintenance"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:2158
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:2202

 msgid ""
 "Collaborative maintenance is a term describing the sharing of Debian package "
 "maintenance duties by several people.  This collaboration is almost always a "
 msgid ""
 "Collaborative maintenance is a term describing the sharing of Debian package "
 "maintenance duties by several people.  This collaboration is almost always a "


@@ -2909,8 +2893,8 @@ msgid ""
 "co-maintainers."
 msgstr ""
 
 "co-maintainers."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:2166
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:2210

 msgid ""
 "Generally there is a primary maintainer and one or more co-maintainers.  The "
 "primary maintainer is the person whose name is listed in the "
 msgid ""
 "Generally there is a primary maintainer and one or more co-maintainers.  The "
 "primary maintainer is the person whose name is listed in the "


@@ -2920,15 +2904,15 @@ msgid ""
 "<filename>debian/control</filename> file."
 msgstr ""
 
 "<filename>debian/control</filename> file."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:2174
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:2218

 msgid ""
 "In its most basic form, the process of adding a new co-maintainer is quite "
 "easy:"
 msgstr ""
 
 msgid ""
 "In its most basic form, the process of adding a new co-maintainer is quite "
 "easy:"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2180
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2224

 msgid ""
 "Setup the co-maintainer with access to the sources you build the package "
 "from.  Generally this implies you are using a network-capable version "
 msgid ""
 "Setup the co-maintainer with access to the sources you build the package "
 "from.  Generally this implies you are using a network-capable version "


@@ -2937,32 +2921,31 @@ msgid ""
 "provides such tools, amongst others."
 msgstr ""
 
 "provides such tools, amongst others."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2188
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2232

 msgid ""
 "Add the co-maintainer's correct maintainer name and address to the "
 "<literal>Uploaders</literal> field in the first paragraph of the "
 "<filename>debian/control</filename> file."
 msgstr ""
 
 msgid ""
 "Add the co-maintainer's correct maintainer name and address to the "
 "<literal>Uploaders</literal> field in the first paragraph of the "
 "<filename>debian/control</filename> file."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><screen>
-#: pkgs.dbk:2192
+#. type: Content of: <chapter><section><itemizedlist><listitem><screen>
+#: pkgs.dbk:2237

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"\n"

 "Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex "
 "&lt;arex@debian.org&gt;\n"
 msgstr ""
 
 "Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex "
 "&lt;arex@debian.org&gt;\n"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2198
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2242

 msgid ""
 "Using the PTS (<xref linkend=\"pkg-tracking-system\"/> ), the co-maintainers "
 "should subscribe themselves to the appropriate source package."
 msgstr ""
 
 msgid ""
 "Using the PTS (<xref linkend=\"pkg-tracking-system\"/> ), the co-maintainers "
 "should subscribe themselves to the appropriate source package."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:2204
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:2248

 msgid ""
 "Another form of collaborative maintenance is team maintenance, which is "
 "recommended if you maintain several packages with the same group of "
 msgid ""
 "Another form of collaborative maintenance is team maintenance, which is "
 "recommended if you maintain several packages with the same group of "


@@ -2971,16 +2954,16 @@ msgid ""
 "of the two following schemes:"
 msgstr ""
 
 "of the two following schemes:"
 msgstr ""
 

-# type: Content of: <chapter><section><orderedlist><listitem><para>
-#: pkgs.dbk:2213
+#. type: Content of: <chapter><section><orderedlist><listitem><para>
+#: pkgs.dbk:2257

 msgid ""
 "Put the team member mainly responsible for the package in the Maintainer "
 "field.  In the Uploaders, put the mailing list address, and the team members "
 "who care for the package."
 msgstr ""
 
 msgid ""
 "Put the team member mainly responsible for the package in the Maintainer "
 "field.  In the Uploaders, put the mailing list address, and the team members "
 "who care for the package."
 msgstr ""
 

-# type: Content of: <chapter><section><orderedlist><listitem><para>
-#: pkgs.dbk:2220
+#. type: Content of: <chapter><section><orderedlist><listitem><para>
+#: pkgs.dbk:2264

 msgid ""
 "Put the mailing list address in the Maintainer field.  In the Uploaders "
 "field, put the team members who care for the package.  In this case, you "
 msgid ""
 "Put the mailing list address in the Maintainer field.  In the Uploaders "
 "field, put the team members who care for the package.  In this case, you "


@@ -2988,8 +2971,8 @@ msgid ""
 "interaction (like moderation for non-subscribers)."
 msgstr ""
 
 "interaction (like moderation for non-subscribers)."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:2228
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:2272

 msgid ""
 "In any case, it is a bad idea to automatically put all team members in the "
 "Uploaders field.  It clutters the Developer's Package Overview listing (see "
 msgid ""
 "In any case, it is a bad idea to automatically put all team members in the "
 "Uploaders field.  It clutters the Developer's Package Overview listing (see "


@@ -2997,26 +2980,26 @@ msgid ""
 "creates a false sense of good maintenance."
 msgstr ""
 
 "creates a false sense of good maintenance."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:2236
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:2280

 msgid "The testing distribution"
 msgstr ""
 
 msgid "The testing distribution"
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2238
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2282

 msgid "Basics"
 msgstr ""
 
 msgid "Basics"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2240
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2284

 msgid ""
 "Packages are usually installed into the <literal>testing</literal> "
 "distribution after they have undergone some degree of "
 "<literal>testing</literal> in <literal>unstable</literal>."
 msgstr ""
 
 msgid ""
 "Packages are usually installed into the <literal>testing</literal> "
 "distribution after they have undergone some degree of "
 "<literal>testing</literal> in <literal>unstable</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2245
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2289

 msgid ""
 "They must be in sync on all architectures and mustn't have dependencies that "
 "make them uninstallable; they also have to have generally no known "
 msgid ""
 "They must be in sync on all architectures and mustn't have dependencies that "
 "make them uninstallable; they also have to have generally no known "


@@ -3025,13 +3008,13 @@ msgid ""
 "being a release candidate.  Please see below for details."
 msgstr ""
 
 "being a release candidate.  Please see below for details."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2254
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2298

 msgid "Updates from unstable"
 msgstr ""
 
 msgid "Updates from unstable"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2256
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2300

 msgid ""
 "The scripts that update the <literal>testing</literal> distribution are run "
 "twice each day, right after the installation of the updated packages; these "
 msgid ""
 "The scripts that update the <literal>testing</literal> distribution are run "
 "twice each day, right after the installation of the updated packages; these "


@@ -3041,15 +3024,15 @@ msgid ""
 "inconsistency and to use only non-buggy packages."
 msgstr ""
 
 "inconsistency and to use only non-buggy packages."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2264
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2308

 msgid ""
 "The inclusion of a package from <literal>unstable</literal> is conditional "
 "on the following:"
 msgstr ""
 
 msgid ""
 "The inclusion of a package from <literal>unstable</literal> is conditional "
 "on the following:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2270
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2314

 msgid ""
 "The package must have been available in <literal>unstable</literal> for 2, 5 "
 "or 10 days, depending on the urgency (high, medium or low).  Please note "
 msgid ""
 "The package must have been available in <literal>unstable</literal> for 2, 5 "
 "or 10 days, depending on the urgency (high, medium or low).  Please note "


@@ -3059,31 +3042,31 @@ msgid ""
 "transitions may be switched off altogether;"
 msgstr ""
 
 "transitions may be switched off altogether;"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2280
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2324

 msgid ""
 "It must not have new release-critical bugs (RC bugs affecting the version "
 "available in <literal>unstable</literal>, but not affecting the version in "
 "<literal>testing</literal>);"
 msgstr ""
 
 msgid ""
 "It must not have new release-critical bugs (RC bugs affecting the version "
 "available in <literal>unstable</literal>, but not affecting the version in "
 "<literal>testing</literal>);"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2287
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2331

 msgid ""
 "It must be available on all architectures on which it has previously been "
 "built in <literal>unstable</literal>.  <xref linkend=\"dak-ls\"/> may be of "
 "interest to check that information;"
 msgstr ""
 
 msgid ""
 "It must be available on all architectures on which it has previously been "
 "built in <literal>unstable</literal>.  <xref linkend=\"dak-ls\"/> may be of "
 "interest to check that information;"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2294
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2338

 msgid ""
 "It must not break any dependency of a package which is already available in "
 "<literal>testing</literal>;"
 msgstr ""
 
 msgid ""
 "It must not break any dependency of a package which is already available in "
 "<literal>testing</literal>;"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2300
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2344

 msgid ""
 "The packages on which it depends must either be available in "
 "<literal>testing</literal> or they must be accepted into "
 msgid ""
 "The packages on which it depends must either be available in "
 "<literal>testing</literal> or they must be accepted into "


@@ -3091,8 +3074,8 @@ msgid ""
 "fulfill all the necessary criteria);"
 msgstr ""
 
 "fulfill all the necessary criteria);"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2308
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2352

 msgid ""
 "To find out whether a package is progressing into <literal>testing</literal> "
 "or not, see the <literal>testing</literal> script output on the <ulink "
 msgid ""
 "To find out whether a package is progressing into <literal>testing</literal> "
 "or not, see the <literal>testing</literal> script output on the <ulink "


@@ -3104,8 +3087,8 @@ msgid ""
 "progression of your packages into <literal>testing</literal>."
 msgstr ""
 
 "progression of your packages into <literal>testing</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2319
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2363

 msgid ""
 "The <filename>update_excuses</filename> file does not always give the "
 "precise reason why the package is refused; you may have to find it on your "
 msgid ""
 "The <filename>update_excuses</filename> file does not always give the "
 "precise reason why the package is refused; you may have to find it on your "


@@ -3114,30 +3097,30 @@ msgid ""
 "information about the usual problems which may be causing such troubles."
 msgstr ""
 
 "information about the usual problems which may be causing such troubles."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2326
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2370

 msgid ""
 "Sometimes, some packages never enter <literal>testing</literal> because the "
 "set of inter-relationship is too complicated and cannot be sorted out by the "
 "scripts.  See below for details."
 msgstr ""
 
 msgid ""
 "Sometimes, some packages never enter <literal>testing</literal> because the "
 "set of inter-relationship is too complicated and cannot be sorted out by the "
 "scripts.  See below for details."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2331
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2375

 msgid ""
 "Some further dependency analysis is shown on <ulink "
 "url=\"http://release.debian.org/migration/\"></ulink> — but be warned, this "
 "page also shows build dependencies which are not considered by britney."
 msgstr ""
 
 msgid ""
 "Some further dependency analysis is shown on <ulink "
 "url=\"http://release.debian.org/migration/\"></ulink> — but be warned, this "
 "page also shows build dependencies which are not considered by britney."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2336
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:2380

 msgid "out-of-date"
 msgstr ""
 
 #.  FIXME: better rename this file than document rampant professionalism? 
 msgid "out-of-date"
 msgstr ""
 
 #.  FIXME: better rename this file than document rampant professionalism? 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2339
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2383

 msgid ""
 "For the <literal>testing</literal> migration script, outdated means: There "
 "are different versions in <literal>unstable</literal> for the release "
 msgid ""
 "For the <literal>testing</literal> migration script, outdated means: There "
 "are different versions in <literal>unstable</literal> for the release "


@@ -3148,48 +3131,48 @@ msgid ""
 "<literal>testing</literal>."
 msgstr ""
 
 "<literal>testing</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2347
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2391

 msgid "Consider this example:"
 msgstr ""
 
 msgid "Consider this example:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
-#: pkgs.dbk:2354 pkgs.dbk:2387
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
+#: pkgs.dbk:2398 pkgs.dbk:2431

 msgid "alpha"
 msgstr ""
 
 msgid "alpha"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
-#: pkgs.dbk:2355 pkgs.dbk:2388
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
+#: pkgs.dbk:2399 pkgs.dbk:2432

 msgid "arm"
 msgstr ""
 
 msgid "arm"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
-#: pkgs.dbk:2360 pkgs.dbk:2394 pkgs.dbk:2456
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
+#: pkgs.dbk:2404 pkgs.dbk:2438 pkgs.dbk:2500

 msgid "testing"
 msgstr ""
 
 msgid "testing"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2361 pkgs.dbk:2366 pkgs.dbk:2395 pkgs.dbk:2396 pkgs.dbk:2403
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2405 pkgs.dbk:2410 pkgs.dbk:2439 pkgs.dbk:2440 pkgs.dbk:2447

 msgid "1"
 msgstr ""
 
 msgid "1"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2362 pkgs.dbk:2397 pkgs.dbk:2402
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2406 pkgs.dbk:2441 pkgs.dbk:2446

 msgid "-"
 msgstr ""
 
 msgid "-"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
-#: pkgs.dbk:2365 pkgs.dbk:2400 pkgs.dbk:2457
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
+#: pkgs.dbk:2409 pkgs.dbk:2444 pkgs.dbk:2501

 msgid "unstable"
 msgstr ""
 
 msgid "unstable"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2367 pkgs.dbk:2401
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2411 pkgs.dbk:2445

 msgid "2"
 msgstr ""
 
 msgid "2"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2373
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2417

 msgid ""
 "The package is out of date on alpha in <literal>unstable</literal>, and will "
 "not go to <literal>testing</literal>. Removing the package would not help at "
 msgid ""
 "The package is out of date on alpha in <literal>unstable</literal>, and will "
 "not go to <literal>testing</literal>. Removing the package would not help at "


@@ -3197,41 +3180,41 @@ msgid ""
 "not propagate to testing."
 msgstr ""
 
 "not propagate to testing."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2379
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2423

 msgid ""
 "However, if ftp-master removes a package in <literal>unstable</literal> "
 "(here on <literal>arm</literal>):"
 msgstr ""
 
 msgid ""
 "However, if ftp-master removes a package in <literal>unstable</literal> "
 "(here on <literal>arm</literal>):"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
-#: pkgs.dbk:2389
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
+#: pkgs.dbk:2433

 msgid "hurd-i386"
 msgstr ""
 
 msgid "hurd-i386"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2409
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2453

 msgid ""
 "In this case, the package is up to date on all release architectures in "
 "<literal>unstable</literal> (and the extra <literal>hurd-i386</literal> "
 "doesn't matter, as it's not a release architecture)."
 msgstr ""
 
 msgid ""
 "In this case, the package is up to date on all release architectures in "
 "<literal>unstable</literal> (and the extra <literal>hurd-i386</literal> "
 "doesn't matter, as it's not a release architecture)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2414
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2458

 msgid ""
 "Sometimes, the question is raised if it is possible to allow packages in "
 "that are not yet built on all architectures: No.  Just plainly no.  (Except "
 "if you maintain glibc or so.)"
 msgstr ""
 
 msgid ""
 "Sometimes, the question is raised if it is possible to allow packages in "
 "that are not yet built on all architectures: No.  Just plainly no.  (Except "
 "if you maintain glibc or so.)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2421
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:2465

 msgid "Removals from testing"
 msgstr ""
 
 msgid "Removals from testing"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2423
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2467

 msgid ""
 "Sometimes, a package is removed to allow another package in: This happens "
 "only to allow <emphasis>another</emphasis> package to go in if it's ready in "
 msgid ""
 "Sometimes, a package is removed to allow another package in: This happens "
 "only to allow <emphasis>another</emphasis> package to go in if it's ready in "


@@ -3240,92 +3223,92 @@ msgid ""
 "<literal>a</literal> may be removed to allow <literal>b</literal> in."
 msgstr ""
 
 "<literal>a</literal> may be removed to allow <literal>b</literal> in."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2430
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2474

 msgid ""
 "Of course, there is another reason to remove a package from <literal>testing "
 "</literal>: It's just too buggy (and having a single RC-bug is enough to be "
 "in this state)."
 msgstr ""
 
 msgid ""
 "Of course, there is another reason to remove a package from <literal>testing "
 "</literal>: It's just too buggy (and having a single RC-bug is enough to be "
 "in this state)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2435
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2479

 msgid ""
 "Furthermore, if a package has been removed from <literal>unstable</literal>, "
 "and no package in <literal>testing</literal> depends on it any more, then it "
 "will automatically be removed."
 msgstr ""
 
 msgid ""
 "Furthermore, if a package has been removed from <literal>unstable</literal>, "
 "and no package in <literal>testing</literal> depends on it any more, then it "
 "will automatically be removed."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2442
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:2486

 msgid "circular dependencies"
 msgstr ""
 
 msgid "circular dependencies"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2444
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2488

 msgid ""
 "A situation which is not handled very well by britney is if package "
 "<literal>a</literal> depends on the new version of package "
 "<literal>b</literal>, and vice versa."
 msgstr ""
 
 msgid ""
 "A situation which is not handled very well by britney is if package "
 "<literal>a</literal> depends on the new version of package "
 "<literal>b</literal>, and vice versa."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2449
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2493

 msgid "An example of this is:"
 msgstr ""
 
 msgid "An example of this is:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2462
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2506

 msgid "a"
 msgstr ""
 
 msgid "a"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2463
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2507

 msgid "1; depends: b=1"
 msgstr ""
 
 msgid "1; depends: b=1"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2464
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2508

 msgid "2; depends: b=2"
 msgstr ""
 
 msgid "2; depends: b=2"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2467
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2511

 msgid "b"
 msgstr ""
 
 msgid "b"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2468
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2512

 msgid "1; depends: a=1"
 msgstr ""
 
 msgid "1; depends: a=1"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2469
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2513

 msgid "2; depends: a=2"
 msgstr ""
 
 msgid "2; depends: a=2"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2475
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2519

 msgid ""
 "Neither package <literal>a</literal> nor package <literal>b</literal> is "
 "considered for update."
 msgstr ""
 
 msgid ""
 "Neither package <literal>a</literal> nor package <literal>b</literal> is "
 "considered for update."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2479
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2523

 msgid ""
 "Currently, this requires some manual hinting from the release team.  Please "
 "contact them by sending mail to &email-debian-release; if this happens to "
 "one of your packages."
 msgstr ""
 
 msgid ""
 "Currently, this requires some manual hinting from the release team.  Please "
 "contact them by sending mail to &email-debian-release; if this happens to "
 "one of your packages."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2486
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:2530

 msgid "influence of package in testing"
 msgstr ""
 
 msgid "influence of package in testing"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2488
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2532

 msgid ""
 "Generally, there is nothing that the status of a package in <literal>testing "
 "</literal> means for transition of the next version from <literal>unstable "
 msgid ""
 "Generally, there is nothing that the status of a package in <literal>testing "
 "</literal> means for transition of the next version from <literal>unstable "


@@ -3340,26 +3323,26 @@ msgid ""
 "migration."
 msgstr ""
 
 "migration."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2500
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2544

 msgid ""
 "In summary this means: The only influence that a package being in <literal> "
 "testing</literal> has on a new version of the same package is that the new "
 "version might go in easier."
 msgstr ""
 
 msgid ""
 "In summary this means: The only influence that a package being in <literal> "
 "testing</literal> has on a new version of the same package is that the new "
 "version might go in easier."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2507
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:2551

 msgid "details"
 msgstr ""
 
 msgid "details"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2509
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2553

 msgid "If you are interested in details, this is how britney works:"
 msgstr ""
 
 msgid "If you are interested in details, this is how britney works:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2512
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2556

 msgid ""
 "The packages are looked at to determine whether they are valid candidates.  "
 "This gives the update excuses.  The most common reasons why a package is not "
 msgid ""
 "The packages are looked at to determine whether they are valid candidates.  "
 "This gives the update excuses.  The most common reasons why a package is not "


@@ -3371,8 +3354,8 @@ msgid ""
 "the code.)"
 msgstr ""
 
 "the code.)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2521
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2565

 msgid ""
 "Now, the more complex part happens: Britney tries to update <literal>testing "
 "</literal> with the valid candidates. For that, britney tries to add each "
 msgid ""
 "Now, the more complex part happens: Britney tries to update <literal>testing "
 "</literal> with the valid candidates. For that, britney tries to add each "


@@ -3384,8 +3367,8 @@ msgid ""
 "after this main run, depending on the exact type."
 msgstr ""
 
 "after this main run, depending on the exact type."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2531
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2575

 msgid ""
 "If you want to see more details, you can look it up on "
 "<filename>merkel:/org/&ftp-debian-org;/testing/update_out/</filename> (or in "
 msgid ""
 "If you want to see more details, you can look it up on "
 "<filename>merkel:/org/&ftp-debian-org;/testing/update_out/</filename> (or in "


@@ -3394,20 +3377,20 @@ msgid ""
 "url=\"http://&ftp-master-host;/testing/update_out_code/\"></ulink>"
 msgstr ""
 
 "url=\"http://&ftp-master-host;/testing/update_out_code/\"></ulink>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2538
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2582

 msgid ""
 "The hints are available via <ulink "
 "url=\"http://&ftp-master-host;/testing/hints/\"></ulink>."
 msgstr ""
 
 msgid ""
 "The hints are available via <ulink "
 "url=\"http://&ftp-master-host;/testing/hints/\"></ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2546
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2590

 msgid "Direct updates to testing"
 msgstr ""
 
 msgid "Direct updates to testing"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2548
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2592

 msgid ""
 "The <literal>testing</literal> distribution is fed with packages from "
 "<literal>unstable</literal> according to the rules explained above.  "
 msgid ""
 "The <literal>testing</literal> distribution is fed with packages from "
 "<literal>unstable</literal> according to the rules explained above.  "


@@ -3416,8 +3399,8 @@ msgid ""
 "testing-proposed-updates</literal>."
 msgstr ""
 
 "testing-proposed-updates</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2555
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2599

 msgid ""
 "Keep in mind that packages uploaded there are not automatically processed, "
 "they have to go through the hands of the release manager.  So you'd better "
 msgid ""
 "Keep in mind that packages uploaded there are not automatically processed, "
 "they have to go through the hands of the release manager.  So you'd better "


@@ -3426,8 +3409,8 @@ msgid ""
 "regularly give on &email-debian-devel-announce;."
 msgstr ""
 
 "regularly give on &email-debian-devel-announce;."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2562
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2606

 msgid ""
 "You should not upload to <literal>testing-proposed-updates</literal> when "
 "you can update your packages through <literal>unstable</literal>.  If you "
 msgid ""
 "You should not upload to <literal>testing-proposed-updates</literal> when "
 "you can update your packages through <literal>unstable</literal>.  If you "


@@ -3439,8 +3422,8 @@ msgid ""
 "new dependencies."
 msgstr ""
 
 "new dependencies."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2571
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2615

 msgid ""
 "Version numbers are usually selected by adding the codename of the "
 "<literal>testing</literal> distribution and a running number, like "
 msgid ""
 "Version numbers are usually selected by adding the codename of the "
 "<literal>testing</literal> distribution and a running number, like "


@@ -3449,78 +3432,78 @@ msgid ""
 "<literal>1.2</literal>."
 msgstr ""
 
 "<literal>1.2</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2578
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2622

 msgid "Please make sure you didn't miss any of these items in your upload:"
 msgstr ""
 
 msgid "Please make sure you didn't miss any of these items in your upload:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2583
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2627

 msgid ""
 "Make sure that your package really needs to go through "
 "<literal>testing-proposed-updates</literal>, and can't go through <literal> "
 "unstable</literal>;"
 msgstr ""
 
 msgid ""
 "Make sure that your package really needs to go through "
 "<literal>testing-proposed-updates</literal>, and can't go through <literal> "
 "unstable</literal>;"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2590
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2634

 msgid "Make sure that you included only the minimal amount of changes;"
 msgstr ""
 
 msgid "Make sure that you included only the minimal amount of changes;"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2595
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2639

 msgid "Make sure that you included an appropriate explanation in the changelog;"
 msgstr ""
 
 msgid "Make sure that you included an appropriate explanation in the changelog;"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2600
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2644

 msgid ""
 "Make sure that you've written <literal>testing</literal> or "
 "<literal>testing-proposed-updates</literal> into your target distribution;"
 msgstr ""
 
 msgid ""
 "Make sure that you've written <literal>testing</literal> or "
 "<literal>testing-proposed-updates</literal> into your target distribution;"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2606
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2650

 msgid ""
 "Make sure that you've built and tested your package in "
 "<literal>testing</literal>, not in <literal>unstable</literal>;"
 msgstr ""
 
 msgid ""
 "Make sure that you've built and tested your package in "
 "<literal>testing</literal>, not in <literal>unstable</literal>;"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2612
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2656

 msgid ""
 "Make sure that your version number is higher than the version in "
 "<literal>testing</literal> and <literal>testing-proposed-updates</literal>, "
 "and lower than in <literal>unstable</literal>;"
 msgstr ""
 
 msgid ""
 "Make sure that your version number is higher than the version in "
 "<literal>testing</literal> and <literal>testing-proposed-updates</literal>, "
 "and lower than in <literal>unstable</literal>;"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2619
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2663

 msgid ""
 "After uploading and successful build on all platforms, contact the release "
 "team at &email-debian-release; and ask them to approve your upload."
 msgstr ""
 
 msgid ""
 "After uploading and successful build on all platforms, contact the release "
 "team at &email-debian-release; and ask them to approve your upload."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2627
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2671

 msgid "Frequently asked questions"
 msgstr ""
 
 msgid "Frequently asked questions"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2629
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:2673

 msgid "What are release-critical bugs, and how do they get counted?"
 msgstr ""
 
 msgid "What are release-critical bugs, and how do they get counted?"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2631
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2675

 msgid ""
 "All bugs of some higher severities are by default considered "
 "release-critical; currently, these are <literal>critical</literal>, "
 "<literal>grave</literal> and <literal>serious</literal> bugs."
 msgstr ""
 
 msgid ""
 "All bugs of some higher severities are by default considered "
 "release-critical; currently, these are <literal>critical</literal>, "
 "<literal>grave</literal> and <literal>serious</literal> bugs."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2636
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2680

 msgid ""
 "Such bugs are presumed to have an impact on the chances that the package "
 "will be released with the <literal>stable</literal> release of Debian: in "
 msgid ""
 "Such bugs are presumed to have an impact on the chances that the package "
 "will be released with the <literal>stable</literal> release of Debian: in "


@@ -3529,8 +3512,8 @@ msgid ""
 "<literal> stable</literal>."
 msgstr ""
 
 "<literal> stable</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2643
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2687

 msgid ""
 "The <literal>unstable</literal> bug count are all release-critical bugs "
 "which are marked to apply to "
 msgid ""
 "The <literal>unstable</literal> bug count are all release-critical bugs "
 "which are marked to apply to "


@@ -3539,15 +3522,15 @@ msgid ""
 "<literal>testing</literal> bug count is defined analogously."
 msgstr ""
 
 "<literal>testing</literal> bug count is defined analogously."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2651
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:2695

 msgid ""
 "How could installing a package into <literal>testing</literal> possibly "
 "break other packages?"
 msgstr ""
 
 msgid ""
 "How could installing a package into <literal>testing</literal> possibly "
 "break other packages?"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2654
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2698

 msgid ""
 "The structure of the distribution archives is such that they can only "
 "contain one version of a package; a package is defined by its name.  So when "
 msgid ""
 "The structure of the distribution archives is such that they can only "
 "contain one version of a package; a package is defined by its name.  So when "


@@ -3558,8 +3541,8 @@ msgid ""
 "old version is removed."
 msgstr ""
 
 "old version is removed."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2662
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2706

 msgid ""
 "However, the old version may have provided a binary package with an old "
 "soname of a library, such as <literal>libacme-foo0</literal>.  Removing the "
 msgid ""
 "However, the old version may have provided a binary package with an old "
 "soname of a library, such as <literal>libacme-foo0</literal>.  Removing the "


@@ -3567,8 +3550,8 @@ msgid ""
 "which will break any packages which depend on it."
 msgstr ""
 
 "which will break any packages which depend on it."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2668
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2712

 msgid ""
 "Evidently, this mainly affects packages which provide changing sets of "
 "binary packages in different versions (in turn, mainly libraries).  However, "
 msgid ""
 "Evidently, this mainly affects packages which provide changing sets of "
 "binary packages in different versions (in turn, mainly libraries).  However, "


@@ -3576,8 +3559,8 @@ msgid ""
 "declared of the ==, &lt;=, or &lt;&lt; varieties."
 msgstr ""
 
 "declared of the ==, &lt;=, or &lt;&lt; varieties."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2674
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2718

 msgid ""
 "When the set of binary packages provided by a source package change in this "
 "way, all the packages that depended on the old binaries will have to be "
 msgid ""
 "When the set of binary packages provided by a source package change in this "
 "way, all the packages that depended on the old binaries will have to be "


@@ -3590,8 +3573,8 @@ msgid ""
 "required."
 msgstr ""
 
 "required."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2685
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2729

 msgid ""
 "If you are having problems with complicated groups of packages like this, "
 "contact &email-debian-devel; or &email-debian-release; for help."
 msgid ""
 "If you are having problems with complicated groups of packages like this, "
 "contact &email-debian-devel; or &email-debian-release; for help."

diff --git a/po4a/po/resources.pot b/po4a/po/resources.pot
index b83deca3ee45f46729cf5b5be5bce9532b77a6a0..cf27501d4984e4c6ce6b1b7b33a1584ddea7ec97 100644 (file)
--- a/po4a/po/resources.pot
+++ b/po4a/po/resources.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"POT-Creation-Date: 2008-08-08 11:34-0300\n"
+"POT-Creation-Date: 2010-01-04 00:17+0100\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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -15,12 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING"
 
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING"
 

-# type: Content of: <chapter><title>
+#. type: Content of: <chapter><title>

 #: resources.dbk:7
 msgid "Resources for Debian Developers"
 msgstr ""
 
 #: resources.dbk:7
 msgid "Resources for Debian Developers"
 msgstr ""
 

-# type: Content of: <chapter><para>
+#. type: Content of: <chapter><para>

 #: resources.dbk:9
 msgid ""
 "In this chapter you will find a very brief road map of the Debian mailing "
 #: resources.dbk:9
 msgid ""
 "In this chapter you will find a very brief road map of the Debian mailing "


@@ -29,12 +29,12 @@ msgid ""
 "work."
 msgstr ""
 
 "work."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
+#. type: Content of: <chapter><section><title>

 #: resources.dbk:14
 msgid "Mailing lists"
 msgstr ""
 
 #: resources.dbk:14
 msgid "Mailing lists"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: resources.dbk:16
 msgid ""
 "Much of the conversation between Debian developers (and users) is managed "
 #: resources.dbk:16
 msgid ""
 "Much of the conversation between Debian developers (and users) is managed "


@@ -48,12 +48,12 @@ msgid ""
 "developers."
 msgstr ""
 
 "developers."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
+#. type: Content of: <chapter><section><section><title>

 #: resources.dbk:27
 msgid "Basic rules for use"
 msgstr ""
 
 #: resources.dbk:27
 msgid "Basic rules for use"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: resources.dbk:29
 msgid ""
 "When replying to messages on the mailing list, please do not send a carbon "
 #: resources.dbk:29
 msgid ""
 "When replying to messages on the mailing list, please do not send a carbon "


@@ -62,7 +62,7 @@ msgid ""
 "see the responses."
 msgstr ""
 
 "see the responses."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: resources.dbk:35
 msgid ""
 "Cross-posting (sending the same message to multiple lists) is discouraged.  "
 #: resources.dbk:35
 msgid ""
 "Cross-posting (sending the same message to multiple lists) is discouraged.  "


@@ -71,7 +71,7 @@ msgid ""
 "messages."
 msgstr ""
 
 "messages."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: resources.dbk:40
 msgid ""
 "Please read the <ulink url=\"&url-debian-lists;#codeofconduct\">code of "
 #: resources.dbk:40
 msgid ""
 "Please read the <ulink url=\"&url-debian-lists;#codeofconduct\">code of "


@@ -79,55 +79,55 @@ msgid ""
 "Community Guidelines</ulink> are also worth reading."
 msgstr ""
 
 "Community Guidelines</ulink> are also worth reading."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
+#. type: Content of: <chapter><section><section><title>

 #: resources.dbk:48
 msgid "Core development mailing lists"
 msgstr ""
 
 #: resources.dbk:48
 msgid "Core development mailing lists"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: resources.dbk:50
 msgid "The core Debian mailing lists that developers should use are:"
 msgstr ""
 
 #: resources.dbk:50
 msgid "The core Debian mailing lists that developers should use are:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

 #: resources.dbk:55
 msgid ""
 "&email-debian-devel-announce;, used to announce important things to "
 "developers.  All developers are expected to be subscribed to this list."
 msgstr ""
 
 #: resources.dbk:55
 msgid ""
 "&email-debian-devel-announce;, used to announce important things to "
 "developers.  All developers are expected to be subscribed to this list."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

 #: resources.dbk:62
 msgid ""
 "&email-debian-devel;, used to discuss various development related technical "
 "issues."
 msgstr ""
 
 #: resources.dbk:62
 msgid ""
 "&email-debian-devel;, used to discuss various development related technical "
 "issues."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

 #: resources.dbk:68
 msgid "&email-debian-policy;, where the Debian Policy is discussed and voted on."
 msgstr ""
 
 #: resources.dbk:68
 msgid "&email-debian-policy;, where the Debian Policy is discussed and voted on."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

 #: resources.dbk:74
 msgid ""
 "&email-debian-project;, used to discuss various non-technical issues related "
 "to the project."
 msgstr ""
 
 #: resources.dbk:74
 msgid ""
 "&email-debian-project;, used to discuss various non-technical issues related "
 "to the project."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: resources.dbk:80
 msgid ""
 "There are other mailing lists available for a variety of special topics; see "
 "<ulink url=\"http://&lists-host;/\"></ulink> for a list."
 msgstr ""
 
 #: resources.dbk:80
 msgid ""
 "There are other mailing lists available for a variety of special topics; see "
 "<ulink url=\"http://&lists-host;/\"></ulink> for a list."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
+#. type: Content of: <chapter><section><section><title>

 #: resources.dbk:86
 msgid "Special lists"
 msgstr ""
 
 #: resources.dbk:86
 msgid "Special lists"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: resources.dbk:88
 msgid ""
 "&email-debian-private; is a special mailing list for private discussions "
 #: resources.dbk:88
 msgid ""
 "&email-debian-private; is a special mailing list for private discussions "


@@ -141,7 +141,7 @@ msgid ""
 "<filename>&file-debian-private-archive;</filename> directory."
 msgstr ""
 
 "<filename>&file-debian-private-archive;</filename> directory."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: resources.dbk:100
 msgid ""
 "&email-debian-email; is a special mailing list used as a grab-bag for Debian "
 #: resources.dbk:100
 msgid ""
 "&email-debian-email; is a special mailing list used as a grab-bag for Debian "


@@ -150,12 +150,12 @@ msgid ""
 "to have the discussion archived somewhere."
 msgstr ""
 
 "to have the discussion archived somewhere."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
+#. type: Content of: <chapter><section><section><title>

 #: resources.dbk:108
 msgid "Requesting new development-related lists"
 msgstr ""
 
 #: resources.dbk:108
 msgid "Requesting new development-related lists"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: resources.dbk:110
 msgid ""
 "Before requesting a mailing list that relates to the development of a "
 #: resources.dbk:110
 msgid ""
 "Before requesting a mailing list that relates to the development of a "


@@ -166,7 +166,7 @@ msgid ""
 "linkend=\"alioth\">Alioth</link> is more appropriate."
 msgstr ""
 
 "linkend=\"alioth\">Alioth</link> is more appropriate."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>

 #: resources.dbk:118
 msgid ""
 "If you decide that a regular mailing list on &lists-host; is really what you "
 #: resources.dbk:118
 msgid ""
 "If you decide that a regular mailing list on &lists-host; is really what you "


@@ -174,12 +174,12 @@ msgid ""
 "url=\"&url-debian-lists-new;\">the HOWTO</ulink>."
 msgstr ""
 
 "url=\"&url-debian-lists-new;\">the HOWTO</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
+#. type: Content of: <chapter><section><title>

 #: resources.dbk:127
 msgid "IRC channels"
 msgstr ""
 
 #: resources.dbk:127
 msgid "IRC channels"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: resources.dbk:129
 msgid ""
 "Several IRC channels are dedicated to Debian's development.  They are mainly "
 #: resources.dbk:129
 msgid ""
 "Several IRC channels are dedicated to Debian's development.  They are mainly "


@@ -188,7 +188,7 @@ msgid ""
 "an alias to <literal>irc.oftc.net</literal>."
 msgstr ""
 
 "an alias to <literal>irc.oftc.net</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: resources.dbk:135
 msgid ""
 "The main channel for Debian in general is <literal>#debian</literal>.  This "
 #: resources.dbk:135
 msgid ""
 "The main channel for Debian in general is <literal>#debian</literal>.  This "


@@ -199,7 +199,7 @@ msgid ""
 "similarly named channels for speakers of other languages."
 msgstr ""
 
 "similarly named channels for speakers of other languages."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: resources.dbk:143
 msgid ""
 "The main channel for Debian development is "
 #: resources.dbk:143
 msgid ""
 "The main channel for Debian development is "


@@ -210,21 +210,19 @@ msgid ""
 "topic is commonly full of interesting information for developers."
 msgstr ""
 
 "topic is commonly full of interesting information for developers."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#. type: Content of: <chapter><section><para>

 #: resources.dbk:151
 msgid ""
 "Since <literal>#debian-devel</literal> is an open channel, you should not "
 "speak there of issues that are discussed in &email-debian-private;.  There's "
 "another channel for this purpose, it's called "
 "<literal>#debian-private</literal> and it's protected by a key.  This key is "
 #: resources.dbk:151
 msgid ""
 "Since <literal>#debian-devel</literal> is an open channel, you should not "
 "speak there of issues that are discussed in &email-debian-private;.  There's "
 "another channel for this purpose, it's called "
 "<literal>#debian-private</literal> and it's protected by a key.  This key is "

-"available in the archives of debian-private in "
-"<filename>master.debian.org:&file-debian-private-archive;</filename>, just "
-"<command>zgrep</command> for <literal>#debian-private</literal> in all the "
-"files."
+"available at "
+"<filename>master.debian.org:&file-debian-private-key;</filename>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:161
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:159

 msgid ""
 "There are other additional channels dedicated to specific subjects.  "
 "<literal>#debian-bugs</literal> is used for coordinating bug squashing "
 msgid ""
 "There are other additional channels dedicated to specific subjects.  "
 "<literal>#debian-bugs</literal> is used for coordinating bug squashing "


@@ -237,16 +235,16 @@ msgid ""
 "<literal>#debian-oo</literal> (OpenOffice package) ..."
 msgstr ""
 
 "<literal>#debian-oo</literal> (OpenOffice package) ..."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:172
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:170

 msgid ""
 "Some non-English developers' channels exist as well, for example "
 "<literal>#debian-devel-fr</literal> for French speaking people interested in "
 "Debian's development."
 msgstr ""
 
 msgid ""
 "Some non-English developers' channels exist as well, for example "
 "<literal>#debian-devel-fr</literal> for French speaking people interested in "
 "Debian's development."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:177
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:175

 msgid ""
 "Channels dedicated to Debian also exist on other IRC networks, notably on "
 "the <ulink url=\"&url-openprojects;\">freenode</ulink> IRC network, which "
 msgid ""
 "Channels dedicated to Debian also exist on other IRC networks, notably on "
 "the <ulink url=\"&url-openprojects;\">freenode</ulink> IRC network, which "


@@ -254,8 +252,8 @@ msgid ""
 "2006."
 msgstr ""
 
 "2006."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:183
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:181

 msgid ""
 "To get a cloak on freenode, you send Jörg Jaspert &lt;joerg@debian.org&gt; a "
 "signed mail where you tell what your nick is.  Put cloak somewhere in the "
 msgid ""
 "To get a cloak on freenode, you send Jörg Jaspert &lt;joerg@debian.org&gt; a "
 "signed mail where you tell what your nick is.  Put cloak somewhere in the "


@@ -266,13 +264,13 @@ msgid ""
 "documentation</ulink> for more information about cloaks."
 msgstr ""
 
 "documentation</ulink> for more information about cloaks."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:194
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:192

 msgid "Documentation"
 msgstr ""
 
 msgid "Documentation"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:196
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:194

 msgid ""
 "This document contains a lot of information which is useful to Debian "
 "developers, but it cannot contain everything.  Most of the other interesting "
 msgid ""
 "This document contains a lot of information which is useful to Debian "
 "developers, but it cannot contain everything.  Most of the other interesting "


@@ -281,13 +279,13 @@ msgid ""
 "more things."
 msgstr ""
 
 "more things."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:205
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:203

 msgid "Debian machines"
 msgstr ""
 
 msgid "Debian machines"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:207
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:205

 msgid ""
 "Debian has several computers working as servers, most of which serve "
 "critical functions in the Debian project.  Most of the machines are used for "
 msgid ""
 "Debian has several computers working as servers, most of which serve "
 "critical functions in the Debian project.  Most of the machines are used for "


@@ -295,16 +293,16 @@ msgid ""
 "Internet."
 msgstr ""
 
 "Internet."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:212
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:210

 msgid ""
 "Some of the machines are available for individual developers to use, as long "
 "as the developers follow the rules set forth in the <ulink "
 "url=\"&url-dmup;\">Debian Machine Usage Policies</ulink>."
 msgstr ""
 
 msgid ""
 "Some of the machines are available for individual developers to use, as long "
 "as the developers follow the rules set forth in the <ulink "
 "url=\"&url-dmup;\">Debian Machine Usage Policies</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:217
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:215

 msgid ""
 "Generally speaking, you can use these machines for Debian-related purposes "
 "as you see fit.  Please be kind to system administrators, and do not use up "
 msgid ""
 "Generally speaking, you can use these machines for Debian-related purposes "
 "as you see fit.  Please be kind to system administrators, and do not use up "


@@ -313,31 +311,31 @@ msgid ""
 "by volunteers."
 msgstr ""
 
 "by volunteers."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:224
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:222

 msgid ""
 "Please take care to protect your Debian passwords and SSH keys installed on "
 "Debian machines.  Avoid login or upload methods which send passwords over "
 "the Internet in the clear, such as telnet, FTP, POP etc."
 msgstr ""
 
 msgid ""
 "Please take care to protect your Debian passwords and SSH keys installed on "
 "Debian machines.  Avoid login or upload methods which send passwords over "
 "the Internet in the clear, such as telnet, FTP, POP etc."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:229
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:227

 msgid ""
 "Please do not put any material that doesn't relate to Debian on the Debian "
 "servers, unless you have prior permission."
 msgstr ""
 
 msgid ""
 "Please do not put any material that doesn't relate to Debian on the Debian "
 "servers, unless you have prior permission."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:233
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:231

 msgid ""
 "The current list of Debian machines is available at <ulink "
 "url=\"&url-devel-machines;\"></ulink>.  That web page contains machine "
 "names, contact information, information about who can log in, SSH keys etc."
 msgstr ""
 
 msgid ""
 "The current list of Debian machines is available at <ulink "
 "url=\"&url-devel-machines;\"></ulink>.  That web page contains machine "
 "names, contact information, information about who can log in, SSH keys etc."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:239
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:237

 msgid ""
 "If you have a problem with the operation of a Debian server, and you think "
 "that the system operators need to be notified of this problem, you can check "
 msgid ""
 "If you have a problem with the operation of a Debian server, and you think "
 "that the system operators need to be notified of this problem, you can check "


@@ -348,8 +346,8 @@ msgid ""
 "the subject."
 msgstr ""
 
 "the subject."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:247
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:245

 msgid ""
 "If you have a problem with a certain service, not related to the system "
 "administration (such as packages to be removed from the archive, suggestions "
 msgid ""
 "If you have a problem with a certain service, not related to the system "
 "administration (such as packages to be removed from the archive, suggestions "


@@ -358,32 +356,32 @@ msgid ""
 "how to submit bugs."
 msgstr ""
 
 "how to submit bugs."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:254
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:252

 msgid ""
 "Some of the core servers are restricted, but the information from there is "
 "mirrored to another server."
 msgstr ""
 
 msgid ""
 "Some of the core servers are restricted, but the information from there is "
 "mirrored to another server."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:258
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:256

 msgid "The bugs server"
 msgstr ""
 
 msgid "The bugs server"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:260
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:258

 msgid ""
 "<literal>&bugs-host;</literal> is the canonical location for the Bug "
 "Tracking System (BTS)."
 msgstr ""
 
 msgid ""
 "<literal>&bugs-host;</literal> is the canonical location for the Bug "
 "Tracking System (BTS)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:264 resources.dbk:282
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:262 resources.dbk:280

 msgid "It is restricted; a mirror is available on <literal>merkel</literal>."
 msgstr ""
 
 msgid "It is restricted; a mirror is available on <literal>merkel</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:267
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:265

 msgid ""
 "If you plan on doing some statistical analysis or processing of Debian bugs, "
 "this would be the place to do it.  Please describe your plans on "
 msgid ""
 "If you plan on doing some statistical analysis or processing of Debian bugs, "
 "this would be the place to do it.  Please describe your plans on "


@@ -391,21 +389,21 @@ msgid ""
 "unnecessary duplication of effort or wasted processing time."
 msgstr ""
 
 "unnecessary duplication of effort or wasted processing time."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:275
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:273

 msgid "The ftp-master server"
 msgstr ""
 
 msgid "The ftp-master server"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:277
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:275

 msgid ""
 "The <literal>&ftp-master-host;</literal> server holds the canonical copy of "
 msgid ""
 "The <literal>&ftp-master-host;</literal> server holds the canonical copy of "

-"the Debian archive.  Generally, package uploads go to this server; see <xref "
-"linkend=\"upload\"/>."
+"the Debian archive.  Generally, package uploaded to &ftp-upload-host; end up "
+"on this server, see <xref linkend=\"upload\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:285
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:283

 msgid ""
 "Problems with the Debian FTP archive generally need to be reported as bugs "
 "against the <systemitem role=\"package\">&ftp-debian-org;</systemitem> "
 msgid ""
 "Problems with the Debian FTP archive generally need to be reported as bugs "
 "against the <systemitem role=\"package\">&ftp-debian-org;</systemitem> "


@@ -413,20 +411,20 @@ msgid ""
 "in <xref linkend=\"archive-manip\"/> ."
 msgstr ""
 
 "in <xref linkend=\"archive-manip\"/> ."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:293
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:291

 msgid "The www-master server"
 msgstr ""
 
 msgid "The www-master server"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:295
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:293

 msgid ""
 "The main web server is <literal>www-master.debian.org</literal>.  It holds "
 "the official web pages, the face of Debian for most newbies."
 msgstr ""
 
 msgid ""
 "The main web server is <literal>www-master.debian.org</literal>.  It holds "
 "the official web pages, the face of Debian for most newbies."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:299
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:297

 msgid ""
 "If you find a problem with the Debian web server, you should generally "
 "submit a bug against the pseudo-package, <systemitem "
 msgid ""
 "If you find a problem with the Debian web server, you should generally "
 "submit a bug against the pseudo-package, <systemitem "


@@ -435,20 +433,20 @@ msgid ""
 "url=\"http://&bugs-host;/&www-debian-org;\">Bug Tracking System</ulink>."
 msgstr ""
 
 "url=\"http://&bugs-host;/&www-debian-org;\">Bug Tracking System</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:308
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:306

 msgid "The people web server"
 msgstr ""
 
 msgid "The people web server"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:310
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:308

 msgid ""
 "<literal>people.debian.org</literal> is the server used for developers' own "
 "web pages about anything related to Debian."
 msgstr ""
 
 msgid ""
 "<literal>people.debian.org</literal> is the server used for developers' own "
 "web pages about anything related to Debian."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:314
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:312

 msgid ""
 "If you have some Debian-specific information which you want to serve on the "
 "web, you can do this by putting material in the "
 msgid ""
 "If you have some Debian-specific information which you want to serve on the "
 "web, you can do this by putting material in the "


@@ -457,33 +455,33 @@ msgid ""
 "<literal>http://people.debian.org/~<replaceable>your-user-id</replaceable>/</literal>."
 msgstr ""
 
 "<literal>http://people.debian.org/~<replaceable>your-user-id</replaceable>/</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:321
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:319

 msgid ""
 "You should only use this particular location because it will be backed up, "
 "whereas on other hosts it won't."
 msgstr ""
 
 msgid ""
 "You should only use this particular location because it will be backed up, "
 "whereas on other hosts it won't."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:325
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:323

 msgid ""
 "Usually the only reason to use a different host is when you need to publish "
 "materials subject to the U.S.  export restrictions, in which case you can "
 "use one of the other servers located outside the United States."
 msgstr ""
 
 msgid ""
 "Usually the only reason to use a different host is when you need to publish "
 "materials subject to the U.S.  export restrictions, in which case you can "
 "use one of the other servers located outside the United States."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:330
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:328

 msgid "Send mail to &email-debian-devel; if you have any questions."
 msgstr ""
 
 msgid "Send mail to &email-debian-devel; if you have any questions."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:335
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:333

 msgid "The VCS servers"
 msgstr ""
 
 msgid "The VCS servers"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:337
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:335

 msgid ""
 "If you need to use a Version Control System for any of your Debian work, you "
 "can use one the existing repositories hosted on Alioth or you can request a "
 msgid ""
 "If you need to use a Version Control System for any of your Debian work, you "
 "can use one the existing repositories hosted on Alioth or you can request a "


@@ -496,50 +494,49 @@ msgid ""
 "provided by Alioth."
 msgstr ""
 
 "provided by Alioth."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:348
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:346

 msgid ""
 "Historically, Debian first used <literal>cvs.debian.org</literal> to host "
 "CVS repositories. But that service is deprecated in favor of Alioth.  Only a "
 "few projects are still using it."
 msgstr ""
 
 msgid ""
 "Historically, Debian first used <literal>cvs.debian.org</literal> to host "
 "CVS repositories. But that service is deprecated in favor of Alioth.  Only a "
 "few projects are still using it."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:355
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:353

 msgid "chroots to different distributions"
 msgstr ""
 
 msgid "chroots to different distributions"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:357
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:355

 msgid ""
 "On some machines, there are chroots to different distributions available.  "
 "You can use them like this:"
 msgstr ""
 
 msgid ""
 "On some machines, there are chroots to different distributions available.  "
 "You can use them like this:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: resources.dbk:360
+#. type: Content of: <chapter><section><section><screen>
+#: resources.dbk:359

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"\n"

 "vore$ dchroot unstable\n"
 "Executing shell in chroot: /org/vore.debian.org/chroots/user/unstable\n"
 msgstr ""
 
 "vore$ dchroot unstable\n"
 "Executing shell in chroot: /org/vore.debian.org/chroots/user/unstable\n"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:365
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:363

 msgid ""
 "In all chroots, the normal user home directories are available.  You can "
 "find out which chroots are available via "
 "<literal>&url-devel-machines;</literal>."
 msgstr ""
 
 msgid ""
 "In all chroots, the normal user home directories are available.  You can "
 "find out which chroots are available via "
 "<literal>&url-devel-machines;</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:374
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:372

 msgid "The Developers Database"
 msgstr ""
 
 msgid "The Developers Database"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:376
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:374

 msgid ""
 "The Developers Database, at <ulink url=\"&url-debian-db;\"></ulink>, is an "
 "LDAP directory for managing Debian developer attributes.  You can use this "
 msgid ""
 "The Developers Database, at <ulink url=\"&url-debian-db;\"></ulink>, is an "
 "LDAP directory for managing Debian developer attributes.  You can use this "


@@ -548,30 +545,30 @@ msgid ""
 "<command>finger yourlogin@db.debian.org</command> to see what it reports."
 msgstr ""
 
 "<command>finger yourlogin@db.debian.org</command> to see what it reports."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:384
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:382

 msgid ""
 "Developers can <ulink url=\"&url-debian-db-login;\">log into the "
 "database</ulink> to change various information about themselves, such as:"
 msgstr ""
 
 msgid ""
 "Developers can <ulink url=\"&url-debian-db-login;\">log into the "
 "database</ulink> to change various information about themselves, such as:"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:390
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:388

 msgid "forwarding address for your debian.org email"
 msgstr ""
 
 msgid "forwarding address for your debian.org email"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:395
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:393

 msgid "subscription to debian-private"
 msgstr ""
 
 msgid "subscription to debian-private"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:400
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:398

 msgid "whether you are on vacation"
 msgstr ""
 
 msgid "whether you are on vacation"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:405
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:403

 msgid ""
 "personal information such as your address, country, the latitude and "
 "longitude of the place where you live for use in <ulink "
 msgid ""
 "personal information such as your address, country, the latitude and "
 "longitude of the place where you live for use in <ulink "


@@ -579,21 +576,21 @@ msgid ""
 "fax numbers, IRC nickname and web page"
 msgstr ""
 
 "fax numbers, IRC nickname and web page"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:413
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:411

 msgid "password and preferred shell on Debian Project machines"
 msgstr ""
 
 msgid "password and preferred shell on Debian Project machines"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:418
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:416

 msgid ""
 "Most of the information is not accessible to the public, naturally.  For "
 "more information please read the online documentation that you can find at "
 "<ulink url=\"&url-debian-db-doc;\"></ulink>."
 msgstr ""
 
 msgid ""
 "Most of the information is not accessible to the public, naturally.  For "
 "more information please read the online documentation that you can find at "
 "<ulink url=\"&url-debian-db-doc;\"></ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:423
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:421

 msgid ""
 "Developers can also submit their SSH keys to be used for authorization on "
 "the official Debian machines, and even add new *.debian.net DNS entries.  "
 msgid ""
 "Developers can also submit their SSH keys to be used for authorization on "
 "the official Debian machines, and even add new *.debian.net DNS entries.  "


@@ -601,26 +598,26 @@ msgid ""
 "url=\"&url-debian-db-mail-gw;\"></ulink>."
 msgstr ""
 
 "url=\"&url-debian-db-mail-gw;\"></ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:431
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:429

 msgid "The Debian archive"
 msgstr ""
 
 msgid "The Debian archive"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:433
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:431

 msgid ""
 "The &debian-formal; distribution consists of a lot of packages "
 "(<filename>.deb</filename>'s, currently around &number-of-pkgs;) and a few "
 "additional files (such as documentation and installation disk images)."
 msgstr ""
 
 msgid ""
 "The &debian-formal; distribution consists of a lot of packages "
 "(<filename>.deb</filename>'s, currently around &number-of-pkgs;) and a few "
 "additional files (such as documentation and installation disk images)."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:439
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:437

 msgid "Here is an example directory tree of a complete Debian archive:"
 msgstr ""
 
 msgid "Here is an example directory tree of a complete Debian archive:"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:443
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:441

 msgid ""
 "As you can see, the top-level directory contains two directories, "
 "<filename>dists/</filename> and <filename>pool/</filename>.  The latter is a "
 msgid ""
 "As you can see, the top-level directory contains two directories, "
 "<filename>dists/</filename> and <filename>pool/</filename>.  The latter is a "


@@ -636,16 +633,16 @@ msgid ""
 "<literal>unstable</literal> and <literal>testing</literal> distributions."
 msgstr ""
 
 "<literal>unstable</literal> and <literal>testing</literal> distributions."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:457
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:455

 msgid ""
 "<filename>dists/stable</filename> contains three directories, namely "
 "<filename>main</filename>, <filename>contrib</filename>, and "
 "<filename>non-free</filename>."
 msgstr ""
 
 msgid ""
 "<filename>dists/stable</filename> contains three directories, namely "
 "<filename>main</filename>, <filename>contrib</filename>, and "
 "<filename>non-free</filename>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:462
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:460

 msgid ""
 "In each of the areas, there is a directory for the source packages "
 "(<filename>source</filename>) and a directory for each supported "
 msgid ""
 "In each of the areas, there is a directory for the source packages "
 "(<filename>source</filename>) and a directory for each supported "


@@ -653,8 +650,8 @@ msgid ""
 "<filename>binary-m68k</filename>, etc.)."
 msgstr ""
 
 "<filename>binary-m68k</filename>, etc.)."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:467
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:465

 msgid ""
 "The <filename>main</filename> area contains additional directories which "
 "hold the disk images and some essential pieces of documentation required for "
 msgid ""
 "The <filename>main</filename> area contains additional directories which "
 "hold the disk images and some essential pieces of documentation required for "


@@ -662,13 +659,13 @@ msgid ""
 "(<filename>disks-i386</filename>, <filename>disks-m68k</filename>, etc.)."
 msgstr ""
 
 "(<filename>disks-i386</filename>, <filename>disks-m68k</filename>, etc.)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:473
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:471

 msgid "Sections"
 msgstr ""
 
 msgid "Sections"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:475
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:473

 msgid ""
 "The <literal>main</literal> section of the Debian archive is what makes up "
 "the <emphasis role=\"strong\">official &debian-formal; "
 msgid ""
 "The <literal>main</literal> section of the Debian archive is what makes up "
 "the <emphasis role=\"strong\">official &debian-formal; "


@@ -678,8 +675,8 @@ msgid ""
 "role=\"strong\">not</emphasis> officially part of &debian-formal;."
 msgstr ""
 
 "role=\"strong\">not</emphasis> officially part of &debian-formal;."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:483
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:481

 msgid ""
 "Every package in the main section must fully comply with the <ulink "
 "url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink> (DFSG) and with "
 msgid ""
 "Every package in the main section must fully comply with the <ulink "
 "url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink> (DFSG) and with "


@@ -689,16 +686,16 @@ msgid ""
 "details."
 msgstr ""
 
 "details."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:491
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:489

 msgid ""
 "Packages in the <literal>contrib</literal> section have to comply with the "
 "DFSG, but may fail other requirements.  For instance, they may depend on "
 "non-free packages."
 msgstr ""
 
 msgid ""
 "Packages in the <literal>contrib</literal> section have to comply with the "
 "DFSG, but may fail other requirements.  For instance, they may depend on "
 "non-free packages."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:496
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:494

 msgid ""
 "Packages which do not conform to the DFSG are placed in the "
 "<literal>non-free</literal> section.  These packages are not considered as "
 msgid ""
 "Packages which do not conform to the DFSG are placed in the "
 "<literal>non-free</literal> section.  These packages are not considered as "


@@ -707,16 +704,16 @@ msgid ""
 "non-free software packages."
 msgstr ""
 
 "non-free software packages."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:503
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:501

 msgid ""
 "The <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> contains "
 "a more exact definition of the three sections.  The above discussion is just "
 "an introduction."
 msgstr ""
 
 msgid ""
 "The <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> contains "
 "a more exact definition of the three sections.  The above discussion is just "
 "an introduction."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:508
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:506

 msgid ""
 "The separation of the three sections at the top-level of the archive is "
 "important for all people who want to distribute Debian, either via FTP "
 msgid ""
 "The separation of the three sections at the top-level of the archive is "
 "important for all people who want to distribute Debian, either via FTP "


@@ -726,8 +723,8 @@ msgid ""
 "section do not allow commercial distribution, for example."
 msgstr ""
 
 "section do not allow commercial distribution, for example."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:516
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:514

 msgid ""
 "On the other hand, a CD-ROM vendor could easily check the individual package "
 "licenses of the packages in <literal>non-free</literal> and include as many "
 msgid ""
 "On the other hand, a CD-ROM vendor could easily check the individual package "
 "licenses of the packages in <literal>non-free</literal> and include as many "


@@ -735,8 +732,8 @@ msgid ""
 "to vendor, this job can't be done by the Debian developers.)"
 msgstr ""
 
 "to vendor, this job can't be done by the Debian developers.)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:522
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:520

 msgid ""
 "Note that the term section is also used to refer to categories which "
 "simplify the organization and browsing of available packages, e.g.  "
 msgid ""
 "Note that the term section is also used to refer to categories which "
 "simplify the organization and browsing of available packages, e.g.  "


@@ -746,21 +743,21 @@ msgid ""
 "only in the Section header fields of packages."
 msgstr ""
 
 "only in the Section header fields of packages."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:532
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:530

 msgid "Architectures"
 msgstr ""
 
 msgid "Architectures"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:534
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:532

 msgid ""
 "In the first days, the Linux kernel was only available for Intel i386 (or "
 "greater) platforms, and so was Debian.  But as Linux became more and more "
 "popular, the kernel was ported to other architectures, too."
 msgstr ""
 
 msgid ""
 "In the first days, the Linux kernel was only available for Intel i386 (or "
 "greater) platforms, and so was Debian.  But as Linux became more and more "
 "popular, the kernel was ported to other architectures, too."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:539
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:537

 msgid ""
 "The Linux 2.0 kernel supports Intel x86, DEC Alpha, SPARC, Motorola 680x0 "
 "(like Atari, Amiga and Macintoshes), MIPS, and PowerPC.  The Linux 2.2 "
 msgid ""
 "The Linux 2.0 kernel supports Intel x86, DEC Alpha, SPARC, Motorola 680x0 "
 "(like Atari, Amiga and Macintoshes), MIPS, and PowerPC.  The Linux 2.2 "


@@ -776,8 +773,8 @@ msgid ""
 "as of this writing."
 msgstr ""
 
 "as of this writing."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:553
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:551

 msgid ""
 "&debian-formal; 1.3 is only available as <literal>i386</literal>.  Debian "
 "2.0 shipped for <literal>i386</literal> and <literal>m68k</literal> "
 msgid ""
 "&debian-formal; 1.3 is only available as <literal>i386</literal>.  Debian "
 "2.0 shipped for <literal>i386</literal> and <literal>m68k</literal> "


@@ -790,62 +787,92 @@ msgid ""
 "and <literal>mipsel</literal>."
 msgstr ""
 
 "and <literal>mipsel</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:564
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:562

 msgid ""
 "Information for developers and users about the specific ports are available "
 "at the <ulink url=\"&url-debian-ports;\">Debian Ports web pages</ulink>."
 msgstr ""
 
 msgid ""
 "Information for developers and users about the specific ports are available "
 "at the <ulink url=\"&url-debian-ports;\">Debian Ports web pages</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:570
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:568

 msgid "Packages"
 msgstr ""
 
 msgid "Packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:572
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:570

 msgid ""
 "There are two types of Debian packages, namely <literal>source</literal> and "
 "<literal>binary</literal> packages."
 msgstr ""
 
 msgid ""
 "There are two types of Debian packages, namely <literal>source</literal> and "
 "<literal>binary</literal> packages."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:576
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:574
+msgid ""
+"Depending on the format of the source package, it will consist of one or "
+"more files in addition to the mandatory <filename>.dsc</filename> file:"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para><itemizedlist><listitem><para>
+#: resources.dbk:578

 msgid ""
 msgid ""

-"Source packages consist of either two or three files: a "
-"<filename>.dsc</filename> file, and either a <filename>.tar.gz</filename> "
-"file or both an <filename>.orig.tar.gz</filename> and a "
-"<filename>.diff.gz</filename> file."
+"with format “1.0”, it has either a <filename>.tar.gz</filename> file or both "
+"an <filename>.orig.tar.gz</filename> and a <filename>.diff.gz</filename> "
+"file;"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:582
+#. type: Content of: <chapter><section><section><para><itemizedlist><listitem><para>
+#: resources.dbk:581
+msgid ""
+"with format “3.0 (quilt)”, it has a mandatory "
+"<filename>.orig.tar.{gz,bz2,lzma}</filename> upstream tarball, muliple "
+"optional "
+"<filename>.orig-<replaceable>component</replaceable>.tar.{gz,bz2,lzma}</filename> "
+"additional upstream tarballs"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para><itemizedlist><listitem><filename>
+#: resources.dbk:584
+msgid "debian.tar.{gz,bz2,lzma} debian tarball"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para><itemizedlist><listitem><para>
+#: resources.dbk:585
+msgid ""
+"with format “3.0 (native)”, it has only a single "
+"<filename>.tar.{gz,bz2,lzma}</filename> tarball."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:590

 msgid ""
 "If a package is developed specially for Debian and is not distributed "
 msgid ""
 "If a package is developed specially for Debian and is not distributed "

-"outside of Debian, there is just one <filename>.tar.gz</filename> file which "
-"contains the sources of the program.  If a package is distributed elsewhere "
-"too, the <filename>.orig.tar.gz</filename> file stores the so-called "
+"outside of Debian, there is just one <filename>.tar.{gz,bz2,lzma}</filename> "
+"file which contains the sources of the program, it's called a “native” "
+"source package.  If a package is distributed elsewhere too, the "
+"<filename>.orig.tar.{gz,bz2,lzma}</filename> file stores the so-called "

 "<literal>upstream source code</literal>, that is the source code that's "
 "distributed by the <literal>upstream maintainer</literal> (often the author "
 "<literal>upstream source code</literal>, that is the source code that's "
 "distributed by the <literal>upstream maintainer</literal> (often the author "

-"of the software).  In this case, the <filename>.diff.gz</filename> contains "
-"the changes made by the Debian maintainer."
+"of the software). In this case, the <filename>.diff.gz</filename> or the "
+"<filename>debian.tar.{gz,bz2,lzma}</filename> contains the changes made by "
+"the Debian maintainer."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:592
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:603

 msgid ""
 "The <filename>.dsc</filename> file lists all the files in the source package "
 "together with checksums (<command>md5sums</command>) and some additional "
 "info about the package (maintainer, version, etc.)."
 msgstr ""
 
 msgid ""
 "The <filename>.dsc</filename> file lists all the files in the source package "
 "together with checksums (<command>md5sums</command>) and some additional "
 "info about the package (maintainer, version, etc.)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:599
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:610

 msgid "Distributions"
 msgstr ""
 
 msgid "Distributions"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:601
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:612

 msgid ""
 "The directory system described in the previous chapter is itself contained "
 "within <literal>distribution directories</literal>.  Each distribution is "
 msgid ""
 "The directory system described in the previous chapter is itself contained "
 "within <literal>distribution directories</literal>.  Each distribution is "


@@ -853,8 +880,8 @@ msgid ""
 "top-level of the Debian archive itself."
 msgstr ""
 
 "top-level of the Debian archive itself."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:607
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:618

 msgid ""
 "To summarize, the Debian archive has a root directory within an FTP server.  "
 "For instance, at the mirror site, <literal>ftp.us.debian.org</literal>, the "
 msgid ""
 "To summarize, the Debian archive has a root directory within an FTP server.  "
 "For instance, at the mirror site, <literal>ftp.us.debian.org</literal>, the "


@@ -863,8 +890,8 @@ msgid ""
 "location (another is <filename>/pub/debian</filename>)."
 msgstr ""
 
 "location (another is <filename>/pub/debian</filename>)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:614
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:625

 msgid ""
 "A distribution comprises Debian source and binary packages, and the "
 "respective <filename>Sources</filename> and <filename>Packages</filename> "
 msgid ""
 "A distribution comprises Debian source and binary packages, and the "
 "respective <filename>Sources</filename> and <filename>Packages</filename> "


@@ -874,13 +901,13 @@ msgid ""
 "(for backwards compatibility)."
 msgstr ""
 
 "(for backwards compatibility)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: resources.dbk:622
+#. type: Content of: <chapter><section><section><section><title>
+#: resources.dbk:633

 msgid "Stable, testing, and unstable"
 msgstr ""
 
 msgid "Stable, testing, and unstable"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:624
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:635

 msgid ""
 "There are always distributions called <literal>stable</literal> (residing in "
 "<filename>dists/stable</filename>), <literal>testing</literal> (residing in "
 msgid ""
 "There are always distributions called <literal>stable</literal> (residing in "
 "<filename>dists/stable</filename>), <literal>testing</literal> (residing in "


@@ -889,8 +916,8 @@ msgid ""
 "development process of the Debian project."
 msgstr ""
 
 "development process of the Debian project."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:631
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:642

 msgid ""
 "Active development is done in the <literal>unstable</literal> distribution "
 "(that's why this distribution is sometimes called the <literal>development "
 msgid ""
 "Active development is done in the <literal>unstable</literal> distribution "
 "(that's why this distribution is sometimes called the <literal>development "


@@ -901,8 +928,8 @@ msgid ""
 "sometimes literally unstable."
 msgstr ""
 
 "sometimes literally unstable."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:640
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:651

 msgid ""
 "The <link linkend=\"testing\">testing</link> distribution is generated "
 "automatically by taking packages from <literal>unstable</literal> if they "
 msgid ""
 "The <link linkend=\"testing\">testing</link> distribution is generated "
 "automatically by taking packages from <literal>unstable</literal> if they "


@@ -912,8 +939,8 @@ msgid ""
 "been installed.  See <xref linkend=\"testing\"/> ."
 msgstr ""
 
 "been installed.  See <xref linkend=\"testing\"/> ."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:648
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:659

 msgid ""
 "After a period of development, once the release manager deems fit, the "
 "<literal>testing</literal> distribution is frozen, meaning that the policies "
 msgid ""
 "After a period of development, once the release manager deems fit, the "
 "<literal>testing</literal> distribution is frozen, meaning that the policies "


@@ -933,8 +960,8 @@ msgid ""
 "<literal>&archive-host;</literal>)."
 msgstr ""
 
 "<literal>&archive-host;</literal>)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:665
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:676

 msgid ""
 "This development cycle is based on the assumption that the "
 "<literal>unstable</literal> distribution becomes <literal>stable</literal> "
 msgid ""
 "This development cycle is based on the assumption that the "
 "<literal>unstable</literal> distribution becomes <literal>stable</literal> "


@@ -953,41 +980,41 @@ msgid ""
 "distribution</link> for details."
 msgstr ""
 
 "distribution</link> for details."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:682
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:693

 msgid ""
 "Note that development under <literal>unstable</literal> continues during the "
 "freeze period, since the <literal>unstable</literal> distribution remains in "
 "place in parallel with <literal>testing</literal>."
 msgstr ""
 
 msgid ""
 "Note that development under <literal>unstable</literal> continues during the "
 "freeze period, since the <literal>unstable</literal> distribution remains in "
 "place in parallel with <literal>testing</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: resources.dbk:689
+#. type: Content of: <chapter><section><section><section><title>
+#: resources.dbk:700

 msgid "More information about the testing distribution"
 msgstr ""
 
 msgid "More information about the testing distribution"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:691
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:702

 msgid ""
 "Packages are usually installed into the <literal>testing</literal> "
 "distribution after they have undergone some degree of testing in "
 "<literal>unstable</literal>."
 msgstr ""
 
 msgid ""
 "Packages are usually installed into the <literal>testing</literal> "
 "distribution after they have undergone some degree of testing in "
 "<literal>unstable</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:695
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:706

 msgid ""
 "For more details, please see the <link linkend=\"testing\">information about "
 "the testing distribution</link>."
 msgstr ""
 
 msgid ""
 "For more details, please see the <link linkend=\"testing\">information about "
 "the testing distribution</link>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: resources.dbk:701
+#. type: Content of: <chapter><section><section><section><title>
+#: resources.dbk:712

 msgid "Experimental"
 msgstr ""
 
 msgid "Experimental"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:703
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:714

 msgid ""
 "The <literal>experimental</literal> distribution is a special distribution.  "
 "It is not a full distribution in the same sense as "
 msgid ""
 "The <literal>experimental</literal> distribution is a special distribution.  "
 "It is not a full distribution in the same sense as "


@@ -1002,27 +1029,26 @@ msgid ""
 "distribution."
 msgstr ""
 
 "distribution."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:715
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:726

 msgid ""
 "These are the <citerefentry> <refentrytitle>sources.list</refentrytitle> "
 "<manvolnum>5</manvolnum> </citerefentry> lines for "
 "<literal>experimental</literal>:"
 msgstr ""
 
 msgid ""
 "These are the <citerefentry> <refentrytitle>sources.list</refentrytitle> "
 "<manvolnum>5</manvolnum> </citerefentry> lines for "
 "<literal>experimental</literal>:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><programlisting>
-#: resources.dbk:719
+#. type: Content of: <chapter><section><section><section><programlisting>
+#: resources.dbk:731

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"\n"

 "deb http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ experimental "
 "main\n"
 "deb-src http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ "
 "experimental main\n"
 msgstr ""
 
 "deb http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ experimental "
 "main\n"
 "deb-src http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ "
 "experimental main\n"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:724
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:735

 msgid ""
 "If there is a chance that the software could do grave damage to a system, it "
 "is likely to be better to put it into <literal>experimental</literal>.  For "
 msgid ""
 "If there is a chance that the software could do grave damage to a system, it "
 "is likely to be better to put it into <literal>experimental</literal>.  For "


@@ -1030,8 +1056,8 @@ msgid ""
 "<literal>experimental</literal>."
 msgstr ""
 
 "<literal>experimental</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:730
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:741

 msgid ""
 "Whenever there is a new upstream version of a package that introduces new "
 "features but breaks a lot of old ones, it should either not be uploaded, or "
 msgid ""
 "Whenever there is a new upstream version of a package that introduces new "
 "features but breaks a lot of old ones, it should either not be uploaded, or "


@@ -1043,8 +1069,8 @@ msgid ""
 "early access."
 msgstr ""
 
 "early access."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:740
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:751

 msgid ""
 "Some experimental software can still go into <literal>unstable</literal>, "
 "with a few warnings in the description, but that isn't recommended because "
 msgid ""
 "Some experimental software can still go into <literal>unstable</literal>, "
 "with a few warnings in the description, but that isn't recommended because "


@@ -1056,22 +1082,22 @@ msgid ""
 "<literal>unstable</literal> with a higher version number."
 msgstr ""
 
 "<literal>unstable</literal> with a higher version number."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:750
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:761

 msgid ""
 "New software which isn't likely to damage your system can go directly into "
 "<literal>unstable</literal>."
 msgstr ""
 
 msgid ""
 "New software which isn't likely to damage your system can go directly into "
 "<literal>unstable</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:754
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:765

 msgid ""
 "An alternative to <literal>experimental</literal> is to use your personal "
 "web space on <literal>people.debian.org</literal>."
 msgstr ""
 
 msgid ""
 "An alternative to <literal>experimental</literal> is to use your personal "
 "web space on <literal>people.debian.org</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:758
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:769

 msgid ""
 "When uploading to <literal>unstable</literal> a package which had bugs fixed "
 "in <literal>experimental</literal>, please consider using the option "
 msgid ""
 "When uploading to <literal>unstable</literal> a package which had bugs fixed "
 "in <literal>experimental</literal>, please consider using the option "


@@ -1079,33 +1105,34 @@ msgid ""
 "them closed."
 msgstr ""
 
 "them closed."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:768
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:779

 msgid "Release code names"
 msgstr ""
 
 msgid "Release code names"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:770
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:781

 msgid ""
 "Every released Debian distribution has a <literal>code name</literal>: "
 "Debian 1.1 is called <literal>buzz</literal>; Debian 1.2, "
 "<literal>rex</literal>; Debian 1.3, <literal>bo</literal>; Debian 2.0, "
 "<literal>hamm</literal>; Debian 2.1, <literal>slink</literal>; Debian 2.2, "
 "<literal>potato</literal>; Debian 3.0, <literal>woody</literal>; Debian 3.1, "
 msgid ""
 "Every released Debian distribution has a <literal>code name</literal>: "
 "Debian 1.1 is called <literal>buzz</literal>; Debian 1.2, "
 "<literal>rex</literal>; Debian 1.3, <literal>bo</literal>; Debian 2.0, "
 "<literal>hamm</literal>; Debian 2.1, <literal>slink</literal>; Debian 2.2, "
 "<literal>potato</literal>; Debian 3.0, <literal>woody</literal>; Debian 3.1, "

-"<literal>sarge</literal>; Debian 4.0, <literal>etch</literal> and Debian 5.0 "
-"will be called <literal> lenny</literal>.  There is also a "
-"``pseudo-distribution'', called <literal>sid</literal>, which is the current "
-"<literal>unstable</literal> distribution; since packages are moved from "
-"<literal>unstable</literal> to <literal>testing</literal> as they approach "
-"stability, <literal>sid</literal> itself is never released.  As well as the "
-"usual contents of a Debian distribution, <literal>sid</literal> contains "
-"packages for architectures which are not yet officially supported or "
-"released by Debian.  These architectures are planned to be integrated into "
-"the mainstream distribution at some future date."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:787
+"<literal>sarge</literal>; Debian 4.0, <literal>etch</literal>; Debian 5.0, "
+"<literal>lenny</literal> and the next release will be called "
+"<literal>squeeze</literal>.  There is also a ``pseudo-distribution'', called "
+"<literal>sid</literal>, which is the current <literal>unstable</literal> "
+"distribution; since packages are moved from <literal>unstable</literal> to "
+"<literal>testing</literal> as they approach stability, "
+"<literal>sid</literal> itself is never released.  As well as the usual "
+"contents of a Debian distribution, <literal>sid</literal> contains packages "
+"for architectures which are not yet officially supported or released by "
+"Debian.  These architectures are planned to be integrated into the "
+"mainstream distribution at some future date."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:799

 msgid ""
 "Since Debian has an open development model (i.e., everyone can participate "
 "and follow the development) even the <literal>unstable</literal> and "
 msgid ""
 "Since Debian has an open development model (i.e., everyone can participate "
 "and follow the development) even the <literal>unstable</literal> and "


@@ -1118,8 +1145,8 @@ msgid ""
 "large)."
 msgstr ""
 
 "large)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:797
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:809

 msgid ""
 "On the other hand, if we called the distribution directories "
 "<literal>Debian-x.y</literal> from the beginning, people would think that "
 msgid ""
 "On the other hand, if we called the distribution directories "
 "<literal>Debian-x.y</literal> from the beginning, people would think that "


@@ -1129,8 +1156,8 @@ msgid ""
 "release was 1.1, and not 1.0.)"
 msgstr ""
 
 "release was 1.1, and not 1.0.)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:805
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:817

 msgid ""
 "Thus, the names of the distribution directories in the archive are "
 "determined by their code names and not their release status (e.g., "
 msgid ""
 "Thus, the names of the distribution directories in the archive are "
 "determined by their code names and not their release status (e.g., "


@@ -1142,13 +1169,13 @@ msgid ""
 "<literal>unstable</literal> point to the appropriate release directories."
 msgstr ""
 
 "<literal>unstable</literal> point to the appropriate release directories."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:819
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:831

 msgid "Debian mirrors"
 msgstr ""
 
 msgid "Debian mirrors"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:821
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:833

 msgid ""
 "The various download archives and the web site have several mirrors "
 "available in order to relieve our canonical servers from heavy load.  In "
 msgid ""
 "The various download archives and the web site have several mirrors "
 "available in order to relieve our canonical servers from heavy load.  In "


@@ -1161,8 +1188,8 @@ msgid ""
 "the internal sites (we call this push mirroring)."
 msgstr ""
 
 "the internal sites (we call this push mirroring)."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:832
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:844

 msgid ""
 "All the information on Debian mirrors, including a list of the available "
 "public FTP/HTTP servers, can be found at <ulink "
 msgid ""
 "All the information on Debian mirrors, including a list of the available "
 "public FTP/HTTP servers, can be found at <ulink "


@@ -1171,29 +1198,29 @@ msgid ""
 "up your own mirror, either for internal or public access."
 msgstr ""
 
 "up your own mirror, either for internal or public access."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:839
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:851

 msgid ""
 "Note that mirrors are generally run by third-parties who are interested in "
 "helping Debian.  As such, developers generally do not have accounts on these "
 "machines."
 msgstr ""
 
 msgid ""
 "Note that mirrors are generally run by third-parties who are interested in "
 "helping Debian.  As such, developers generally do not have accounts on these "
 "machines."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:846
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:858

 msgid "The Incoming system"
 msgstr ""
 
 msgid "The Incoming system"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:848
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:860

 msgid ""
 "The Incoming system is responsible for collecting updated packages and "
 "installing them in the Debian archive.  It consists of a set of directories "
 "and scripts that are installed on <literal>&ftp-master-host;</literal>."
 msgstr ""
 
 msgid ""
 "The Incoming system is responsible for collecting updated packages and "
 "installing them in the Debian archive.  It consists of a set of directories "
 "and scripts that are installed on <literal>&ftp-master-host;</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:853
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:865

 msgid ""
 "Packages are uploaded by all the maintainers into a directory called "
 "<filename>UploadQueue</filename>.  This directory is scanned every few "
 msgid ""
 "Packages are uploaded by all the maintainers into a directory called "
 "<filename>UploadQueue</filename>.  This directory is scanned every few "


@@ -1216,8 +1243,8 @@ msgid ""
 "<filename>reject</filename> directory."
 msgstr ""
 
 "<filename>reject</filename> directory."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:872
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:884

 msgid ""
 "Once the package is accepted, the system sends a confirmation mail to the "
 "maintainer and closes all the bugs marked as fixed by the upload, and the "
 msgid ""
 "Once the package is accepted, the system sends a confirmation mail to the "
 "maintainer and closes all the bugs marked as fixed by the upload, and the "


@@ -1232,8 +1259,8 @@ msgid ""
 "primary mirrors to update themselves."
 msgstr ""
 
 "primary mirrors to update themselves."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:884
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:896

 msgid ""
 "The archive maintenance software will also send the OpenPGP/GnuPG signed "
 "<filename>.changes</filename> file that you uploaded to the appropriate "
 msgid ""
 "The archive maintenance software will also send the OpenPGP/GnuPG signed "
 "<filename>.changes</filename> file that you uploaded to the appropriate "


@@ -1245,25 +1272,25 @@ msgid ""
 "&email-debian-devel-changes; instead."
 msgstr ""
 
 "&email-debian-devel-changes; instead."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:894
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:906

 msgid ""
 "Though ftp-master is restricted, a copy of the installation is available to "
 "all developers on <literal>&ftp-master-mirror;</literal>."
 msgstr ""
 
 msgid ""
 "Though ftp-master is restricted, a copy of the installation is available to "
 "all developers on <literal>&ftp-master-mirror;</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:957
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:969

 msgid "Package information"
 msgstr ""
 
 msgid "Package information"
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:959
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:971

 msgid "On the web"
 msgstr ""
 
 msgid "On the web"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:961
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:973

 msgid ""
 "Each package has several dedicated web pages.  "
 "<literal>http://&packages-host;/<replaceable>package-name</replaceable></literal> "
 msgid ""
 "Each package has several dedicated web pages.  "
 "<literal>http://&packages-host;/<replaceable>package-name</replaceable></literal> "


@@ -1273,21 +1300,21 @@ msgid ""
 "links."
 msgstr ""
 
 "links."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:968
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:980

 msgid ""
 "The bug tracking system tracks bugs for each package.  You can view the bugs "
 "of a given package at the URL "
 "<literal>http://&bugs-host;/<replaceable>package-name</replaceable></literal>."
 msgstr ""
 
 msgid ""
 "The bug tracking system tracks bugs for each package.  You can view the bugs "
 "of a given package at the URL "
 "<literal>http://&bugs-host;/<replaceable>package-name</replaceable></literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:975
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:987

 msgid "The <command>dak ls</command> utility"
 msgstr ""
 
 msgid "The <command>dak ls</command> utility"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:977
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:989

 msgid ""
 "<command>dak ls</command> is part of the dak suite of tools, listing "
 "available package versions for all known distributions and architectures.  "
 msgid ""
 "<command>dak ls</command> is part of the dak suite of tools, listing "
 "available package versions for all known distributions and architectures.  "


@@ -1297,11 +1324,10 @@ msgid ""
 "explain it better:"
 msgstr ""
 
 "explain it better:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: resources.dbk:984
+#. type: Content of: <chapter><section><section><screen>
+#: resources.dbk:997

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"\n"

 "$ dak ls evince\n"
 "evince | 0.1.5-2sarge1 |     oldstable | source, alpha, arm, hppa, i386, "
 "ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"
 "$ dak ls evince\n"
 "evince | 0.1.5-2sarge1 |     oldstable | source, alpha, arm, hppa, i386, "
 "ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"


@@ -1315,8 +1341,8 @@ msgid ""
 "hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"
 msgstr ""
 
 "hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:994
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1006

 msgid ""
 "In this example, you can see that the version in <literal>unstable</literal> "
 "differs from the version in <literal>testing</literal> and that there has "
 msgid ""
 "In this example, you can see that the version in <literal>unstable</literal> "
 "differs from the version in <literal>testing</literal> and that there has "


@@ -1324,13 +1350,13 @@ msgid ""
 "of the package has been recompiled on all architectures."
 msgstr ""
 
 "of the package has been recompiled on all architectures."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:1004
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:1016

 msgid "The Package Tracking System"
 msgstr ""
 
 msgid "The Package Tracking System"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1006
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1018

 msgid ""
 "The Package Tracking System (PTS) is an email-based tool to track the "
 "activity of a source package.  This really means that you can get the same "
 msgid ""
 "The Package Tracking System (PTS) is an email-based tool to track the "
 "activity of a source package.  This really means that you can get the same "


@@ -1338,71 +1364,71 @@ msgid ""
 "package in the PTS."
 msgstr ""
 
 "package in the PTS."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1011
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1023

 msgid ""
 "Each email sent through the PTS is classified under one of the keywords "
 "listed below.  This will let you select the mails that you want to receive."
 msgstr ""
 
 msgid ""
 "Each email sent through the PTS is classified under one of the keywords "
 "listed below.  This will let you select the mails that you want to receive."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1015
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1027

 msgid "By default you will get:"
 msgstr ""
 
 msgid "By default you will get:"
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1019
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1031

 msgid "<literal>bts</literal>"
 msgstr ""
 
 msgid "<literal>bts</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1022
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1034

 msgid "All the bug reports and following discussions."
 msgstr ""
 
 msgid "All the bug reports and following discussions."
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1027
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1039

 msgid "<literal>bts-control</literal>"
 msgstr ""
 
 msgid "<literal>bts-control</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1030
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1042

 msgid ""
 "The email notifications from <email>control@&bugs-host;</email> about bug "
 "report status changes."
 msgstr ""
 
 msgid ""
 "The email notifications from <email>control@&bugs-host;</email> about bug "
 "report status changes."
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1036
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1048

 msgid "<literal>upload-source</literal>"
 msgstr ""
 
 msgid "<literal>upload-source</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1039
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1051

 msgid ""
 "The email notification from <command>katie</command> when an uploaded source "
 "package is accepted."
 msgstr ""
 
 msgid ""
 "The email notification from <command>katie</command> when an uploaded source "
 "package is accepted."
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1045
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1057

 msgid "<literal>katie-other</literal>"
 msgstr ""
 
 msgid "<literal>katie-other</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1048
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1060

 msgid ""
 "Other warning and error emails from <command>katie</command> (such as an "
 "override disparity for the section and/or the priority field)."
 msgstr ""
 
 msgid ""
 "Other warning and error emails from <command>katie</command> (such as an "
 "override disparity for the section and/or the priority field)."
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1054
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1066

 msgid "<literal>default</literal>"
 msgstr ""
 
 msgid "<literal>default</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1057
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1069

 msgid ""
 "Any non-automatic email sent to the PTS by people who wanted to contact the "
 "subscribers of the package.  This can be done by sending mail to "
 msgid ""
 "Any non-automatic email sent to the PTS by people who wanted to contact the "
 "subscribers of the package.  This can be done by sending mail to "


@@ -1411,42 +1437,44 @@ msgid ""
 "<literal>X-PTS-Approved</literal> header with a non-empty value."
 msgstr ""
 
 "<literal>X-PTS-Approved</literal> header with a non-empty value."
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1066
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1078

 msgid "<literal>contact</literal>"
 msgstr ""
 
 msgid "<literal>contact</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1069
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1081

 msgid ""
 "Mails sent to the maintainer through the *@packages.debian.org email "
 "aliases."
 msgstr ""
 
 msgid ""
 "Mails sent to the maintainer through the *@packages.debian.org email "
 "aliases."
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1075
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1087

 msgid "<literal>summary</literal>"
 msgstr ""
 
 msgid "<literal>summary</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1078
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1090

 msgid ""
 msgid ""

-"Regular summary emails about the package's status.  Currently, only "
-"progression in <literal>testing</literal> is sent."
+"Regular summary emails about the package's status, including progression "
+"into <literal>testing</literal>, <ulink url=\"&url-dehs;\">DEHS</ulink> "
+"notifications of new upstream versions, and a notification if the package is "
+"removed or orphaned."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1085
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1100

 msgid "You can also decide to receive additional information:"
 msgstr ""
 
 msgid "You can also decide to receive additional information:"
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1089
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1104

 msgid "<literal>upload-binary</literal>"
 msgstr ""
 
 msgid "<literal>upload-binary</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1092
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1107

 msgid ""
 "The email notification from <command>katie</command> when an uploaded binary "
 "package is accepted.  In other words, whenever a build daemon or a porter "
 msgid ""
 "The email notification from <command>katie</command> when an uploaded binary "
 "package is accepted.  In other words, whenever a build daemon or a porter "


@@ -1454,13 +1482,13 @@ msgid ""
 "how your package gets recompiled for all architectures."
 msgstr ""
 
 "how your package gets recompiled for all architectures."
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1100
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1115

 msgid "<literal>cvs</literal>"
 msgstr ""
 
 msgid "<literal>cvs</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1103
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1118

 msgid ""
 "VCS commit notifications, if the package has a VCS repository and the "
 "maintainer has set up forwarding of commit notifications to the PTS. The "
 msgid ""
 "VCS commit notifications, if the package has a VCS repository and the "
 "maintainer has set up forwarding of commit notifications to the PTS. The "


@@ -1468,49 +1496,49 @@ msgid ""
 "some other VCS like subversion or git."
 msgstr ""
 
 "some other VCS like subversion or git."
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1111
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1126

 msgid "<literal>ddtp</literal>"
 msgstr ""
 
 msgid "<literal>ddtp</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1114
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1129

 msgid ""
 "Translations of descriptions or debconf templates submitted to the Debian "
 "Description Translation Project."
 msgstr ""
 
 msgid ""
 "Translations of descriptions or debconf templates submitted to the Debian "
 "Description Translation Project."
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1120
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1135

 msgid "<literal>derivatives</literal>"
 msgstr ""
 
 msgid "<literal>derivatives</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1123
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1138

 msgid ""
 "Information about changes made to the package in derivative distributions "
 "(for example Ubuntu)."
 msgstr ""
 
 msgid ""
 "Information about changes made to the package in derivative distributions "
 "(for example Ubuntu)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:1130
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:1145

 msgid "The PTS email interface"
 msgstr ""
 
 msgid "The PTS email interface"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1132
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1147

 msgid ""
 "You can control your subscription(s) to the PTS by sending various commands "
 "to <email>pts@qa.debian.org</email>."
 msgstr ""
 
 msgid ""
 "You can control your subscription(s) to the PTS by sending various commands "
 "to <email>pts@qa.debian.org</email>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1137
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1152

 msgid "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 
 msgid "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1140
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1155

 msgid ""
 "Subscribes <replaceable>email</replaceable> to communications related to the "
 "source package <replaceable>sourcepackage</replaceable>.  Sender address is "
 msgid ""
 "Subscribes <replaceable>email</replaceable> to communications related to the "
 "source package <replaceable>sourcepackage</replaceable>.  Sender address is "


@@ -1520,191 +1548,191 @@ msgid ""
 "subscribe you to the corresponding source package."
 msgstr ""
 
 "subscribe you to the corresponding source package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1150
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1165

 msgid "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 
 msgid "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1153
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1168

 msgid ""
 "Removes a previous subscription to the source package "
 "<replaceable>sourcepackage</replaceable> using the specified email address "
 "or the sender address if the second argument is left out."
 msgstr ""
 
 msgid ""
 "Removes a previous subscription to the source package "
 "<replaceable>sourcepackage</replaceable> using the specified email address "
 "or the sender address if the second argument is left out."
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1160
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1175

 msgid "<literal>unsubscribeall [&lt;email&gt;]</literal>"
 msgstr ""
 
 msgid "<literal>unsubscribeall [&lt;email&gt;]</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1163
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1178

 msgid ""
 "Removes all subscriptions of the specified email address or the sender "
 "address if the second argument is left out."
 msgstr ""
 
 msgid ""
 "Removes all subscriptions of the specified email address or the sender "
 "address if the second argument is left out."
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1169
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1184

 msgid "<literal>which [&lt;email&gt;]</literal>"
 msgstr ""
 
 msgid "<literal>which [&lt;email&gt;]</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1172
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1187

 msgid ""
 "Lists all subscriptions for the sender or the email address optionally "
 "specified."
 msgstr ""
 
 msgid ""
 "Lists all subscriptions for the sender or the email address optionally "
 "specified."
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1178
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1193

 msgid "<literal>keyword [&lt;email&gt;]</literal>"
 msgstr ""
 
 msgid "<literal>keyword [&lt;email&gt;]</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1181
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1196

 msgid ""
 "Tells you the keywords that you are accepting.  For an explanation of "
 "keywords, <link linkend=\"pkg-tracking-system\">see above</link>.  Here's a "
 "quick summary:"
 msgstr ""
 
 msgid ""
 "Tells you the keywords that you are accepting.  For an explanation of "
 "keywords, <link linkend=\"pkg-tracking-system\">see above</link>.  Here's a "
 "quick summary:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1188
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1203

 msgid "<literal>bts</literal>: mails coming from the Debian Bug Tracking System"
 msgstr ""
 
 msgid "<literal>bts</literal>: mails coming from the Debian Bug Tracking System"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1193
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1208

 msgid "<literal>bts-control</literal>: reply to mails sent to &email-bts-control;"
 msgstr ""
 
 msgid "<literal>bts-control</literal>: reply to mails sent to &email-bts-control;"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1199
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1214

 msgid ""
 "<literal>summary</literal>: automatic summary mails about the state of a "
 "package"
 msgstr ""
 
 msgid ""
 "<literal>summary</literal>: automatic summary mails about the state of a "
 "package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1205
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1220

 msgid ""
 "<literal>contact</literal>: mails sent to the maintainer through the "
 "*@packages.debian.org aliases"
 msgstr ""
 
 msgid ""
 "<literal>contact</literal>: mails sent to the maintainer through the "
 "*@packages.debian.org aliases"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1211
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1226

 msgid "<literal>cvs</literal>: notification of VCS commits"
 msgstr ""
 
 msgid "<literal>cvs</literal>: notification of VCS commits"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1216
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1231

 msgid "<literal>ddtp</literal>: translations of descriptions and debconf templates"
 msgstr ""
 
 msgid "<literal>ddtp</literal>: translations of descriptions and debconf templates"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1221
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1236

 msgid ""
 "<literal>derivatives</literal>: changes made on the package by derivative "
 "distributions"
 msgstr ""
 
 msgid ""
 "<literal>derivatives</literal>: changes made on the package by derivative "
 "distributions"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1227
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1242

 msgid ""
 "<literal>upload-source</literal>: announce of a new source upload that has "
 "been accepted"
 msgstr ""
 
 msgid ""
 "<literal>upload-source</literal>: announce of a new source upload that has "
 "been accepted"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1233
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1248

 msgid ""
 "<literal>upload-binary</literal>: announce of a new binary-only upload "
 "(porting)"
 msgstr ""
 
 msgid ""
 "<literal>upload-binary</literal>: announce of a new binary-only upload "
 "(porting)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1239
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1254

 msgid ""
 "<literal>katie-other</literal>: other mails from ftpmasters (override "
 "disparity, etc.)"
 msgstr ""
 
 msgid ""
 "<literal>katie-other</literal>: other mails from ftpmasters (override "
 "disparity, etc.)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1245
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1260

 msgid ""
 "<literal>default</literal>: all the other mails (those which aren't "
 "automatic)"
 msgstr ""
 
 msgid ""
 "<literal>default</literal>: all the other mails (those which aren't "
 "automatic)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1252
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1267

 msgid "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 
 msgid "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1255
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1270

 msgid ""
 "Same as the previous item but for the given source package, since you may "
 "select a different set of keywords for each source package."
 msgstr ""
 
 msgid ""
 "Same as the previous item but for the given source package, since you may "
 "select a different set of keywords for each source package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1261
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1276

 msgid "<literal>keyword [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</literal>"
 msgstr ""
 
 msgid "<literal>keyword [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1264
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1279

 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the default set of "
 "keywords accepted by a user."
 msgstr ""
 
 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the default set of "
 "keywords accepted by a user."
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1271
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1286

 msgid ""
 "<literal>keywordall [&lt;email&gt;] {+|-|=} &lt;list of "
 "keywords&gt;</literal>"
 msgstr ""
 
 msgid ""
 "<literal>keywordall [&lt;email&gt;] {+|-|=} &lt;list of "
 "keywords&gt;</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1274
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1289

 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the set of accepted "
 "keywords of all the currently active subscriptions of a user."
 msgstr ""
 
 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the set of accepted "
 "keywords of all the currently active subscriptions of a user."
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1281
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1296

 msgid ""
 "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;] {+|-|=} &lt;list of "
 "keywords&gt;</literal>"
 msgstr ""
 
 msgid ""
 "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;] {+|-|=} &lt;list of "
 "keywords&gt;</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1284
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1299

 msgid ""
 "Same as previous item but overrides the keywords list for the indicated "
 "source package."
 msgstr ""
 
 msgid ""
 "Same as previous item but overrides the keywords list for the indicated "
 "source package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1290
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1305

 msgid "<literal>quit | thanks | --</literal>"
 msgstr ""
 
 msgid "<literal>quit | thanks | --</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1293
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1308

 msgid "Stops processing commands.  All following lines are ignored by the bot."
 msgstr ""
 
 msgid "Stops processing commands.  All following lines are ignored by the bot."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1299
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1314

 msgid ""
 "The <command>pts-subscribe</command> command-line utility (from the "
 "<systemitem role=\"package\">devscripts</systemitem> package) can be handy "
 msgid ""
 "The <command>pts-subscribe</command> command-line utility (from the "
 "<systemitem role=\"package\">devscripts</systemitem> package) can be handy "


@@ -1712,13 +1740,13 @@ msgid ""
 "non-maintainer upload."
 msgstr ""
 
 "non-maintainer upload."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:1307
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:1322

 msgid "Filtering PTS mails"
 msgstr ""
 
 msgid "Filtering PTS mails"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1309
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1324

 msgid ""
 "Once you are subscribed to a package, you will get the mails sent to "
 "<literal><replaceable>sourcepackage</replaceable>@&pts-host;</literal>.  "
 msgid ""
 "Once you are subscribed to a package, you will get the mails sent to "
 "<literal><replaceable>sourcepackage</replaceable>@&pts-host;</literal>.  "


@@ -1728,31 +1756,30 @@ msgid ""
 "<literal>X-PTS-Keyword</literal> and <literal>X-Unsubscribe</literal>."
 msgstr ""
 
 "<literal>X-PTS-Keyword</literal> and <literal>X-Unsubscribe</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1317
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1332

 msgid ""
 "Here is an example of added headers for a source upload notification on the "
 "<systemitem role=\"package\">dpkg</systemitem> package:"
 msgstr ""
 
 msgid ""
 "Here is an example of added headers for a source upload notification on the "
 "<systemitem role=\"package\">dpkg</systemitem> package:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: resources.dbk:1320
+#. type: Content of: <chapter><section><section><screen>
+#: resources.dbk:1336

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"\n"

 "X-Loop: dpkg@&pts-host;\n"
 "X-PTS-Package: dpkg\n"
 "X-PTS-Keyword: upload-source\n"
 "List-Unsubscribe: &lt;mailto:pts@qa.debian.org?body=unsubscribe+dpkg&gt;\n"
 msgstr ""
 
 "X-Loop: dpkg@&pts-host;\n"
 "X-PTS-Package: dpkg\n"
 "X-PTS-Keyword: upload-source\n"
 "List-Unsubscribe: &lt;mailto:pts@qa.debian.org?body=unsubscribe+dpkg&gt;\n"
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:1329
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:1344

 msgid "Forwarding VCS commits in the PTS"
 msgstr ""
 
 msgid "Forwarding VCS commits in the PTS"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1331
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1346

 msgid ""
 "If you use a publicly accessible VCS repository for maintaining your Debian "
 "package, you may want to forward the commit notification to the PTS so that "
 msgid ""
 "If you use a publicly accessible VCS repository for maintaining your Debian "
 "package, you may want to forward the commit notification to the PTS so that "


@@ -1760,8 +1787,8 @@ msgid ""
 "package's evolution."
 msgstr ""
 
 "package's evolution."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1337
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1352

 msgid ""
 "Once you set up the VCS repository to generate commit notifications, you "
 "just have to make sure it sends a copy of those mails to "
 msgid ""
 "Once you set up the VCS repository to generate commit notifications, you "
 "just have to make sure it sends a copy of those mails to "


@@ -1772,20 +1799,20 @@ msgid ""
 "<literal>X-PTS-Approved: 1</literal> header."
 msgstr ""
 
 "<literal>X-PTS-Approved: 1</literal> header."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1346
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1361

 msgid ""
 "For Subversion repositories, the usage of svnmailer is recommended.  See "
 "<ulink url=\"&url-alioth-pkg;\" /> for an example on how to do it."
 msgstr ""
 
 msgid ""
 "For Subversion repositories, the usage of svnmailer is recommended.  See "
 "<ulink url=\"&url-alioth-pkg;\" /> for an example on how to do it."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:1352
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:1367

 msgid "The PTS web interface"
 msgstr ""
 
 msgid "The PTS web interface"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1354
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1369

 msgid ""
 "The PTS has a web interface at <ulink url=\"http://&pts-host;/\"></ulink> "
 "that puts together a lot of information about each source package.  It "
 msgid ""
 "The PTS has a web interface at <ulink url=\"http://&pts-host;/\"></ulink> "
 "that puts together a lot of information about each source package.  It "


@@ -1797,16 +1824,16 @@ msgid ""
 "PTS via email."
 msgstr ""
 
 "PTS via email."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1364
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1379

 msgid ""
 "You can jump directly to the web page concerning a specific source package "
 "with a URL like "
 "<literal>http://&pts-host;/<replaceable>sourcepackage</replaceable></literal>."
 msgstr ""
 
 msgid ""
 "You can jump directly to the web page concerning a specific source package "
 "with a URL like "
 "<literal>http://&pts-host;/<replaceable>sourcepackage</replaceable></literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1369
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1384

 msgid ""
 "This web interface has been designed like a portal for the development of "
 "packages: you can add custom content on your packages' pages.  You can add "
 msgid ""
 "This web interface has been designed like a portal for the development of "
 "packages: you can add custom content on your packages' pages.  You can add "


@@ -1814,82 +1841,82 @@ msgid ""
 "indefinitely)  and news items in the latest news section."
 msgstr ""
 
 "indefinitely)  and news items in the latest news section."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1375
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1390

 msgid "Static news items can be used to indicate:"
 msgstr ""
 
 msgid "Static news items can be used to indicate:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1380
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1395

 msgid ""
 "the availability of a project hosted on <link "
 "linkend=\"alioth\">Alioth</link> for co-maintaining the package"
 msgstr ""
 
 msgid ""
 "the availability of a project hosted on <link "
 "linkend=\"alioth\">Alioth</link> for co-maintaining the package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1386
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1401

 msgid "a link to the upstream web site"
 msgstr ""
 
 msgid "a link to the upstream web site"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1391
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1406

 msgid "a link to the upstream bug tracker"
 msgstr ""
 
 msgid "a link to the upstream bug tracker"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1396
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1411

 msgid "the existence of an IRC channel dedicated to the software"
 msgstr ""
 
 msgid "the existence of an IRC channel dedicated to the software"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1401
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1416

 msgid ""
 "any other available resource that could be useful in the maintenance of the "
 "package"
 msgstr ""
 
 msgid ""
 "any other available resource that could be useful in the maintenance of the "
 "package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1407
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1422

 msgid "Usual news items may be used to announce that:"
 msgstr ""
 
 msgid "Usual news items may be used to announce that:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1412
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1427

 msgid "beta packages are available for testing"
 msgstr ""
 
 msgid "beta packages are available for testing"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1417
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1432

 msgid "final packages are expected for next week"
 msgstr ""
 
 msgid "final packages are expected for next week"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1422
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1437

 msgid "the packaging is about to be redone from scratch"
 msgstr ""
 
 msgid "the packaging is about to be redone from scratch"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1427
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1442

 msgid "backports are available"
 msgstr ""
 
 msgid "backports are available"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1432
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1447

 msgid "the maintainer is on vacation (if they wish to publish this information)"
 msgstr ""
 
 msgid "the maintainer is on vacation (if they wish to publish this information)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1437
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1452

 msgid "a NMU is being worked on"
 msgstr ""
 
 msgid "a NMU is being worked on"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1442
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1457

 msgid "something important will affect the package"
 msgstr ""
 
 msgid "something important will affect the package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1447
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1462

 msgid ""
 "Both kinds of news are generated in a similar manner: you just have to send "
 "an email either to <email>pts-static-news@qa.debian.org</email> or to "
 msgid ""
 "Both kinds of news are generated in a similar manner: you just have to send "
 "an email either to <email>pts-static-news@qa.debian.org</email> or to "


@@ -1902,19 +1929,18 @@ msgid ""
 "instead of a complete news item."
 msgstr ""
 
 "instead of a complete news item."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1458
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1473

 msgid ""
 "Here are a few examples of valid mails used to generate news items in the "
 "PTS.  The first one adds a link to the cvsweb interface of debian-cd in the "
 "Static information section:"
 msgstr ""
 
 msgid ""
 "Here are a few examples of valid mails used to generate news items in the "
 "PTS.  The first one adds a link to the cvsweb interface of debian-cd in the "
 "Static information section:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: resources.dbk:1462
+#. type: Content of: <chapter><section><section><screen>
+#: resources.dbk:1478

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"\n"

 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
 "To: pts-static-news@qa.debian.org\n"
 "Subject: Browse debian-cd SVN repository\n"
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
 "To: pts-static-news@qa.debian.org\n"
 "Subject: Browse debian-cd SVN repository\n"


@@ -1923,19 +1949,18 @@ msgid ""
 "Url: http://svn.debian.org/viewsvn/debian-cd/trunk/\n"
 msgstr ""
 
 "Url: http://svn.debian.org/viewsvn/debian-cd/trunk/\n"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1471
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1486

 msgid ""
 "The second one is an announcement sent to a mailing list which is also sent "
 "to the PTS so that it is published on the PTS web page of the package.  Note "
 "the use of the BCC field to avoid answers sent to the PTS by mistake."
 msgstr ""
 
 msgid ""
 "The second one is an announcement sent to a mailing list which is also sent "
 "to the PTS so that it is published on the PTS web page of the package.  Note "
 "the use of the BCC field to avoid answers sent to the PTS by mistake."
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: resources.dbk:1475
+#. type: Content of: <chapter><section><section><screen>
+#: resources.dbk:1491

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"\n"

 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
 "To: debian-gtk-gnome@&lists-host;\n"
 "Bcc: pts-news@qa.debian.org\n"
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
 "To: debian-gtk-gnome@&lists-host;\n"
 "Bcc: pts-news@qa.debian.org\n"


@@ -1950,8 +1975,8 @@ msgid ""
 "...\n"
 msgstr ""
 
 "...\n"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1489
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1504

 msgid ""
 "Think twice before adding a news item to the PTS because you won't be able "
 "to remove it later and you won't be able to edit it either.  The only thing "
 msgid ""
 "Think twice before adding a news item to the PTS because you won't be able "
 "to remove it later and you won't be able to edit it either.  The only thing "


@@ -1959,13 +1984,13 @@ msgid ""
 "information contained in the previous one."
 msgstr ""
 
 "information contained in the previous one."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:1499
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:1514

 msgid "Developer's packages overview"
 msgstr ""
 
 msgid "Developer's packages overview"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1501
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1516

 msgid ""
 "A QA (quality assurance) web portal is available at <ulink "
 "url=\"&url-ddpo;\"></ulink> which displays a table listing all the packages "
 msgid ""
 "A QA (quality assurance) web portal is available at <ulink "
 "url=\"&url-ddpo;\"></ulink> which displays a table listing all the packages "


@@ -1976,21 +2001,21 @@ msgid ""
 "useful information."
 msgstr ""
 
 "useful information."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1510
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1525

 msgid ""
 "It is a good idea to look up your own data regularly so that you don't "
 "forget any open bugs, and so that you don't forget which packages are your "
 "responsibility."
 msgstr ""
 
 msgid ""
 "It is a good idea to look up your own data regularly so that you don't "
 "forget any open bugs, and so that you don't forget which packages are your "
 "responsibility."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:1517
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:1532

 msgid "Debian's GForge installation: Alioth"
 msgstr ""
 
 msgid "Debian's GForge installation: Alioth"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1519
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1534

 msgid ""
 "Alioth is a Debian service based on a slightly modified version of the "
 "GForge software (which evolved from SourceForge). This software offers "
 msgid ""
 "Alioth is a Debian service based on a slightly modified version of the "
 "GForge software (which evolved from SourceForge). This software offers "


@@ -1999,8 +2024,8 @@ msgid ""
 "repositories etc.  All these tools are managed via a web interface."
 msgstr ""
 
 "repositories etc.  All these tools are managed via a web interface."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1526
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1541

 msgid ""
 "It is intended to provide facilities to free software projects backed or led "
 "by Debian, facilitate contributions from external developers to projects "
 msgid ""
 "It is intended to provide facilities to free software projects backed or led "
 "by Debian, facilitate contributions from external developers to projects "


@@ -2009,54 +2034,67 @@ msgid ""
 "hosting for all sorts of VCS repositories."
 msgstr ""
 
 "hosting for all sorts of VCS repositories."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1533
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1548

 msgid ""
 "All Debian developers automatically have an account on Alioth.  They can "
 "activate it by using the recover password facility.  External developers can "
 "request guest accounts on Alioth."
 msgstr ""
 
 msgid ""
 "All Debian developers automatically have an account on Alioth.  They can "
 "activate it by using the recover password facility.  External developers can "
 "request guest accounts on Alioth."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1538
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1553

 msgid "For more information please visit the following links:"
 msgstr ""
 
 msgid "For more information please visit the following links:"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:1541
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:1556

 msgid "<ulink url=\"&url-alioth-wiki;\" />"
 msgstr ""
 
 msgid "<ulink url=\"&url-alioth-wiki;\" />"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:1542
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:1557

 msgid "<ulink url=\"&url-alioth-faq;\" />"
 msgstr ""
 
 msgid "<ulink url=\"&url-alioth-faq;\" />"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:1543
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:1558

 msgid "<ulink url=\"&url-alioth-pkg;\" />"
 msgstr ""
 
 msgid "<ulink url=\"&url-alioth-pkg;\" />"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:1544
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:1559

 msgid "<ulink url=\"&url-alioth;\" />"
 msgstr ""
 
 msgid "<ulink url=\"&url-alioth;\" />"
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:1549
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:1564

 msgid "Goodies for Developers"
 msgstr ""
 
 msgid "Goodies for Developers"
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:1551
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:1566

 msgid "LWN Subscriptions"
 msgstr ""
 
 msgid "LWN Subscriptions"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1553
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1568

 msgid ""
 "Since October of 2002, HP has sponsored a subscription to LWN for all "
 "interested Debian developers.  Details on how to get access to this benefit "
 "are in <ulink "
 "url=\"http://&lists-host;/debian-devel-announce/2002/10/msg00018.html\"></ulink>."
 msgstr ""
 msgid ""
 "Since October of 2002, HP has sponsored a subscription to LWN for all "
 "interested Debian developers.  Details on how to get access to this benefit "
 "are in <ulink "
 "url=\"http://&lists-host;/debian-devel-announce/2002/10/msg00018.html\"></ulink>."
 msgstr ""

+
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:1575
+msgid "Gandi.net Hosting Discount"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1577
+msgid ""
+"As of November 2008, Gandi.net offers a discount rate on their VPS hosting "
+"for Debian Developers.  See <ulink "
+"url=\"http://&lists-host;/debian-devel-announce/2008/11/msg00004.html\"></ulink>."
+msgstr ""

diff --git a/po4a/po/tools.pot b/po4a/po/tools.pot
index c955c6b2d666ccac86aacbfd6f14743db5ce09aa..fece55d28bb334aba98fa836e47b1a5343041a10 100644 (file)
--- a/po4a/po/tools.pot
+++ b/po4a/po/tools.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"POT-Creation-Date: 2008-08-08 11:34-0300\n"
+"POT-Creation-Date: 2010-01-04 00:17+0100\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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -15,12 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING"
 
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING"
 

-# type: Content of: <appendix><title>
+#. type: Content of: <appendix><title>

 #: tools.dbk:7
 msgid "Overview of Debian Maintainer Tools"
 msgstr ""
 
 #: tools.dbk:7
 msgid "Overview of Debian Maintainer Tools"
 msgstr ""
 

-# type: Content of: <appendix><para>
+#. type: Content of: <appendix><para>

 #: tools.dbk:9
 msgid ""
 "This section contains a rough overview of the tools available to "
 #: tools.dbk:9
 msgid ""
 "This section contains a rough overview of the tools available to "


@@ -28,14 +28,14 @@ msgid ""
 "a guide to some of the more popular tools."
 msgstr ""
 
 "a guide to some of the more popular tools."
 msgstr ""
 

-# type: Content of: <appendix><para>
+#. type: Content of: <appendix><para>

 #: tools.dbk:14
 msgid ""
 "Debian maintainer tools are meant to aid developers and free their time for "
 "critical tasks.  As Larry Wall says, there's more than one way to do it."
 msgstr ""
 
 #: tools.dbk:14
 msgid ""
 "Debian maintainer tools are meant to aid developers and free their time for "
 "critical tasks.  As Larry Wall says, there's more than one way to do it."
 msgstr ""
 

-# type: Content of: <appendix><para>
+#. type: Content of: <appendix><para>

 #: tools.dbk:18
 msgid ""
 "Some people prefer to use high-level package maintenance tools and some do "
 #: tools.dbk:18
 msgid ""
 "Some people prefer to use high-level package maintenance tools and some do "


@@ -46,7 +46,7 @@ msgid ""
 "exclusion of a competing tool."
 msgstr ""
 
 "exclusion of a competing tool."
 msgstr ""
 

-# type: Content of: <appendix><para>
+#. type: Content of: <appendix><para>

 #: tools.dbk:26
 msgid ""
 "Most of the descriptions of these packages come from the actual package "
 #: tools.dbk:26
 msgid ""
 "Most of the descriptions of these packages come from the actual package "


@@ -55,22 +55,22 @@ msgid ""
 "<command>apt-cache show &lt;package-name&gt;</command>."
 msgstr ""
 
 "<command>apt-cache show &lt;package-name&gt;</command>."
 msgstr ""
 

-# type: Content of: <appendix><section><title>
+#. type: Content of: <appendix><section><title>

 #: tools.dbk:32
 msgid "Core tools"
 msgstr ""
 
 #: tools.dbk:32
 msgid "Core tools"
 msgstr ""
 

-# type: Content of: <appendix><section><para>
+#. type: Content of: <appendix><section><para>

 #: tools.dbk:34
 msgid "The following tools are pretty much required for any maintainer."
 msgstr ""
 
 #: tools.dbk:34
 msgid "The following tools are pretty much required for any maintainer."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
+#. type: Content of: <appendix><section><section><title>

 #: tools.dbk:37
 msgid "<systemitem role=\"package\">dpkg-dev</systemitem>"
 msgstr ""
 
 #: tools.dbk:37
 msgid "<systemitem role=\"package\">dpkg-dev</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:39
 msgid ""
 "<systemitem role=\"package\">dpkg-dev</systemitem> contains the tools "
 #: tools.dbk:39
 msgid ""
 "<systemitem role=\"package\">dpkg-dev</systemitem> contains the tools "


@@ -80,12 +80,12 @@ msgid ""
 "they are essential for any Debian maintainer."
 msgstr ""
 
 "they are essential for any Debian maintainer."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
+#. type: Content of: <appendix><section><section><title>

 #: tools.dbk:48
 msgid "<systemitem role=\"package\">debconf</systemitem>"
 msgstr ""
 
 #: tools.dbk:48
 msgid "<systemitem role=\"package\">debconf</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:50
 msgid ""
 "<systemitem role=\"package\">debconf</systemitem> provides a consistent "
 #: tools.dbk:50
 msgid ""
 "<systemitem role=\"package\">debconf</systemitem> provides a consistent "


@@ -95,14 +95,14 @@ msgid ""
 "added as modules."
 msgstr ""
 
 "added as modules."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:56
 msgid ""
 "You can find documentation for this package in the <systemitem "
 "role=\"package\">debconf-doc</systemitem> package."
 msgstr ""
 
 #: tools.dbk:56
 msgid ""
 "You can find documentation for this package in the <systemitem "
 "role=\"package\">debconf-doc</systemitem> package."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:60
 msgid ""
 "Many feel that this system should be used for all packages which require "
 #: tools.dbk:60
 msgid ""
 "Many feel that this system should be used for all packages which require "


@@ -111,12 +111,12 @@ msgid ""
 "by Debian Policy, but that may change in the future."
 msgstr ""
 
 "by Debian Policy, but that may change in the future."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
+#. type: Content of: <appendix><section><section><title>

 #: tools.dbk:68
 msgid "<systemitem role=\"package\">fakeroot</systemitem>"
 msgstr ""
 
 #: tools.dbk:68
 msgid "<systemitem role=\"package\">fakeroot</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:70
 msgid ""
 "<systemitem role=\"package\">fakeroot</systemitem> simulates root "
 #: tools.dbk:70
 msgid ""
 "<systemitem role=\"package\">fakeroot</systemitem> simulates root "


@@ -126,12 +126,12 @@ msgid ""
 "a regular user: <literal>dpkg-buildpackage -rfakeroot</literal>."
 msgstr ""
 
 "a regular user: <literal>dpkg-buildpackage -rfakeroot</literal>."
 msgstr ""
 

-# type: Content of: <appendix><section><title>
+#. type: Content of: <appendix><section><title>

 #: tools.dbk:81
 msgid "Package lint tools"
 msgstr ""
 
 #: tools.dbk:81
 msgid "Package lint tools"
 msgstr ""
 

-# type: Content of: <appendix><section><para>
+#. type: Content of: <appendix><section><para>

 #: tools.dbk:83
 msgid ""
 "According to the Free On-line Dictionary of Computing (FOLDOC), `lint' is a "
 #: tools.dbk:83
 msgid ""
 "According to the Free On-line Dictionary of Computing (FOLDOC), `lint' is a "


@@ -141,12 +141,12 @@ msgid ""
 "packages."
 msgstr ""
 
 "packages."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
+#. type: Content of: <appendix><section><section><title>

 #: tools.dbk:89
 msgid "<systemitem role=\"package\">lintian</systemitem>"
 msgstr ""
 
 #: tools.dbk:89
 msgid "<systemitem role=\"package\">lintian</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:91
 msgid ""
 "<systemitem role=\"package\">lintian</systemitem> dissects Debian packages "
 #: tools.dbk:91
 msgid ""
 "<systemitem role=\"package\">lintian</systemitem> dissects Debian packages "


@@ -155,7 +155,7 @@ msgid ""
 "for common errors."
 msgstr ""
 
 "for common errors."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:97
 msgid ""
 "You should periodically get the newest <systemitem "
 #: tools.dbk:97
 msgid ""
 "You should periodically get the newest <systemitem "


@@ -165,14 +165,14 @@ msgid ""
 "basis in Policy is, and commonly how you can fix the problem."
 msgstr ""
 
 "basis in Policy is, and commonly how you can fix the problem."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:104
 msgid ""
 "Refer to <xref linkend=\"sanitycheck\"/> for more information on how and "
 "when to use Lintian."
 msgstr ""
 
 #: tools.dbk:104
 msgid ""
 "Refer to <xref linkend=\"sanitycheck\"/> for more information on how and "
 "when to use Lintian."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:108
 msgid ""
 "You can also see a summary of all problems reported by Lintian on your "
 #: tools.dbk:108
 msgid ""
 "You can also see a summary of all problems reported by Lintian on your "


@@ -181,12 +181,12 @@ msgid ""
 "distribution (<literal>unstable</literal>)."
 msgstr ""
 
 "distribution (<literal>unstable</literal>)."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
+#. type: Content of: <appendix><section><section><title>

 #: tools.dbk:116
 msgid "<systemitem role=\"package\">debdiff</systemitem>"
 msgstr ""
 
 #: tools.dbk:116
 msgid "<systemitem role=\"package\">debdiff</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:118
 msgid ""
 "<command>debdiff</command> (from the <systemitem "
 #: tools.dbk:118
 msgid ""
 "<command>debdiff</command> (from the <systemitem "


@@ -198,33 +198,29 @@ msgid ""
 "will be all right, but it can help you prevent various accidents."
 msgstr ""
 
 "will be all right, but it can help you prevent various accidents."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:127
 msgid "You can run it over a pair of binary packages:"
 msgstr ""
 
 #: tools.dbk:127
 msgid "You can run it over a pair of binary packages:"
 msgstr ""
 

-# type: Content of: <appendix><section><section><screen>
-#: tools.dbk:129
+#. type: Content of: <appendix><section><section><screen>
+#: tools.dbk:130

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"debdiff package_1-1_arch.deb package_2-1_arch.deb\n"
+msgid "debdiff package_1-1_arch.deb package_2-1_arch.deb\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:133
 msgid "Or even a pair of changes files:"
 msgstr ""
 
 #: tools.dbk:133
 msgid "Or even a pair of changes files:"
 msgstr ""
 

-# type: Content of: <appendix><section><section><screen>
-#: tools.dbk:135
+#. type: Content of: <appendix><section><section><screen>
+#: tools.dbk:136

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"debdiff package_1-1_arch.changes package_2-1_arch.changes\n"
+msgid "debdiff package_1-1_arch.changes package_2-1_arch.changes\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:139
 msgid ""
 "For more information please see <citerefentry> "
 #: tools.dbk:139
 msgid ""
 "For more information please see <citerefentry> "


@@ -232,12 +228,12 @@ msgid ""
 "</citerefentry>."
 msgstr ""
 
 "</citerefentry>."
 msgstr ""
 

-# type: Content of: <appendix><section><title>
+#. type: Content of: <appendix><section><title>

 #: tools.dbk:148
 msgid "Helpers for <filename>debian/rules</filename>"
 msgstr ""
 
 #: tools.dbk:148
 msgid "Helpers for <filename>debian/rules</filename>"
 msgstr ""
 

-# type: Content of: <appendix><section><para>
+#. type: Content of: <appendix><section><para>

 #: tools.dbk:150
 msgid ""
 "Package building tools make the process of writing "
 #: tools.dbk:150
 msgid ""
 "Package building tools make the process of writing "


@@ -246,12 +242,12 @@ msgid ""
 "might not be desired."
 msgstr ""
 
 "might not be desired."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
+#. type: Content of: <appendix><section><section><title>

 #: tools.dbk:156
 msgid "<systemitem role=\"package\">debhelper</systemitem>"
 msgstr ""
 
 #: tools.dbk:156
 msgid "<systemitem role=\"package\">debhelper</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:158
 msgid ""
 "<systemitem role=\"package\">debhelper</systemitem> is a collection of "
 #: tools.dbk:158
 msgid ""
 "<systemitem role=\"package\">debhelper</systemitem> is a collection of "


@@ -262,7 +258,7 @@ msgid ""
 "your package with the Debian menu system."
 msgstr ""
 
 "your package with the Debian menu system."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:166
 msgid ""
 "Unlike some approaches, <systemitem role=\"package\">debhelper</systemitem> "
 #: tools.dbk:166
 msgid ""
 "Unlike some approaches, <systemitem role=\"package\">debhelper</systemitem> "


@@ -271,7 +267,7 @@ msgid ""
 "debian/rules tools."
 msgstr ""
 
 "debian/rules tools."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
+#. type: Content of: <appendix><section><section><para>

 #: tools.dbk:172
 msgid ""
 "There are a number of little <systemitem "
 #: tools.dbk:172
 msgid ""
 "There are a number of little <systemitem "


@@ -280,42 +276,13 @@ msgid ""
 "search ^dh-</literal>."
 msgstr ""
 
 "search ^dh-</literal>."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
+#. type: Content of: <appendix><section><section><title>

 #: tools.dbk:179
 #: tools.dbk:179

-msgid "<systemitem role=\"package\">debmake</systemitem>"
-msgstr ""
-
-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:181
-msgid ""
-"<systemitem role=\"package\">debmake</systemitem>, a precursor to "
-"<systemitem role=\"package\">debhelper</systemitem>, is a more "
-"coarse-grained <filename>debian/rules</filename> assistant.  It includes two "
-"main programs: <command>deb-make</command>, which can be used to help a "
-"maintainer convert a regular (non-Debian) source archive into a Debian "
-"source package; and <command>debstd</command>, which incorporates in one big "
-"shot the same sort of automated functions that one finds in <systemitem "
-"role=\"package\">debhelper</systemitem>."
-msgstr ""
-
-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:191
-msgid ""
-"The consensus is that <systemitem role=\"package\">debmake</systemitem> is "
-"now deprecated in favor of <systemitem "
-"role=\"package\">debhelper</systemitem>.  It is a bug to use <systemitem "
-"role=\"package\">debmake</systemitem> in new packages.  New packages using "
-"<systemitem role=\"package\">debmake</systemitem> will be rejected from the "
-"archive."
-msgstr ""
-
-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:200

 msgid "<systemitem role=\"package\">dh-make</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">dh-make</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:202
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:181

 msgid ""
 "The <systemitem role=\"package\">dh-make</systemitem> package contains "
 "<command>dh_make</command>, a program that creates a skeleton of files "
 msgid ""
 "The <systemitem role=\"package\">dh-make</systemitem> package contains "
 "<command>dh_make</command>, a program that creates a skeleton of files "


@@ -325,8 +292,8 @@ msgid ""
 "programs from <systemitem role=\"package\">debhelper</systemitem>."
 msgstr ""
 
 "programs from <systemitem role=\"package\">debhelper</systemitem>."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:210
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:189

 msgid ""
 "While the rules files generated by <command>dh_make</command> are in general "
 "a sufficient basis for a working package, they are still just the "
 msgid ""
 "While the rules files generated by <command>dh_make</command> are in general "
 "a sufficient basis for a working package, they are still just the "


@@ -335,13 +302,13 @@ msgid ""
 "Policy-compliant."
 msgstr ""
 
 "Policy-compliant."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:218
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:197

 msgid "<systemitem role=\"package\">yada</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">yada</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:220
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:199

 msgid ""
 "<systemitem role=\"package\">yada</systemitem> is another packaging helper "
 "tool.  It uses a <filename>debian/packages</filename> file to auto-generate "
 msgid ""
 "<systemitem role=\"package\">yada</systemitem> is another packaging helper "
 "tool.  It uses a <filename>debian/packages</filename> file to auto-generate "


@@ -353,20 +320,20 @@ msgid ""
 "SPECS files from RPM source packages."
 msgstr ""
 
 "SPECS files from RPM source packages."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:230
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:209

 msgid ""
 "For more informations see <literal><ulink "
 "url=\"http://yada.alioth.debian.org/\">YADA site</ulink></literal>."
 msgstr ""
 
 msgid ""
 "For more informations see <literal><ulink "
 "url=\"http://yada.alioth.debian.org/\">YADA site</ulink></literal>."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:236
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:215

 msgid "<systemitem role=\"package\">equivs</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">equivs</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:238
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:217

 msgid ""
 "<systemitem role=\"package\">equivs</systemitem> is another package for "
 "making packages.  It is often suggested for local use if you need to make a "
 msgid ""
 "<systemitem role=\"package\">equivs</systemitem> is another package for "
 "making packages.  It is often suggested for local use if you need to make a "


@@ -375,26 +342,26 @@ msgid ""
 "on other packages."
 msgstr ""
 
 "on other packages."
 msgstr ""
 

-# type: Content of: <appendix><section><title>
-#: tools.dbk:249
+#. type: Content of: <appendix><section><title>
+#: tools.dbk:228

 msgid "Package builders"
 msgstr ""
 
 msgid "Package builders"
 msgstr ""
 

-# type: Content of: <appendix><section><para>
-#: tools.dbk:251
+#. type: Content of: <appendix><section><para>
+#: tools.dbk:230

 msgid ""
 "The following packages help with the package building process, general "
 "driving <command>dpkg-buildpackage</command> as well as handling supporting "
 "tasks."
 msgstr ""
 
 msgid ""
 "The following packages help with the package building process, general "
 "driving <command>dpkg-buildpackage</command> as well as handling supporting "
 "tasks."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:255
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:234

 msgid "<systemitem role=\"package\">cvs-buildpackage</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">cvs-buildpackage</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:257
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:236

 msgid ""
 "<systemitem role=\"package\">cvs-buildpackage</systemitem> provides the "
 "capability to inject or import Debian source packages into a CVS repository, "
 msgid ""
 "<systemitem role=\"package\">cvs-buildpackage</systemitem> provides the "
 "capability to inject or import Debian source packages into a CVS repository, "


@@ -402,8 +369,8 @@ msgid ""
 "upstream changes into the repository."
 msgstr ""
 
 "upstream changes into the repository."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:263
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:242

 msgid ""
 "These utilities provide an infrastructure to facilitate the use of CVS by "
 "Debian maintainers.  This allows one to keep separate CVS branches of a "
 msgid ""
 "These utilities provide an infrastructure to facilitate the use of CVS by "
 "Debian maintainers.  This allows one to keep separate CVS branches of a "


@@ -412,13 +379,13 @@ msgid ""
 "benefits of a version control system."
 msgstr ""
 
 "benefits of a version control system."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:272
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:251

 msgid "<systemitem role=\"package\">debootstrap</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">debootstrap</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:274
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:253

 msgid ""
 "The <systemitem role=\"package\">debootstrap</systemitem> package and script "
 "allows you to bootstrap a Debian base system into any part of your "
 msgid ""
 "The <systemitem role=\"package\">debootstrap</systemitem> package and script "
 "allows you to bootstrap a Debian base system into any part of your "


@@ -426,8 +393,8 @@ msgid ""
 "to operate and install the rest of the system."
 msgstr ""
 
 "to operate and install the rest of the system."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:280
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:259

 msgid ""
 "Having a system like this can be useful in many ways.  For instance, you can "
 "<command>chroot</command> into it if you want to test your build "
 msgid ""
 "Having a system like this can be useful in many ways.  For instance, you can "
 "<command>chroot</command> into it if you want to test your build "


@@ -435,13 +402,13 @@ msgid ""
 "a bare base system.  Chroot builders use this package; see below."
 msgstr ""
 
 "a bare base system.  Chroot builders use this package; see below."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:288
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:267

 msgid "<systemitem role=\"package\">pbuilder</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">pbuilder</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:290
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:269

 msgid ""
 "<systemitem role=\"package\">pbuilder</systemitem> constructs a chrooted "
 "system, and builds a package inside the chroot.  It is very useful to check "
 msgid ""
 "<systemitem role=\"package\">pbuilder</systemitem> constructs a chrooted "
 "system, and builds a package inside the chroot.  It is very useful to check "


@@ -450,21 +417,21 @@ msgid ""
 "package."
 msgstr ""
 
 "package."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:296
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:275

 msgid ""
 "A related package is <systemitem role=\"package\">pbuilder-uml</systemitem>, "
 "which goes even further by doing the build within a User Mode Linux "
 "environment."
 msgstr ""
 
 msgid ""
 "A related package is <systemitem role=\"package\">pbuilder-uml</systemitem>, "
 "which goes even further by doing the build within a User Mode Linux "
 "environment."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:303
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:282

 msgid "<systemitem role=\"package\">sbuild</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">sbuild</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:305
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:284

 msgid ""
 "<systemitem role=\"package\">sbuild</systemitem> is another automated "
 "builder.  It can use chrooted environments as well.  It can be used "
 msgid ""
 "<systemitem role=\"package\">sbuild</systemitem> is another automated "
 "builder.  It can use chrooted environments as well.  It can be used "


@@ -475,25 +442,25 @@ msgid ""
 "url=\"&url-buildd;\"></ulink> to see the system in action."
 msgstr ""
 
 "url=\"&url-buildd;\"></ulink> to see the system in action."
 msgstr ""
 

-# type: Content of: <appendix><section><title>
-#: tools.dbk:317
+#. type: Content of: <appendix><section><title>
+#: tools.dbk:296

 msgid "Package uploaders"
 msgstr ""
 
 msgid "Package uploaders"
 msgstr ""
 

-# type: Content of: <appendix><section><para>
-#: tools.dbk:319
+#. type: Content of: <appendix><section><para>
+#: tools.dbk:298

 msgid ""
 "The following packages help automate or simplify the process of uploading "
 "packages into the official archive."
 msgstr ""
 
 msgid ""
 "The following packages help automate or simplify the process of uploading "
 "packages into the official archive."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:323
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:302

 msgid "<systemitem role=\"package\">dupload</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">dupload</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:325
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:304

 msgid ""
 "<systemitem role=\"package\">dupload</systemitem> is a package and a script "
 "to automatically upload Debian packages to the Debian archive, to log the "
 msgid ""
 "<systemitem role=\"package\">dupload</systemitem> is a package and a script "
 "to automatically upload Debian packages to the Debian archive, to log the "


@@ -501,13 +468,13 @@ msgid ""
 "it for new upload locations or methods."
 msgstr ""
 
 "it for new upload locations or methods."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:333
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:312

 msgid "<systemitem role=\"package\">dput</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">dput</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:335
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:314

 msgid ""
 "The <systemitem role=\"package\">dput</systemitem> package and script does "
 "much the same thing as <systemitem role=\"package\">dupload</systemitem>, "
 msgid ""
 "The <systemitem role=\"package\">dput</systemitem> package and script does "
 "much the same thing as <systemitem role=\"package\">dupload</systemitem>, "


@@ -517,39 +484,39 @@ msgid ""
 "running <command>dinstall</command> in dry-run mode after the upload."
 msgstr ""
 
 "running <command>dinstall</command> in dry-run mode after the upload."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:345
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:324

 msgid "<systemitem role=\"package\">dcut</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">dcut</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:347
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:326

 msgid ""
 "The <systemitem role=\"package\">dcut</systemitem> script (part of the "
 "package <xref linkend=\"dput\"/> ) helps in removing files from the ftp "
 "upload directory."
 msgstr ""
 
 msgid ""
 "The <systemitem role=\"package\">dcut</systemitem> script (part of the "
 "package <xref linkend=\"dput\"/> ) helps in removing files from the ftp "
 "upload directory."
 msgstr ""
 

-# type: Content of: <appendix><section><title>
-#: tools.dbk:355
+#. type: Content of: <appendix><section><title>
+#: tools.dbk:334

 msgid "Maintenance automation"
 msgstr ""
 
 msgid "Maintenance automation"
 msgstr ""
 

-# type: Content of: <appendix><section><para>
-#: tools.dbk:357
+#. type: Content of: <appendix><section><para>
+#: tools.dbk:336

 msgid ""
 "The following tools help automate different maintenance tasks, from adding "
 "changelog entries or signature lines and looking up bugs in Emacs to making "
 "use of the newest and official <filename>config.sub</filename>."
 msgstr ""
 
 msgid ""
 "The following tools help automate different maintenance tasks, from adding "
 "changelog entries or signature lines and looking up bugs in Emacs to making "
 "use of the newest and official <filename>config.sub</filename>."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:362
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:341

 msgid "<systemitem role=\"package\">devscripts</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">devscripts</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:364
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:343

 msgid ""
 "<systemitem role=\"package\">devscripts</systemitem> is a package containing "
 "wrappers and tools which are very helpful for maintaining your Debian "
 msgid ""
 "<systemitem role=\"package\">devscripts</systemitem> is a package containing "
 "wrappers and tools which are very helpful for maintaining your Debian "


@@ -565,21 +532,21 @@ msgid ""
 "package on is different from where your GPG keys are."
 msgstr ""
 
 "package on is different from where your GPG keys are."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:378
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:357

 msgid ""
 "See the <citerefentry> <refentrytitle>devscripts</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> manual page for a complete list of "
 "available scripts."
 msgstr ""
 
 msgid ""
 "See the <citerefentry> <refentrytitle>devscripts</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> manual page for a complete list of "
 "available scripts."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:385
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:364

 msgid "<systemitem role=\"package\">autotools-dev</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">autotools-dev</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:387
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:366

 msgid ""
 "<systemitem role=\"package\">autotools-dev</systemitem> contains best "
 "practices for people who maintain packages which use "
 msgid ""
 "<systemitem role=\"package\">autotools-dev</systemitem> contains best "
 "practices for people who maintain packages which use "


@@ -589,13 +556,13 @@ msgid ""
 "Debian ports."
 msgstr ""
 
 "Debian ports."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:396
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:375

 msgid "<systemitem role=\"package\">dpkg-repack</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">dpkg-repack</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:398
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:377

 msgid ""
 "<command>dpkg-repack</command> creates Debian package file out of a package "
 "that has already been installed.  If any changes have been made to the "
 msgid ""
 "<command>dpkg-repack</command> creates Debian package file out of a package "
 "that has already been installed.  If any changes have been made to the "


@@ -603,8 +570,8 @@ msgid ""
 "modified), the new package will inherit the changes."
 msgstr ""
 
 "modified), the new package will inherit the changes."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:404
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:383

 msgid ""
 "This utility can make it easy to copy packages from one computer to another, "
 "or to recreate packages which are installed on your system but no longer "
 msgid ""
 "This utility can make it easy to copy packages from one computer to another, "
 "or to recreate packages which are installed on your system but no longer "


@@ -612,39 +579,39 @@ msgid ""
 "upgrade it."
 msgstr ""
 
 "upgrade it."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:411
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:390

 msgid "<systemitem role=\"package\">alien</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">alien</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:413
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:392

 msgid ""
 "<command>alien</command> converts binary packages between various packaging "
 "formats, including Debian, RPM (RedHat), LSB (Linux Standard Base), Solaris, "
 "and Slackware packages."
 msgstr ""
 
 msgid ""
 "<command>alien</command> converts binary packages between various packaging "
 "formats, including Debian, RPM (RedHat), LSB (Linux Standard Base), Solaris, "
 "and Slackware packages."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:420
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:399

 msgid "<systemitem role=\"package\">debsums</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">debsums</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:422
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:401

 msgid ""
 "<command>debsums</command> checks installed packages against their MD5 "
 "sums.  Note that not all packages have MD5 sums, since they aren't required "
 "by Policy."
 msgstr ""
 
 msgid ""
 "<command>debsums</command> checks installed packages against their MD5 "
 "sums.  Note that not all packages have MD5 sums, since they aren't required "
 "by Policy."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:428
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:407

 msgid "<systemitem role=\"package\">dpkg-dev-el</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">dpkg-dev-el</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:430
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:409

 msgid ""
 "<systemitem role=\"package\">dpkg-dev-el</systemitem> is an Emacs lisp "
 "package which provides assistance when editing some of the files in the "
 msgid ""
 "<systemitem role=\"package\">dpkg-dev-el</systemitem> is an Emacs lisp "
 "package which provides assistance when editing some of the files in the "


@@ -653,13 +620,13 @@ msgid ""
 "the latest entry in a <filename>debian/changelog</filename> file."
 msgstr ""
 
 "the latest entry in a <filename>debian/changelog</filename> file."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:439
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:418

 msgid "<systemitem role=\"package\">dpkg-depcheck</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">dpkg-depcheck</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:441
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:420

 msgid ""
 "<command>dpkg-depcheck</command> (from the <systemitem "
 "role=\"package\">devscripts</systemitem> package, <xref "
 msgid ""
 "<command>dpkg-depcheck</command> (from the <systemitem "
 "role=\"package\">devscripts</systemitem> package, <xref "


@@ -667,8 +634,8 @@ msgid ""
 "to determine all the packages that were used by the said command."
 msgstr ""
 
 "to determine all the packages that were used by the said command."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:447
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:426

 msgid ""
 "For Debian packages, this is useful when you have to compose a "
 "<literal>Build-Depends</literal> line for your new package: running the "
 msgid ""
 "For Debian packages, this is useful when you have to compose a "
 "<literal>Build-Depends</literal> line for your new package: running the "


@@ -676,46 +643,44 @@ msgid ""
 "a good first approximation of the build-dependencies.  For example:"
 msgstr ""
 
 "a good first approximation of the build-dependencies.  For example:"
 msgstr ""
 

-# type: Content of: <appendix><section><section><screen>
-#: tools.dbk:452
+#. type: Content of: <appendix><section><section><screen>
+#: tools.dbk:432

 #, no-wrap
 #, no-wrap

-msgid ""
-"\n"
-"dpkg-depcheck -b debian/rules build\n"
+msgid "dpkg-depcheck -b debian/rules build\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:456
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:435

 msgid ""
 "<command>dpkg-depcheck</command> can also be used to check for run-time "
 "dependencies, especially if your package uses exec(2) to run other programs."
 msgstr ""
 
 msgid ""
 "<command>dpkg-depcheck</command> can also be used to check for run-time "
 "dependencies, especially if your package uses exec(2) to run other programs."
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:460
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:439

 msgid ""
 "For more information please see <citerefentry> "
 "<refentrytitle>dpkg-depcheck</refentrytitle> <manvolnum>1</manvolnum> "
 "</citerefentry>."
 msgstr ""
 
 msgid ""
 "For more information please see <citerefentry> "
 "<refentrytitle>dpkg-depcheck</refentrytitle> <manvolnum>1</manvolnum> "
 "</citerefentry>."
 msgstr ""
 

-# type: Content of: <appendix><section><title>
-#: tools.dbk:469
+#. type: Content of: <appendix><section><title>
+#: tools.dbk:448

 msgid "Porting tools"
 msgstr ""
 
 msgid "Porting tools"
 msgstr ""
 

-# type: Content of: <appendix><section><para>
-#: tools.dbk:471
+#. type: Content of: <appendix><section><para>
+#: tools.dbk:450

 msgid "The following tools are helpful for porters and for cross-compilation."
 msgstr ""
 
 msgid "The following tools are helpful for porters and for cross-compilation."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:474
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:453

 msgid "<systemitem role=\"package\">quinn-diff</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">quinn-diff</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:476
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:455

 msgid ""
 "<systemitem role=\"package\">quinn-diff</systemitem> is used to locate the "
 "differences from one architecture to another.  For instance, it could tell "
 msgid ""
 "<systemitem role=\"package\">quinn-diff</systemitem> is used to locate the "
 "differences from one architecture to another.  For instance, it could tell "


@@ -724,13 +689,13 @@ msgid ""
 "<replaceable>X</replaceable>."
 msgstr ""
 
 "<replaceable>X</replaceable>."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:484
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:463

 msgid "<systemitem role=\"package\">dpkg-cross</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">dpkg-cross</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:486
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:465

 msgid ""
 "<systemitem role=\"package\">dpkg-cross</systemitem> is a tool for "
 "installing libraries and headers for cross-compiling in a way similar to "
 msgid ""
 "<systemitem role=\"package\">dpkg-cross</systemitem> is a tool for "
 "installing libraries and headers for cross-compiling in a way similar to "


@@ -739,70 +704,104 @@ msgid ""
 "<command>dpkg-shlibdeps</command> is enhanced to support cross-compiling."
 msgstr ""
 
 "<command>dpkg-shlibdeps</command> is enhanced to support cross-compiling."
 msgstr ""
 

-# type: Content of: <appendix><section><title>
-#: tools.dbk:497
+#. type: Content of: <appendix><section><title>
+#: tools.dbk:476

 msgid "Documentation and information"
 msgstr ""
 
 msgid "Documentation and information"
 msgstr ""
 

-# type: Content of: <appendix><section><para>
-#: tools.dbk:499
+#. type: Content of: <appendix><section><para>
+#: tools.dbk:478

 msgid ""
 "The following packages provide information for maintainers or help with "
 "building documentation."
 msgstr ""
 
 msgid ""
 "The following packages provide information for maintainers or help with "
 "building documentation."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:503
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:483
+msgid "<systemitem role=\"package\">docbook-xml</systemitem>"
+msgstr ""
+
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:485
+msgid ""
+"<systemitem role=\"package\">docbook-xml</systemitem> provides the DocBook "
+"XML DTDs, which are commonly used for Debian documentation (as is the older "
+"debiandoc SGML DTD). This manual, for instance, is written in DocBook XML."
+msgstr ""
+
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:491
+msgid ""
+"The <systemitem role=\"package\">docbook-xsl</systemitem> package provides "
+"the XSL files for building and styling the source to various output "
+"formats. You will need an XSLT processor, such as <systemitem "
+"role=\"package\">xsltproc</systemitem>, to use the XSL stylesheets.  "
+"Documentation for the stylesheets can be found in the various <systemitem "
+"role=\"package\">docbook-xsl-doc-*</systemitem> packages."
+msgstr ""
+
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:499
+msgid ""
+"To produce PDF from FO, you need an FO processor, such as <systemitem "
+"role=\"package\">xmlroff</systemitem> or <systemitem "
+"role=\"package\">fop</systemitem>. Another tool to generate PDF from DocBook "
+"XML is <systemitem role=\"package\">dblatex</systemitem>."
+msgstr ""
+
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:507

 msgid "<systemitem role=\"package\">debiandoc-sgml</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">debiandoc-sgml</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:505
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:509

 msgid ""
 "<systemitem role=\"package\">debiandoc-sgml</systemitem> provides the "
 msgid ""
 "<systemitem role=\"package\">debiandoc-sgml</systemitem> provides the "

-"DebianDoc SGML DTD, which is commonly used for Debian documentation.  This "
-"manual, for instance, is written in DebianDoc.  It also provides scripts for "
-"building and styling the source to various output formats."
+"DebianDoc SGML DTD, which is commonly used for Debian documentation, but is "
+"now deprecated (<systemitem role=\"package\">docbook-xml</systemitem> should "
+"be used instead).  It also provides scripts for building and styling the "
+"source to various output formats."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:511
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:518

 msgid ""
 "Documentation for the DTD can be found in the <systemitem "
 "role=\"package\">debiandoc-sgml-doc</systemitem> package."
 msgstr ""
 
 msgid ""
 "Documentation for the DTD can be found in the <systemitem "
 "role=\"package\">debiandoc-sgml-doc</systemitem> package."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:533
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:524

 msgid "<systemitem role=\"package\">debian-keyring</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">debian-keyring</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:535
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:526

 msgid ""
 "Contains the public GPG and PGP keys of Debian developers.  See <xref "
 "linkend=\"key-maint\"/> and the package documentation for more information."
 msgstr ""
 
 msgid ""
 "Contains the public GPG and PGP keys of Debian developers.  See <xref "
 "linkend=\"key-maint\"/> and the package documentation for more information."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:541
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:532

 msgid "<systemitem role=\"package\">debian-maintainers</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">debian-maintainers</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:543
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:534

 msgid ""
 "Contains the public GPG keys of Debian Maintainers.  See <ulink "
 "url=\"&url-wiki-dm;\"></ulink> for more information."
 msgstr ""
 
 msgid ""
 "Contains the public GPG keys of Debian Maintainers.  See <ulink "
 "url=\"&url-wiki-dm;\"></ulink> for more information."
 msgstr ""
 

-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:549
+#. type: Content of: <appendix><section><section><title>
+#: tools.dbk:540

 msgid "<systemitem role=\"package\">debview</systemitem>"
 msgstr ""
 
 msgid "<systemitem role=\"package\">debview</systemitem>"
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:551
+#. type: Content of: <appendix><section><section><para>
+#: tools.dbk:542

 msgid ""
 "<systemitem role=\"package\">debview</systemitem> provides an Emacs mode for "
 "viewing Debian binary packages.  This lets you examine a package without "
 msgid ""
 "<systemitem role=\"package\">debview</systemitem> provides an Emacs mode for "
 "viewing Debian binary packages.  This lets you examine a package without "