POT updated in order to fit with last changes

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

diff --git a/po4a/po/best-pkging-practices.pot b/po4a/po/best-pkging-practices.pot
index a1c901e837e6eb22c386896721f65d54122b0626..2179ef66d427633b79107cd2d43c70f82ec9a784 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: 2010-05-06 17:34-0400\n"
+"POT-Creation-Date: 2010-05-31 19:21-0400\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"


@@ -111,8 +111,8 @@ msgid ""
 "<manvolnum>1</manvolnum> </citerefentry>, and looking at the examples that "
 "come with the package.  <command>dh_make</command>, from the <systemitem "
 "role=\"package\">dh-make</systemitem> package (see <xref "
 "<manvolnum>1</manvolnum> </citerefentry>, and looking at the examples that "
 "come with the package.  <command>dh_make</command>, from the <systemitem "
 "role=\"package\">dh-make</systemitem> package (see <xref "

-"linkend=\"dh-make\"/> ), can be used to convert a vanilla source package to "
-"a <systemitem role=\"package\">debhelper</systemitem>ized package.  This "
+"linkend=\"dh-make\"/>), can be used to convert a vanilla source package to a "
+"<systemitem role=\"package\">debhelper</systemitem>ized package.  This "

 "shortcut, though, should not convince you that you do not need to bother "
 "understanding the individual <command>dh_*</command> helpers.  If you are "
 "going to use a helper, you do need to take the time to learn to use that "
 "shortcut, though, should not convince you that you do not need to bother "
 "understanding the individual <command>dh_*</command> helpers.  If you are "
 "going to use a helper, you do need to take the time to learn to use that "


@@ -328,7 +328,7 @@ msgid ""
 "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 "
 "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 "
+"initial indefinite or definite article — \"a\", \"an\", or \"the\". Thus for "

 "instance:"
 msgstr ""
 
 "instance:"
 msgstr ""
 


@@ -345,7 +345,8 @@ msgstr ""
 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 "

-"package name and synopsis into this formula:"
+"package <replaceable>name</replaceable> and "
+"<replaceable>synopsis</replaceable> into this formula:"

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


@@ -694,7 +695,7 @@ 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 "
 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\"/> ."
+"changelog is bad practice.  See <xref linkend=\"upload-bugfix\"/>."

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


@@ -826,18 +827,18 @@ msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 #: best-pkging-practices.dbk:566
 
 #. type: Content of: <chapter><section><section><title>
 #: best-pkging-practices.dbk:566

-msgid "Supplementing changelogs with NEWS.Debian files"
+msgid "Supplementing changelogs with <filename>NEWS.Debian</filename> files"

 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 #: best-pkging-practices.dbk:568
 msgid ""
 msgstr ""
 
 #. 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 "
-"apt-listchanges, before all the rest of the changelogs.  This is the "
+"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-listchanges, before all the rest of the changelogs.  This is the "

 "preferred means to let the user know about significant changes in a "
 "package.  It is better than using debconf notes since it is less annoying "
 "preferred means to let the user know about significant changes in a "
 "package.  It is better than using debconf notes since it is less annoying "

-"and the user can go back and refer to the <filename> NEWS.Debian</filename> "
+"and the user can go back and refer to the <filename>NEWS.Debian</filename> "

 "file after the install.  And it's better than listing major changes in "
 "<filename>README.Debian</filename>, since the user can easily miss such "
 "notes."
 "file after the install.  And it's better than listing major changes in "
 "<filename>README.Debian</filename>, since the user can easily miss such "
 "notes."


@@ -851,8 +852,8 @@ msgid ""
 "rather than the more concise summaries that would go in a changelog.  It's a "
 "good idea to run your file through <literal>dpkg-parsechangelog</literal> to "
 "check its formatting as it will not be automatically checked during build as "
 "rather than the more concise summaries that would go in a changelog.  It's a "
 "good idea to run your file through <literal>dpkg-parsechangelog</literal> to "
 "check its formatting as it will not be automatically checked during build as "

-"the changelog is.  Here is an example of a real <filename>NEWS.Debian "
-"</filename> file:"
+"the changelog is.  Here is an example of a real "
+"<filename>NEWS.Debian</filename> file:"

 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>


@@ -873,11 +874,12 @@ msgstr ""
 #. type: Content of: <chapter><section><section><para>
 #: best-pkging-practices.dbk:598
 msgid ""
 #. 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>.  "
+"The <filename>NEWS.Debian</filename> file is installed as "
+"<filename>/usr/share/doc/<replaceable>package</replaceable>/NEWS.Debian.gz</filename>.  "

 "It is compressed, and always has that name even in Debian native packages.  "
 "It is compressed, and always has that name even in Debian native packages.  "

-"If you use <literal>debhelper</literal>, <literal>dh_installchangelogs "
-"</literal> will install <filename>debian/NEWS</filename> files for you."
+"If you use <literal>debhelper</literal>, "
+"<literal>dh_installchangelogs</literal> will install "
+"<filename>debian/NEWS</filename> files for you."

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


@@ -973,7 +975,7 @@ msgstr ""
 #. type: Content of: <chapter><section><para>
 #: best-pkging-practices.dbk:676
 msgid ""
 #. 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 "
+"You can use this function to search <varname>$PATH</varname> for a command "

 "name, passed as an argument.  It returns true (zero) if the command was "
 "found, and false if not.  This is really the most portable way, since "
 "<literal>command -v</literal>, <command>type</command>, and "
 "name, passed as an argument.  It returns true (zero) if the command was "
 "found, and false if not.  This is really the most portable way, since "
 "<literal>command -v</literal>, <command>type</command>, and "


@@ -1045,10 +1047,10 @@ msgstr ""
 #. type: Content of: <chapter><section><section><para>
 #: best-pkging-practices.dbk:724
 msgid ""
 #. 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 "
-"package usability.  Remember that notes will always block the install until "
-"confirmed or bother the user by email."
+"Keep usage notes to what they belong: the <filename>NEWS.Debian</filename>, "
+"or <filename>README.Debian</filename> file.  Only use notes for important "
+"notes which may directly affect the package usability.  Remember that notes "
+"will always block the install until confirmed or bother the user by email."

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


@@ -1087,8 +1089,8 @@ msgstr ""
 #. type: Content of: <chapter><section><section><section><para>
 #: best-pkging-practices.dbk:750
 msgid ""
 #. 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."
+"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>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>


@@ -1118,7 +1120,7 @@ msgstr ""
 msgid ""
 "Please use gettext-based templates.  Install <systemitem "
 "role=\"package\">po-debconf</systemitem> on your development system and read "
 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)."
+"its documentation (<command>man po-debconf</command> is a good start)."

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


@@ -1137,13 +1139,13 @@ msgstr ""
 msgid ""
 "If you plan to do changes to your original templates, please use the "
 "notification system provided with the <systemitem "
 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 "
+"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 and will be used by <command> "
-"podebconf-report-po</command>."
+"mentioned in the PO files headers and will be used by "
+"<command>podebconf-report-po</command>."

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


@@ -1155,20 +1157,20 @@ msgstr ""
 #: best-pkging-practices.dbk:796
 #, no-wrap
 msgid ""
 #: best-pkging-practices.dbk:796
 #, no-wrap
 msgid ""

-"cd debian/po &amp;&amp; podebconf-report-po --languageteam --withtranslators "
-"--call --deadline=\"+10 days\""
+"cd debian/po &amp;&amp; podebconf-report-po --call --languageteam "
+"--withtranslators --deadline=\"+10 days\""

 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 #: best-pkging-practices.dbk:798
 msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 #: 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>.  "
-"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."
+"This command will first synchronize the PO and POT files in "
+"<filename>debian/po</filename> with the templates files listed in "
+"<filename>debian/po/POTFILES.in</filename>.  Then, it will send a call for "
+"new translations, in the &email-debian-i18n; mailing list. Finally, it will "
+"also 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>)."

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


@@ -1226,20 +1228,20 @@ msgstr ""
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #: best-pkging-practices.dbk:844
 msgid ""
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #: best-pkging-practices.dbk:844
 msgid ""

-"Try finding a complete translation file <emphasis role=\"strong\"> "
-"before</emphasis> the change:"
+"Try finding a complete translation file <emphasis "
+"role=\"strong\">before</emphasis> the change:"

 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:847 best-pkging-practices.dbk:917
+#: best-pkging-practices.dbk:847 best-pkging-practices.dbk:918

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null\n"
-"--statistics $i; done"
+"for i in debian/po/*po; do echo -n $i: ; msgfmt -o /dev/null --statistics "
+"$i; done"

 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:850
+#: best-pkging-practices.dbk:849

 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 "


@@ -1248,7 +1250,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:858
+#: best-pkging-practices.dbk:857

 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 "


@@ -1257,7 +1259,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:866
+#: best-pkging-practices.dbk:865

 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 "


@@ -1266,15 +1268,15 @@ 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:874
+#: best-pkging-practices.dbk:873

 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 "

-"will not be broken by the edit action."
+"will not be broken by the edit action:"

 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:879
+#: best-pkging-practices.dbk:878

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


@@ -1282,35 +1284,42 @@ 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:885
+#: best-pkging-practices.dbk:884

 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:890
-msgid "Run <command>debconf-updatepo</command>"
+#: best-pkging-practices.dbk:889
+msgid "Run <command>debconf-updatepo</command>."

 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:895
+#: best-pkging-practices.dbk:894

 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:899
+#: best-pkging-practices.dbk:898

 #, no-wrap
 msgid "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
 msgstr ""
 
 #, no-wrap
 msgid "msgfmt -o /dev/null --statistics debian/po/foo.po\n"
 msgstr ""
 

+#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: best-pkging-practices.dbk:903
+msgid ""
+"If the file's statistics changed, you did something wrong. Try again or ask "
+"for help on the &email-debian-i18n; mailing list."
+msgstr ""
+

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

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

 msgid "Gettext utilities method:"
 msgstr ""
 
 #. 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>

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

 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> "


@@ -1320,7 +1329,7 @@ msgstr ""
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #: best-pkging-practices.dbk:922
 msgid ""
 #. 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.  "
+"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 ""
 "Files which report no fuzzy strings (only translated and untranslated) will "
 "be kept in place."
 msgstr ""


@@ -1328,21 +1337,21 @@ msgstr ""
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #: best-pkging-practices.dbk:929
 msgid ""
 #. 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 "
+"Now <emphasis role=\"strong\">and now only</emphasis>, modify the template "

 "for the typos and check again that translation are not impacted (typos, "
 "for the typos and check again that translation are not impacted (typos, "

-"spelling errors, sometimes typographical corrections are usually OK)"
+"spelling errors, sometimes typographical corrections are usually OK)."

 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #: best-pkging-practices.dbk:936
 msgid ""
 msgstr ""
 
 #. 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"
+"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:942
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #: best-pkging-practices.dbk:942

-msgid "use the following command:"
+msgid "Use the following command:"

 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>


@@ -1354,13 +1363,13 @@ msgstr ""
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #: best-pkging-practices.dbk:948
 msgid ""
 #. 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"
+"Move back to <filename>debian/po</filename> 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:953
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #: best-pkging-practices.dbk:953

-msgid "run <command>debconf-updatepo</command> again"
+msgid "Run <command>debconf-updatepo</command> again."

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


@@ -1443,7 +1452,7 @@ msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1010
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1010

-msgid "string:"
+msgid "string"

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


@@ -1453,7 +1462,7 @@ msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1017
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1017

-msgid "password:"
+msgid "password"

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


@@ -1466,7 +1475,7 @@ msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1026
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1026

-msgid "boolean:"
+msgid "boolean"

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


@@ -1478,7 +1487,7 @@ msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1034
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1034

-msgid "select:"
+msgid "select"

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


@@ -1536,7 +1545,7 @@ msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1072
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1072

-msgid "multiselect:"
+msgid "multiselect"

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


@@ -1548,7 +1557,7 @@ msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1080
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1080

-msgid "note:"
+msgid "note"

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


@@ -1563,7 +1572,7 @@ msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1091
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1091

-msgid "text:"
+msgid "text"

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


@@ -1573,7 +1582,7 @@ msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1098
 
 #. type: Content of: <chapter><section><section><section><section><title>
 #: best-pkging-practices.dbk:1098

-msgid "error:"
+msgid "error"

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


@@ -1677,7 +1686,7 @@ msgstr ""
 #. type: Content of: <chapter><section><section><section><para>
 #: best-pkging-practices.dbk:1165
 msgid ""
 #. 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 "
+"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 ""
 "possible choices which will be presented to users.  These choices should be "
 "separated by commas."
 msgstr ""


@@ -1798,7 +1807,9 @@ msgstr ""
 
 #. type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 #: best-pkging-practices.dbk:1266
 
 #. 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*."
+msgid ""
+"The short description should be considered to be a <emphasis "
+"role=\"strong\">title</emphasis>."

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


@@ -1814,10 +1825,11 @@ 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: "
 "it's best to use them only for warning about very serious problems.  The "
 "<emphasis role=\"strong\">Do not abuse debconf.</emphasis> Notes are the "
 "most common way to abuse debconf.  As written in debconf-devel manual page: "
 "it's best to use them only for warning about very serious problems.  The "

-"NEWS.Debian or README.Debian files are the appropriate location for a lot of "
-"notes.  If, by reading this, you consider converting your Note type "
-"templates to entries in NEWS/Debian or README.Debian, plus consider keeping "
-"existing translations for the future."
+"<filename>NEWS.Debian</filename> or <filename>README.Debian</filename> files "
+"are the appropriate location for a lot of notes.  If, by reading this, you "
+"consider converting your Note type templates to entries in "
+"<filename>NEWS.Debian</filename> or <filename>README.Debian</filename>, plus "
+"consider keeping existing translations for the future."

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


@@ -1843,7 +1855,7 @@ 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 "
 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."
+"use the _Default trick."

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


@@ -1873,9 +1885,9 @@ msgid ""
 "(ro), Russian (ru), Spanish (es), Swedish (sv)\n"
 "# This is the default choice. Translators may put their own language here\n"
 "# instead of the default.\n"
 "(ro), Russian (ru), Spanish (es), Swedish (sv)\n"
 "# This is the default choice. Translators may put their own language here\n"
 "# instead of the default.\n"

-"# WARNING : you MUST use the ENGLISH FORM of your language\n"
+"# WARNING : you MUST use the ENGLISH NAME of your language\n"

 "# For instance, the french translator will need to put French (fr) here.\n"
 "# For instance, the french translator will need to put French (fr) here.\n"

-"_DefaultChoice: English (en)[ translators, please see comment in PO files]\n"
+"_Default: English[ translators, please see comment in PO files]\n"

 "_Description: Geneweb default language:\n"
 msgstr ""
 
 "_Description: Geneweb default language:\n"
 msgstr ""
 


@@ -1890,7 +1902,7 @@ msgstr ""
 #. type: Content of: <chapter><section><section><section><para>
 #: best-pkging-practices.dbk:1333
 msgid ""
 #. 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 "
+"The comments are needed as the _Default trick is a bit confusing: the "

 "translators may put their own choice"
 msgstr ""
 
 "translators may put their own choice"
 msgstr ""
 


@@ -1905,8 +1917,8 @@ msgstr ""
 #: best-pkging-practices.dbk:1345
 msgid ""
 "If you use po-debconf (and you <emphasis role=\"strong\">should</emphasis>, "
 #: 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."
+"see <xref linkend=\"s6.5.2.2\"/>), consider making this field translatable, "
+"if you think it may be translated."

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


@@ -1914,7 +1926,7 @@ msgstr ""
 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 "

-"_DefaultChoice type documented in <citerefentry> "
+"_Default type documented in <citerefentry> "

 "<refentrytitle>po-debconf</refentrytitle> <manvolnum>7</manvolnum> "
 "</citerefentry>)."
 msgstr ""
 "<refentrytitle>po-debconf</refentrytitle> <manvolnum>7</manvolnum> "
 "</citerefentry>)."
 msgstr ""


@@ -1924,13 +1936,23 @@ msgstr ""
 msgid "Internationalization"
 msgstr ""
 
 msgid "Internationalization"
 msgstr ""
 

-#. type: Content of: <chapter><section><section><title>
+#. type: Content of: <chapter><section><para>

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

+msgid ""
+"This section contains global information for developers to make translators' "
+"life easier.  More information for translators and developers interrested in "
+"internationalization are available in the <ulink "
+"url=\"&url-i18n-l10n;\">Internationalisation and localisation in "
+"Debian</ulink> documentation."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><title>
+#: best-pkging-practices.dbk:1371

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

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

 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 "


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

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

 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, "


@@ -1953,10 +1975,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

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

 msgid ""
 "Using <systemitem role=\"package\">po-debconf</systemitem>, the translation "
 msgid ""
 "Using <systemitem role=\"package\">po-debconf</systemitem>, the translation "

-"is stored in <filename>po</filename> files (drawing from "
+"is stored in <filename>.po</filename> files (drawing from "

 "<command>gettext</command> translation techniques).  Special template files "
 "contain the original messages and mark which fields are translatable.  When "
 "you change the value of a translatable field, by calling "
 "<command>gettext</command> translation techniques).  Special template files "
 "contain the original messages and mark which fields are translatable.  When "
 "you change the value of a translatable field, by calling "


@@ -1970,12 +1992,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

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

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

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

 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 "


@@ -1983,24 +2005,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

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

 msgid ""
 msgid ""

-"If you maintain documentation of any size, its easier for translators if "
+"If you maintain documentation of any size, it is easier for translators if "

 "they have access to a source control system.  That lets translators see the "
 "differences between two versions of the documentation, so, for instance, "
 "they can see what needs to be retranslated.  It is recommended that the "
 "translated documentation maintain a note about what source control revision "
 "the translation is based on.  An interesting system is provided by <ulink "
 "url=\"&url-i18n-doc-check;\">doc-check</ulink> in the <systemitem "
 "they have access to a source control system.  That lets translators see the "
 "differences between two versions of the documentation, so, for instance, "
 "they can see what needs to be retranslated.  It is recommended that the "
 "translated documentation maintain a note about what source control revision "
 "the translation is based on.  An interesting system is provided by <ulink "
 "url=\"&url-i18n-doc-check;\">doc-check</ulink> in the <systemitem "

-"role=\"package\">boot-floppies</systemitem> package, which shows an overview "
-"of the translation status for any given language, using structured comments "
-"for the current revision of the file to be translated and, for a translated "
-"file, the revision of the original file the translation is based on.  You "
-"might wish to adapt and provide that in your CVS area."
+"role=\"package\">debian-installer</systemitem> package, which shows an "
+"overview of the translation status for any given language, using structured "
+"comments for the current revision of the file to be translated and, for a "
+"translated file, the revision of the original file the translation is based "
+"on.  You might wish to adapt and provide that in your VCS area."

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

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

 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 "


@@ -2008,18 +2030,29 @@ 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><section><para>
+#: best-pkging-practices.dbk:1432
+msgid ""
+"Some tools (e.g. <systemitem role=\"package\">po4a</systemitem>, <systemitem "
+"role=\"package\">poxml</systemitem>, or the <systemitem "
+"role=\"package\">translate-toolkit</systemitem>) are specialized in "
+"extracting the translatable material from different formats.  They produce "
+"PO files, a format quite common to translators, which permits to see what "
+"needs to be retranslated when the translated document is updated."
+msgstr ""
+

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

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

 msgid "Common packaging situations"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgid "Common packaging situations"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

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

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

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

 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, "


@@ -2032,12 +2065,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

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

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

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

 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 "


@@ -2046,26 +2079,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

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

 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>
 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:1469
+#: best-pkging-practices.dbk:1484

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

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

 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>
 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:1476
+#: best-pkging-practices.dbk:1491

 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 "


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

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

 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 "


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

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

 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 "


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

-#: best-pkging-practices.dbk:1494
+#: best-pkging-practices.dbk:1509

 msgid ""
 "Debian policy (section 12.1) directs that manual pages should accompany "
 "every program, utility, and function, and suggests them for other objects "
 msgid ""
 "Debian policy (section 12.1) directs that manual pages should accompany "
 "every program, utility, and function, and suggests them for other objects "


@@ -2102,29 +2135,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1501
+#: best-pkging-practices.dbk:1516

 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 "
 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."
+"<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>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

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

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

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

 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>
 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:1518
+#: best-pkging-practices.dbk:1533

 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 "


@@ -2134,28 +2167,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

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

 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>
 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:1534
+#: best-pkging-practices.dbk:1549

 msgid ""
 "Emacs related packages have the <ulink url=\"&url-emacs-policy;\">emacs "
 "policy</ulink>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 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:1541
+#: best-pkging-practices.dbk:1556

 msgid ""
 "Java related packages have their <ulink url=\"&url-java-policy;\">java "
 "policy</ulink>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 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:1548
+#: best-pkging-practices.dbk:1563

 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 "


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

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

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


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

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

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


@@ -2180,12 +2213,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

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

 msgid "Architecture-independent data"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "Architecture-independent data"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

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

 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, "


@@ -2195,32 +2228,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

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

 msgid ""
 "However, if the size of the data is considerable, consider splitting it out "
 msgid ""
 "However, if the size of the data is considerable, consider splitting it out "

-"into a separate, architecture-independent package (_all.deb).  By doing "
-"this, you avoid needless duplication of the same data into eleven or more "
-".debs, one per each architecture.  While this adds some extra overhead into "
-"the <filename>Packages</filename> files, it saves a lot of disk space on "
-"Debian mirrors.  Separating out architecture-independent data also reduces "
+"into a separate, architecture-independent package "
+"(<filename>_all.deb</filename>).  By doing this, you avoid needless "
+"duplication of the same data into eleven or more .debs, one per each "
+"architecture.  While this adds some extra overhead into the "
+"<filename>Packages</filename> files, it saves a lot of disk space on Debian "
+"mirrors.  Separating out architecture-independent data also reduces "

 "processing time of <command>lintian</command> (see <xref "
 "processing time of <command>lintian</command> (see <xref "

-"linkend=\"tools-lint\"/> ) when run over the entire Debian archive."
+"linkend=\"tools-lint\"/>) when run over the entire Debian archive."

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

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

 msgid "Needing a certain locale during build"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "Needing a certain locale during build"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

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

 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>
 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:1619
+#: best-pkging-practices.dbk:1634

 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 "


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

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

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


@@ -2245,12 +2279,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

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

 msgid "Make transition packages deborphan compliant"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "Make transition packages deborphan compliant"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

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

 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 "


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

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

 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 "


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

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

 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: "


@@ -2278,24 +2312,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1661
-msgid "Best practices for <filename>orig.tar.gz</filename> files"
+#: best-pkging-practices.dbk:1676
+msgid "Best practices for <filename>.orig.tar.{gz,bz2,lzma}</filename> files"

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

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

 msgid ""
 "There are two kinds of original source tarballs: Pristine source and "
 "repackaged upstream source."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
 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:1667
+#: best-pkging-practices.dbk:1682

 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:1671
+#: best-pkging-practices.dbk:1686

 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 "


@@ -2306,16 +2340,16 @@ msgid ""
 "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 "
 "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,bz2}</literal> for the same version, there is not "
-"even any point in treating this situation as a bug."
+"<filename>.orig.tar.{gz,bz2,lzma}</filename> 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:1669
+#: best-pkging-practices.dbk:1684

 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,bz2}</literal> file is byte-for-byte identical to a "
-"tarball officially distributed by the upstream author.  <placeholder "
+"<filename>.orig.tar.{gz,bz2,lzma}</filename> 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, "
 "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, "


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

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

 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 "


@@ -2334,45 +2368,46 @@ 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:1697
+#: best-pkging-practices.dbk:1712

 msgid "It unpacks the tarball in an empty temporary directory by doing"
 msgstr ""
 
 #. 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>

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

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"zcat path/to/&lt;packagename&gt;_&lt;upstream-version&gt;.orig.tar.gz | tar "
-"xf -\n"
+"zcat "
+"path/to/<replaceable>packagename</replaceable>_<replaceable>upstream-version</replaceable>.orig.tar.gz "
+"| tar xf -\n"

 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:1705
+#: best-pkging-practices.dbk:1720

 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 "

-"<literal>&lt;packagename&gt;-&lt;upstream-version&gt;(.orig)</literal>.  The "
-"name of the top-level directory in the tarball does not matter, and is "
+"<filename><replaceable>packagename</replaceable>-<replaceable>upstream-version</replaceable>(.orig)</filename>.  "
+"The name of the top-level directory in the tarball does not matter, and is "

 "forgotten."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 "forgotten."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

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

 msgid ""
 "Otherwise, the upstream tarball must have been packaged without a common "
 "top-level directory (shame on the upstream author!).  In this case, "
 "<command>dpkg-source</command> renames the temporary directory "
 "<emphasis>itself</emphasis> to "
 msgid ""
 "Otherwise, the upstream tarball must have been packaged without a common "
 "top-level directory (shame on the upstream author!).  In this case, "
 "<command>dpkg-source</command> renames the temporary directory "
 "<emphasis>itself</emphasis> to "

-"<literal>&lt;packagename&gt;-&lt;upstream-version&gt;(.orig)</literal>."
+"<filename><replaceable>packagename</replaceable>-<replaceable>upstream-version</replaceable>(.orig)</filename>."

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

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

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

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

 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 "


@@ -2382,24 +2417,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1734
+#: best-pkging-practices.dbk:1749

 msgid ""
 "In these cases the developer must construct a suitable "
 msgid ""
 "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 "
+"<filename>.orig.tar.{gz,bz2,lzma}</filename> 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 "
 "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>."
+"comes with Debian-specific changes in a separate "
+"<filename>.diff.gz</filename> or "
+"<filename>.debian.tar.{gz,bz2,lzma}</filename> and still has a version "
+"number composed of <replaceable>upstream-version</replaceable> and "
+"<replaceable>debian-version</replaceable>."

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

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

 msgid ""
 "There may be cases where it is desirable to repackage the source even though "
 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 "
-"used in its pristine form.  The most obvious is if "
+"upstream distributes a <filename>.tar.{gz,bz2,lzma}</filename> that could in "
+"principle be used in its pristine form.  The most obvious is if "

 "<emphasis>significant</emphasis> space savings can be achieved by "
 "recompressing the tar archive or by removing genuinely useless cruft from "
 "the upstream archive.  Use your own discretion here, but be prepared to "
 "<emphasis>significant</emphasis> space savings can be achieved by "
 "recompressing the tar archive or by removing genuinely useless cruft from "
 "the upstream archive.  Use your own discretion here, but be prepared to "


@@ -2407,56 +2443,58 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

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

 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:1757
+#: best-pkging-practices.dbk:1772

 msgid ""
 msgid ""

-"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 "
+"<emphasis role=\"strong\">should</emphasis> 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 "
 "<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>."
+"script: <filename>debian/rules</filename></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:1772
+#: best-pkging-practices.dbk:1787

 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.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 <filename>README.source</filename> "
+"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 separable from the "
+"rest of the source."

 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:1770
+#: best-pkging-practices.dbk:1785

 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 "

-"you.  <placeholder type=\"footnote\" id=\"0\"/>"
+"you.<placeholder type=\"footnote\" id=\"0\"/>"

 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:1783
+#: best-pkging-practices.dbk:1798

 msgid ""
 "<emphasis role=\"strong\">should</emphasis>, except where impossible for "
 "legal reasons, preserve the entire building and portablility infrastructure "
 "provided by the upstream author.  For example, it is not a sufficient reason "
 "for omitting a file that it is used only when building on MS-DOS.  "
 msgid ""
 "<emphasis role=\"strong\">should</emphasis>, except where impossible for "
 "legal reasons, preserve the entire building and portablility infrastructure "
 "provided by the upstream author.  For example, it is not a sufficient reason "
 "for omitting a file that it is used only when building on MS-DOS.  "

-"Similarly, a Makefile provided by upstream should not be omitted even if the "
-"first thing your <filename>debian/rules</filename> does is to overwrite it "
-"by running a configure script."
+"Similarly, a <filename>Makefile</filename> provided by upstream should not "
+"be omitted even if the first thing your <filename>debian/rules</filename> "
+"does is to overwrite it by running a configure script."

 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:1792
+#: best-pkging-practices.dbk:1807

 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 "


@@ -2465,28 +2503,28 @@ 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:1799
+#: best-pkging-practices.dbk:1814

 msgid ""
 "<emphasis role=\"strong\">should</emphasis> use "
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> use "

-"<literal>&lt;packagename&gt;-&lt;upstream-version&gt;.orig</literal> as the "
-"name of the top-level directory in its tarball.  This makes it possible to "
-"distinguish pristine tarballs from repackaged ones."
+"<filename><replaceable>packagename</replaceable>-<replaceable>upstream-version</replaceable>.orig</filename> "
+"as the name of the top-level directory in its tarball.  This makes it "
+"possible to distinguish pristine tarballs from repackaged ones."

 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:1807
+#: best-pkging-practices.dbk:1822

 msgid ""
 "<emphasis role=\"strong\">should</emphasis> be gzipped or bzipped with "
 "maximal compression."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> be gzipped or bzipped with "
 "maximal compression."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1814
+#: best-pkging-practices.dbk:1829

 msgid "Changing binary files"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Changing binary files"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1816
+#: best-pkging-practices.dbk:1831

 msgid ""
 "Sometimes it is necessary to change binary files contained in the original "
 "tarball, or to add binary files that are not in it. This is fully supported "
 msgid ""
 "Sometimes it is necessary to change binary files contained in the original "
 "tarball, or to add binary files that are not in it. This is fully supported "


@@ -2500,23 +2538,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1831
+#: best-pkging-practices.dbk:1846

 msgid "Best practices for debug packages"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "Best practices for debug packages"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1833
+#: best-pkging-practices.dbk:1848

 msgid ""
 "A debug package is a package with a name ending in -dbg, that contains "
 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 "
-"by default, debugging information, including function names and line "
-"numbers, is otherwise not available when running gdb on Debian binaries.  "
-"Debug packages allow users who need this additional debugging information to "
-"install it, without bloating a regular system with the information."
+"additional information that <command>gdb</command> can use.  Since Debian "
+"binaries are stripped by default, debugging information, including function "
+"names and line numbers, is otherwise not available when running "
+"<command>gdb</command> on Debian binaries.  Debug packages allow users who "
+"need this additional debugging information to install it, without bloating a "
+"regular system with the information."

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

-#: best-pkging-practices.dbk:1841
+#: best-pkging-practices.dbk:1856

 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 "


@@ -2529,13 +2568,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1851
+#: best-pkging-practices.dbk:1866

 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 "

-"instead containing separated debugging symbols that gdb can find and load on "
-"the fly when debugging a program or library.  The convention in Debian is to "
-"keep these symbols in "
+"instead containing separated debugging symbols that <command>gdb</command> "
+"can find and load on the fly when debugging a program or library.  The "
+"convention in Debian is to keep these symbols in "

 "<filename>/usr/lib/debug/<replaceable>path</replaceable></filename>, where "
 "<replaceable>path</replaceable> is the path to the executable or library.  "
 "For example, debugging symbols for <filename>/usr/bin/foo</filename> go in "
 "<filename>/usr/lib/debug/<replaceable>path</replaceable></filename>, where "
 "<replaceable>path</replaceable> is the path to the executable or library.  "
 "For example, debugging symbols for <filename>/usr/bin/foo</filename> go in "


@@ -2545,28 +2584,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1863
+#: best-pkging-practices.dbk:1878

 msgid ""
 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, "
-"and <command>objcopy --add-gnu-debuglink</command> used to specify the path "
-"to the debugging symbol file.  <citerefentry> "
+"The debugging symbols can be extracted from an object file using "
+"<command>objcopy --only-keep-debug</command>.  Then the object file can be "
+"stripped, and <command>objcopy --add-gnu-debuglink</command> used to specify "
+"the path to the debugging symbol file.  <citerefentry> "

 "<refentrytitle>objcopy</refentrytitle> <manvolnum>1</manvolnum> "
 "</citerefentry> explains in detail how this works."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 "<refentrytitle>objcopy</refentrytitle> <manvolnum>1</manvolnum> "
 "</citerefentry> explains in detail how this works."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1871
+#: best-pkging-practices.dbk:1886

 msgid ""
 msgid ""

-"The <command>dh_strip</command> command in debhelper supports creating debug "
-"packages, and can take care of using <command>objcopy</command> to separate "
-"out the debugging symbols for you.  If your package uses debhelper, all you "
-"need to do is call <command>dh_strip --dbg-package=libfoo-dbg</command>, and "
-"add an entry to <filename>debian/control</filename> for the debug package."
+"The <command>dh_strip</command> command in <systemitem "
+"role=\"package\">debhelper</systemitem> supports creating debug packages, "
+"and can take care of using <command>objcopy</command> to separate out the "
+"debugging symbols for you.  If your package uses <systemitem "
+"role=\"package\">debhelper</systemitem>, all you need to do is call "
+"<command>dh_strip --dbg-package=libfoo-dbg</command>, and add an entry to "
+"<filename>debian/control</filename> for the debug package."

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

-#: best-pkging-practices.dbk:1878
+#: best-pkging-practices.dbk:1893

 msgid ""
 "Note that the debug package should depend on the package that it provides "
 "debugging symbols for, and this dependency should be versioned.  For "
 msgid ""
 "Note that the debug package should depend on the package that it provides "
 "debugging symbols for, and this dependency should be versioned.  For "


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

-#: best-pkging-practices.dbk:1882
+#: best-pkging-practices.dbk:1897

 #, no-wrap
 msgid "Depends: libfoo (= ${binary:Version})\n"
 msgstr ""
 #, no-wrap
 msgid "Depends: libfoo (= ${binary:Version})\n"
 msgstr ""

diff --git a/po4a/po/new-maintainer.pot b/po4a/po/new-maintainer.pot
index 461a7f7d560c03a05cfb36879355cb3a416a1b3e..cc0538e78dfc5e719c038140540deab90ade4970 100644 (file)
--- a/po4a/po/new-maintainer.pot
+++ b/po4a/po/new-maintainer.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"POT-Creation-Date: 2010-05-06 17:34-0400\n"
+"POT-Creation-Date: 2010-05-30 14:35-0400\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"


@@ -270,8 +270,7 @@ msgstr ""
 msgid ""
 "You need a version 4 key for use in Debian Development.  Your key length "
 "must be at least 1024 bits; there is no reason to use a smaller key, and "
 msgid ""
 "You need a version 4 key for use in Debian Development.  Your key length "
 "must be at least 1024 bits; there is no reason to use a smaller key, and "

-"doing so would be much less secure.  <placeholder type=\"footnote\" "
-"id=\"0\"/>"
+"doing so would be much less secure.<placeholder type=\"footnote\" id=\"0\"/>"

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

diff --git a/po4a/po/pkgs.pot b/po4a/po/pkgs.pot
index a77945983880b7448bfa6fd33b24940cea271ea3..aa9eabb2d5a76d23b2528d0e0535090dfa079efe 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: 2010-05-06 17:34-0400\n"
+"POT-Creation-Date: 2010-05-31 18:23-0400\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"


@@ -202,7 +202,7 @@ msgstr ""
 #. type: Content of: <chapter><section><screen>
 #: pkgs.dbk:138
 #, no-wrap
 #. type: Content of: <chapter><section><screen>
 #: pkgs.dbk:138
 #, no-wrap

-msgid "  * new upstream version\n"
+msgid "  * New upstream release.\n"

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


@@ -322,12 +322,12 @@ msgstr ""
 #: pkgs.dbk:232
 msgid ""
 "For the native packages, the source package includes a Debian source control "
 #: pkgs.dbk:232
 msgid ""
 "For the native packages, the source package includes a Debian source control "

-"file (<literal>.dsc</literal>) and the source tarball "
-"(<literal>.tar.{gz,bz2,lzma}</literal>). A source package of a non-native "
+"file (<filename>.dsc</filename>) and the source tarball "
+"(<filename>.tar.{gz,bz2,lzma}</filename>). A source package of a non-native "

 "package includes a Debian source control file, the original source tarball "
 "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 "
+"(<filename>.orig.tar.{gz,bz2,lzma}</filename>) and the Debian changes "
+"(<filename>.diff.gz</filename> for the source format “1.0” or "
+"<filename>.debian.tar.{gz,bz2,lzma}</filename> for the source format “3.0 "

 "(quilt)”)."
 msgstr ""
 
 "(quilt)”)."
 msgstr ""
 


@@ -376,9 +376,9 @@ msgstr ""
 #: pkgs.dbk:270
 msgid ""
 "Please notice that, in non-native packages, permissions on files that are "
 #: pkgs.dbk:270
 msgid ""
 "Please notice that, in non-native packages, permissions on files that are "

-"not present in the .orig.tar.{gz,bz2,lzma} 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 "
+"not present in the <filename>*.orig.tar.{gz,bz2,lzma}</filename> 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 ""
 "<filename>debian</filename> directory are preserved since they are stored in "
 "a tar archive."
 msgstr ""


@@ -1308,7 +1308,7 @@ msgstr ""
 #: pkgs.dbk:963
 msgid ""
 "Please note that if secrecy is needed you may not upload a fix to "
 #: 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 "
+"<literal>unstable</literal> (or anywhere else, such as a public VCS "

 "repository).  It is not sufficient to obfuscate the details of the change, "
 "as the code itself is public, and can (and will) be examined by the general "
 "public."
 "repository).  It is not sufficient to obfuscate the details of the change, "
 "as the code itself is public, and can (and will) be examined by the general "
 "public."


@@ -1710,7 +1710,7 @@ msgid ""
 "and only needed if the removal request only applies to some architectures, "
 "not all. Note that the <command>reportbug</command> will create a title "
 "conforming to these rules when you use it to report a bug against the "
 "and only needed if the removal request only applies to some architectures, "
 "not all. Note that the <command>reportbug</command> will create a title "
 "conforming to these rules when you use it to report a bug against the "

-"<literal> ftp.debian.org</literal> pseudo-package."
+"<literal>ftp.debian.org</literal> pseudo-package."

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


@@ -1728,12 +1728,12 @@ msgstr ""
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:1295
 msgid ""
 #. 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> "
-"distribution.  Packages are not removed from <literal>testing</literal> "
-"directly.  Rather, they will be removed automatically after the package has "
-"been removed from <literal>unstable</literal> and no package in "
-"<literal>testing </literal> depends on it."
+"Note that removals can only be done for the <literal>unstable</literal>, "
+"<literal>experimental</literal> and <literal>stable</literal> distribution.  "
+"Packages are not removed from <literal>testing</literal> directly.  Rather, "
+"they will be removed automatically after the package has been removed from "
+"<literal>unstable</literal> and no package in <literal>testing</literal> "
+"depends on it."

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


@@ -1788,8 +1788,8 @@ msgid ""
 "role=\"package\">apt</systemitem> package.  When invoked as "
 "<literal>apt-cache showpkg <replaceable>package</replaceable></literal>, the "
 "program will show details for <replaceable>package</replaceable>, including "
 "role=\"package\">apt</systemitem> package.  When invoked as "
 "<literal>apt-cache showpkg <replaceable>package</replaceable></literal>, the "
 "program will show details for <replaceable>package</replaceable>, including "

-"reverse depends.  Other useful programs include <literal>apt-cache "
-"rdepends</literal>, <command>apt-rdepends</command>, "
+"reverse depends.  Other useful programs include <command>apt-cache "
+"rdepends</command>, <command>apt-rdepends</command>, "

 "<command>build-rdeps</command> (in the <systemitem "
 "role=\"package\">devscripts</systemitem> package) and "
 "<command>grep-dctrl</command>.  Removal of orphaned packages is discussed on "
 "<command>build-rdeps</command> (in the <systemitem "
 "role=\"package\">devscripts</systemitem> package) and "
 "<command>grep-dctrl</command>.  Removal of orphaned packages is discussed on "


@@ -1842,14 +1842,14 @@ msgid ""
 "two-step process to rename it. In the first step, change the "
 "<filename>debian/control</filename> file to reflect the new name and to "
 "replace, provide and conflict with the obsolete package name (see the <ulink "
 "two-step process to rename it. In the first step, change the "
 "<filename>debian/control</filename> file to reflect the new name and to "
 "replace, provide and conflict with the obsolete package name (see the <ulink "

-"url=\"&url-debian-policy;\"> Debian Policy Manual</ulink> for details).  "
+"url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for details).  "

 "Please note that you should only add a <literal>Provides</literal> relation "
 "if all packages depending on the obsolete package name continue to work "
 "after the renaming. Once you've uploaded the package and the package has "
 "Please note that you should only add a <literal>Provides</literal> relation "
 "if all packages depending on the obsolete package name continue to work "
 "after the renaming. Once you've uploaded the package and the package has "

-"moved into the archive, file a bug against <literal> "
-"ftp.debian.org</literal> asking to remove the package with the obsolete name "
-"(see <xref linkend=\"removing-pkgs\"/>).  Do not forget to properly reassign "
-"the package's bugs at the same time."
+"moved into the archive, file a bug against <literal>ftp.debian.org</literal> "
+"asking to remove the package with the obsolete name (see <xref "
+"linkend=\"removing-pkgs\"/>).  Do not forget to properly reassign the "
+"package's bugs at the same time."

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


@@ -1951,7 +1951,7 @@ 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 "
 "automatically once you upload a new version with an updated "
 "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 "
 "automatically once you upload a new version with an updated "

-"<literal>Maintainer:</literal> field, although it can take a few hours after "
+"<literal>Maintainer</literal> field, although it can take a few hours after "

 "the upload is done.  If you do not expect to upload a new version for a "
 "while, you can use <xref linkend=\"pkg-tracking-system\"/> to get the bug "
 "reports.  However, make sure that the old maintainer has no problem with the "
 "the upload is done.  If you do not expect to upload a new version for a "
 "while, you can use <xref linkend=\"pkg-tracking-system\"/> to get the bug "
 "reports.  However, make sure that the old maintainer has no problem with the "


@@ -1979,8 +1979,8 @@ msgid ""
 "different from the original architecture of the package maintainer's binary "
 "package.  It is a unique and essential activity.  In fact, porters do most "
 "of the actual compiling of Debian packages.  For instance, when a maintainer "
 "different from the original architecture of the package maintainer's binary "
 "package.  It is a unique and essential activity.  In fact, porters do most "
 "of the actual compiling of Debian packages.  For instance, when a maintainer "

-"uploads a (portable) source packages with binaries for the <literal>i386 "
-"</literal> architecture, it will be built for each of the other "
+"uploads a (portable) source packages with binaries for the "
+"<literal>i386</literal> architecture, it will be built for each of the other "

 "architectures, amounting to &number-of-arches; more builds."
 msgstr ""
 
 "architectures, amounting to &number-of-arches; more builds."
 msgstr ""
 


@@ -2110,11 +2110,12 @@ msgstr ""
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #: pkgs.dbk:1595
 msgid ""
 #. 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 "
-"requires.  Make sure that both targets work independently, that is, that you "
-"can call the target without having called the other before.  To test this, "
-"try to run <command>dpkg-buildpackage -B</command>."
+"Make sure your <filename>debian/rules</filename> contains separate "
+"<literal>binary-arch</literal> and <literal>binary-indep</literal> targets, "
+"as the Debian Policy Manual requires.  Make sure that both targets work "
+"independently, that is, that you can call the target without having called "
+"the other before.  To test this, try to run <command>dpkg-buildpackage "
+"-B</command>."

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


@@ -2150,7 +2151,7 @@ msgid ""
 "<replaceable>porter-email</replaceable> to your email address.  This will do "
 "a binary-only build of only the architecture-dependent portions of the "
 "package, using the <literal>binary-arch</literal> target in "
 "<replaceable>porter-email</replaceable> to your email address.  This will do "
 "a binary-only build of only the architecture-dependent portions of the "
 "package, using the <literal>binary-arch</literal> target in "

-"<filename>debian/rules </filename>."
+"<filename>debian/rules</filename>."

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


@@ -2186,12 +2187,12 @@ 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-dependent and arch-independent packages that have inter-dependencies "
 "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-dependent and arch-independent packages that have inter-dependencies "

-"generated using dpkg's substitution variable <literal>$(Source-Version)  "
-"</literal>."
+"generated using dpkg's substitution variable "
+"<literal>$(Source-Version)</literal>."

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

-#: pkgs.dbk:1655
+#: pkgs.dbk:1654

 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 "
 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 "


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

-#: pkgs.dbk:1660
+#: pkgs.dbk:1659

 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 "


@@ -2209,7 +2210,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para><footnote><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para><footnote><para>

-#: pkgs.dbk:1675
+#: pkgs.dbk:1674

 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 "


@@ -2219,21 +2220,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1667
+#: pkgs.dbk:1666

 msgid ""
 "The ``magic'' for a recompilation-only NMU is triggered by using a suffix "
 msgid ""
 "The ``magic'' for a recompilation-only NMU is triggered by using a suffix "

-"appended to the package version number, following the form <literal> "
-"b<replaceable>number</replaceable></literal>.  For instance, if the latest "
-"version you are recompiling against was version <literal>2.9-3</literal>, "
-"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>.  <placeholder type=\"footnote\" "
-"id=\"0\"/>"
+"appended to the package version number, following the form "
+"<literal>b<replaceable>number</replaceable></literal>.  For instance, if the "
+"latest version you are recompiling against was version "
+"<literal>2.9-3</literal>, 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>.<placeholder type=\"footnote\" id=\"0\"/>"

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

-#: pkgs.dbk:1683
+#: pkgs.dbk:1682

 msgid ""
 "Similar to initial porter uploads, the correct way of invoking "
 "<command>dpkg-buildpackage</command> is <literal>dpkg-buildpackage "
 msgid ""
 "Similar to initial porter uploads, the correct way of invoking "
 "<command>dpkg-buildpackage</command> is <literal>dpkg-buildpackage "


@@ -2241,15 +2242,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1690
+#: pkgs.dbk:1689

 msgid "When to do a source NMU if you are a porter"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:1692
+#: pkgs.dbk:1691

 msgid ""
 "Porters doing a source NMU generally follow the guidelines found in <xref "
 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 "
+"linkend=\"nmu\"/>, just like non-porters.  However, it is expected that the "

 "wait cycle for a porter's source NMU is smaller than for a non-porter, since "
 "porters have to cope with a large quantity of packages.  Again, the "
 "situation varies depending on the distribution they are uploading to.  It "
 "wait cycle for a porter's source NMU is smaller than for a non-porter, since "
 "porters have to cope with a large quantity of packages.  Again, the "
 "situation varies depending on the distribution they are uploading to.  It "


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

-#: pkgs.dbk:1701
+#: pkgs.dbk:1700

 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, "


@@ -2269,12 +2270,12 @@ msgid ""
 "shortened if the problem is critical and imposes hardship on the porting "
 "effort, at the discretion of the porter group.  (Remember, none of this is "
 "Policy, just mutually agreed upon guidelines.) For uploads to "
 "shortened if the problem is critical and imposes hardship on the porting "
 "effort, at the discretion of the porter group.  (Remember, none of this is "
 "Policy, just mutually agreed upon guidelines.) For uploads to "

-"<literal>stable</literal> or <literal>testing </literal>, please coordinate "
+"<literal>stable</literal> or <literal>testing</literal>, please coordinate "

 "with the appropriate release team first."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 "with the appropriate release team first."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1713
+#: pkgs.dbk:1712

 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 "


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

-#: pkgs.dbk:1721
+#: pkgs.dbk:1720

 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 "


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

-#: pkgs.dbk:1729
+#: pkgs.dbk:1728

 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 "


@@ -2305,12 +2306,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1739
+#: pkgs.dbk:1738

 msgid "Porting infrastructure and automation"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "Porting infrastructure and automation"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1741
+#: pkgs.dbk:1740

 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 "


@@ -2319,19 +2320,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1746
+#: pkgs.dbk:1745

 msgid "Mailing lists and web pages"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Mailing lists and web pages"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1748
+#: pkgs.dbk:1747

 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>
 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:1752
+#: pkgs.dbk:1751

 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 "


@@ -2340,36 +2341,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1760
+#: pkgs.dbk:1759

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

-#: pkgs.dbk:1762
+#: pkgs.dbk:1761

 msgid ""
 "Descriptions of several porting tools can be found in <xref "
 "linkend=\"tools-porting\"/>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
 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:1768
+#: pkgs.dbk:1767

 msgid "<systemitem role=\"package\">wanna-build</systemitem>"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgid "<systemitem role=\"package\">wanna-build</systemitem>"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1770
+#: pkgs.dbk:1769

 msgid ""
 "The <systemitem role=\"package\">wanna-build</systemitem> system is used as "
 "a distributed, client-server build distribution system.  It is usually used "
 "in conjunction with build daemons running the <systemitem "
 msgid ""
 "The <systemitem role=\"package\">wanna-build</systemitem> system is used as "
 "a distributed, client-server build distribution system.  It is usually used "
 "in conjunction with build daemons running the <systemitem "

-"role=\"package\">buildd </systemitem> program. <literal>Build "
+"role=\"package\">buildd</systemitem> program. <literal>Build "

 "daemons</literal> are ``slave'' hosts which contact the central <systemitem "
 "daemons</literal> are ``slave'' hosts which contact the central <systemitem "

-"role=\"package\"> wanna-build</systemitem> system to receive a list of "
+"role=\"package\">wanna-build</systemitem> system to receive a list of "

 "packages that need to be built."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 "packages that need to be built."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1778
+#: pkgs.dbk:1777

 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 "


@@ -2381,16 +2382,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1787
+#: pkgs.dbk:1786

 msgid ""
 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 <ulink url=\"&url-buildd;\"></ulink>.  This data includes nightly updated "
-"statistics, queueing information and logs for build attempts."
+"Most of the data produced by <systemitem "
+"role=\"package\">wanna-build</systemitem> which is generally useful to "
+"porters is available on the web at <ulink url=\"&url-buildd;\"></ulink>.  "
+"This data includes nightly updated statistics, queueing information and logs "
+"for build attempts."

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

-#: pkgs.dbk:1793
+#: pkgs.dbk:1792

 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 "


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

-#: pkgs.dbk:1800
+#: pkgs.dbk:1799

 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 "
 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 "


@@ -2409,19 +2411,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1807
+#: pkgs.dbk:1806

 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>
 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
+#: pkgs.dbk:1815

 msgid "When your package is <emphasis>not</emphasis> portable"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "When your package is <emphasis>not</emphasis> portable"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1818
+#: pkgs.dbk:1817

 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 "


@@ -2432,14 +2434,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1825
+#: pkgs.dbk:1824

 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>
 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:1831
+#: pkgs.dbk:1830

 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 "


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

-#: pkgs.dbk:1839
+#: pkgs.dbk:1838

 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 "


@@ -2460,34 +2462,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1847
+#: pkgs.dbk:1846

 msgid ""
 "In order to prevent autobuilders from needlessly trying to build your "
 msgid ""
 "In order to prevent autobuilders from needlessly trying to build your "

-"package, it must be included in <filename>packages-arch-specific</filename>, "
+"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-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>
 "a list used by the <command>wanna-build</command> script.  The current "
 "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>

-#: pkgs.dbk:1856
+#: pkgs.dbk:1855

 msgid ""
 "Please note that it is insufficient to only add your package to "
 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: A porter or any other person trying to build your package "
-"might accidently upload it without noticing it doesn't work.  If in the past "
-"some binary packages were uploaded on unsupported architectures, request "
-"their removal by filing a bug against <systemitem "
-"role=\"package\">ftp.debian.org</systemitem>"
+"<filename>Packages-arch-specific</filename> without making it fail to build "
+"on unsupported architectures: A porter or any other person trying to build "
+"your package might accidently upload it without noticing it doesn't work.  "
+"If in the past some binary packages were uploaded on unsupported "
+"architectures, request their removal by filing a bug against <systemitem "
+"role=\"package\">ftp.debian.org</systemitem>."

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

-#: pkgs.dbk:1869
+#: pkgs.dbk:1868

 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:1871
+#: pkgs.dbk:1870

 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 "


@@ -2498,24 +2500,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1880
+#: pkgs.dbk:1879

 msgid "When and how to do an NMU"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "When and how to do an NMU"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1883
+#: pkgs.dbk:1882

 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:1888
+#: pkgs.dbk:1887

 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:1894
+#: pkgs.dbk:1893

 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 "


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

-#: pkgs.dbk:1901
+#: pkgs.dbk:1900

 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 "


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

-#: pkgs.dbk:1911
+#: pkgs.dbk:1910

 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 "


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

-#: pkgs.dbk:1918
+#: pkgs.dbk:1917

 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 "


@@ -2553,16 +2555,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1928
+#: pkgs.dbk:1927

 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 "

-"package and your proposed NMU to the BTS. The <literal>nmudiff</literal> "
-"script in the <literal>devscripts</literal> package might be helpful."
+"package and your proposed NMU to the BTS. The <command>nmudiff</command> "
+"script in the <systemitem role=\"package\">devscripts</systemitem> package "
+"might be helpful."

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

-#: pkgs.dbk:1935
+#: pkgs.dbk:1934

 msgid ""
 "While preparing the patch, you should better be aware of any "
 "package-specific practices that the maintainer might be using. Taking them "
 msgid ""
 "While preparing the patch, you should better be aware of any "
 "package-specific practices that the maintainer might be using. Taking them "


@@ -2570,11 +2573,11 @@ msgid ""
 "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 "
 "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>."
+"url=\"&url-debian-policy;ch-source.html#s-readmesource\"><filename>debian/README.source</filename></ulink>."

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

-#: pkgs.dbk:1943
+#: pkgs.dbk:1942

 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 "


@@ -2583,22 +2586,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1950
+#: pkgs.dbk:1949

 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:1955
+#: pkgs.dbk:1954

 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:1960
+#: pkgs.dbk:1959

 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:1966
+#: pkgs.dbk:1965

 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 "


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

-#: pkgs.dbk:1972
+#: pkgs.dbk:1971

 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 "


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

-#: pkgs.dbk:1982
+#: pkgs.dbk:1981

 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 "


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

-#: pkgs.dbk:1988
+#: pkgs.dbk:1987

 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 "


@@ -2637,34 +2640,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1998
-msgid "NMUs and debian/changelog"
+#: pkgs.dbk:1997
+msgid "NMUs and <filename>debian/changelog</filename>"

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

-#: pkgs.dbk:2000
+#: pkgs.dbk:1999

 msgid ""
 "Just like any other (source) upload, NMUs must add an entry to "
 msgid ""
 "Just like any other (source) upload, NMUs must add an entry to "

-"<literal>debian/changelog</literal>, telling what has changed with this "
+"<filename>debian/changelog</filename>, 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 ""
 
 #. type: Content of: <chapter><section><section><screen>
 "upload.  The first line of this entry must explicitely mention that this "
 "upload is an NMU, e.g.:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:2005
+#: pkgs.dbk:2004

 #, 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:2009
+#: pkgs.dbk:2008

 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:2012
+#: pkgs.dbk:2011

 msgid ""
 msgid ""

-"If the package is a native package (without a debian revision in the version "
+"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>.  "
 "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>.  "


@@ -2674,19 +2677,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2022
+#: pkgs.dbk:2021

 msgid ""
 "If the package is a not a native package, you should add a minor version "
 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 "
-"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>."
+"number to the Debian revision part of the version number (the portion after "
+"the last hyphen). This extra number must start at <literal>1</literal>.  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 ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2031
+#: pkgs.dbk:2030

 msgid ""
 "In both cases, if the last upload was also an NMU, the counter should be "
 "increased. For example, if the current version is "
 msgid ""
 "In both cases, if the last upload was also an NMU, the counter should be "
 "increased. For example, if the current version is "


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

-#: pkgs.dbk:2037
+#: pkgs.dbk:2036

 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 "


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

-#: pkgs.dbk:2047
+#: pkgs.dbk:2046

 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 "


@@ -2718,23 +2721,23 @@ msgid ""
 "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 "
 "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 "
+"example, while Lenny (Debian 5.0) is stable, a security NMU to stable for a "

 "package at version <literal>1.5-3</literal> would have version "
 "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, "
+"<literal>1.5-3+deb50u1</literal>, whereas a security NMU to Squeeze would "
+"get version <literal>1.5-3+deb60u1</literal>. After the release of Squeeze, "

 "security uploads to the <literal>testing</literal> distribution will be "
 "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>."
+"versioned <literal>+deb61uZ</literal>, until it is known whether that "
+"release will be Debian 6.1 or Debian 7.0 (if that becomes the case, uploads "
+"will be versioned as <literal>+deb70uZ</literal>)."

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

-#: pkgs.dbk:2069
+#: pkgs.dbk:2068

 msgid "Using the <literal>DELAYED/</literal> queue"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "Using the <literal>DELAYED/</literal> queue"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2072
+#: pkgs.dbk:2071

 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 "


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

-#: pkgs.dbk:2086
+#: pkgs.dbk:2085

 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 "


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

-#: pkgs.dbk:2093
+#: pkgs.dbk:2092

 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 "


@@ -2767,12 +2770,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2103
+#: pkgs.dbk:2102

 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:2106
+#: pkgs.dbk:2105

 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 "


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

-#: pkgs.dbk:2115
+#: pkgs.dbk:2114

 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 "


@@ -2791,12 +2794,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2124
+#: pkgs.dbk:2123

 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:2127
+#: pkgs.dbk:2126

 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 "


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

-#: pkgs.dbk:2134
+#: pkgs.dbk:2133

 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 "


@@ -2813,30 +2816,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2140
+#: pkgs.dbk:2139

 msgid ""
 "BinNMUs are usually triggered on the buildds by wanna-build.  An entry is "
 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 "
+"added to <filename>debian/changelog</filename>, 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 ""
 
 #. type: Content of: <chapter><section><section><para>
 "linkend=\"binary-only-nmu\"/>.  This entry should not be included in the "
 "next upload."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2148
+#: pkgs.dbk:2147

 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 "

-"normally called NMU, and they don't add an entry to debian/changelog."
+"normally called NMU, and they don't add an entry to "
+"<filename>debian/changelog</filename>."

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

-#: pkgs.dbk:2156
+#: pkgs.dbk:2155

 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:2159
+#: pkgs.dbk:2158

 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 "


@@ -2844,23 +2848,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2166
+#: pkgs.dbk:2165

 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 "
 "no need to use a delayed upload.  The difference is that you are not listed "
 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 "
 "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:"
+"as the <literal>Maintainer</literal> or <literal>Uploader</literal> for the "
+"package.  Also, the changelog entry of a QA upload has a special first line:"

 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:2174
+#: pkgs.dbk:2173

 #, 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:2178
+#: pkgs.dbk:2177

 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 "


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

-#: pkgs.dbk:2189
+#: pkgs.dbk:2188

 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 "


@@ -2881,41 +2885,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2198
+#: pkgs.dbk:2197

 msgid "NMUs vs team uploads"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "NMUs vs team uploads"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2201
+#: pkgs.dbk:2200

 msgid ""
 "Sometimes you are fixing and/or updating a package because you are member of "
 msgid ""
 "Sometimes you are fixing and/or updating a package because you are member of "

-"a packaging team (which uses a mailing list as Maintainer or Uploader, see "
-"<xref linkend=\"collaborative-maint\"/>) but you don't want to add yourself "
-"to Uploaders because you do not plan to contribute regularly to this "
-"specific package. If it conforms with your team's policy, you can perform a "
-"normal upload without being listed directly as Maintainer or Uploader. In "
-"that case, you should start your changelog entry with the following line: "
-"<code> * Team upload.</code>."
+"a packaging team (which uses a mailing list as <literal>Maintainer</literal> "
+"or <literal>Uploader</literal>, see <xref linkend=\"collaborative-maint\"/>) "
+"but you don't want to add yourself to <literal>Uploaders</literal> because "
+"you do not plan to contribute regularly to this specific package. If it "
+"conforms with your team's policy, you can perform a normal upload without "
+"being listed directly as <literal>Maintainer</literal> or "
+"<literal>Uploader</literal>. In that case, you should start your changelog "
+"entry with the following line:"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><screen>
+#: pkgs.dbk:2210
+#, no-wrap
+msgid " * Team upload.\n"

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

-#: pkgs.dbk:2215
+#: pkgs.dbk:2218

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

-#: pkgs.dbk:2217
+#: pkgs.dbk:2220

 msgid ""
 "Collaborative maintenance is a term describing the sharing of Debian package "
 "maintenance duties by several people.  This collaboration is almost always a "
 "good idea, since it generally results in higher quality and faster bug fix "
 "turnaround times.  It is strongly recommended that packages with a priority "
 msgid ""
 "Collaborative maintenance is a term describing the sharing of Debian package "
 "maintenance duties by several people.  This collaboration is almost always a "
 "good idea, since it generally results in higher quality and faster bug fix "
 "turnaround times.  It is strongly recommended that packages with a priority "

-"of <literal>Standard</literal> or which are part of the base set have "
+"of <literal>standard</literal> or which are part of the base set have "

 "co-maintainers."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
 "co-maintainers."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:2225
+#: pkgs.dbk:2228

 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 "


@@ -2926,24 +2937,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><para>

-#: pkgs.dbk:2233
+#: pkgs.dbk:2236

 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>
 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:2239
+#: pkgs.dbk:2242

 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 "

-"control system, such as <command>CVS</command> or "
-"<command>Subversion</command>.  Alioth (see <xref linkend=\"alioth\"/>) "
+"control system, such as <literal>CVS</literal> or "
+"<literal>Subversion</literal>.  Alioth (see <xref linkend=\"alioth\"/>) "

 "provides such tools, amongst others."
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 "provides such tools, amongst others."
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2247
+#: pkgs.dbk:2250

 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 "


@@ -2951,7 +2962,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><screen>
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><screen>

-#: pkgs.dbk:2252
+#: pkgs.dbk:2255

 #, no-wrap
 msgid ""
 "Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex "
 #, no-wrap
 msgid ""
 "Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex "


@@ -2959,64 +2970,66 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2257
+#: pkgs.dbk:2260

 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>
 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:2263
+#: pkgs.dbk:2266

 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 "

-"developers.  In that case, the Maintainer and Uploaders field of each "
-"package must be managed with care.  It is recommended to choose between one "
-"of the two following schemes:"
+"developers.  In that case, the <literal>Maintainer</literal> and "
+"<literal>Uploaders</literal> field of each package must be managed with "
+"care.  It is recommended to choose between one of the two following schemes:"

 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>

-#: pkgs.dbk:2272
+#: pkgs.dbk:2275

 msgid ""
 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."
+"Put the team member mainly responsible for the package in the "
+"<literal>Maintainer</literal> field.  In the <literal>Uploaders</literal>, "
+"put the mailing list address, and the team members who care for the package."

 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>

-#: pkgs.dbk:2279
+#: pkgs.dbk:2282

 msgid ""
 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 "
-"must make sure the mailing list accept bug reports without any human "
-"interaction (like moderation for non-subscribers)."
+"Put the mailing list address in the <literal>Maintainer</literal> field.  In "
+"the <literal>Uploaders</literal> field, put the team members who care for "
+"the package.  In this case, you must make sure the mailing list accept bug "
+"reports without any human interaction (like moderation for non-subscribers)."

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

-#: pkgs.dbk:2288
+#: pkgs.dbk:2291

 msgid ""
 "In any case, it is a bad idea to automatically put all team members in the "
 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 "
-"<xref linkend=\"ddpo\"/>) with packages one doesn't really care for, and "
-"creates a false sense of good maintenance. For the same reason, team members "
-"do not need to add themselves to the Uploaders field just because they are "
-"uploading the package once, they can do a “Team upload” (see <xref "
+"<literal>Uploaders</literal> field. It clutters the Developer's Package "
+"Overview listing (see <xref linkend=\"ddpo\"/>) with packages one doesn't "
+"really care for, and creates a false sense of good maintenance. For the same "
+"reason, team members do not need to add themselves to the "
+"<literal>Uploaders</literal> field just because they are uploading the "
+"package once, they can do a “Team upload” (see <xref "

 "linkend=\"nmu-team-upload\"/>). Conversely, it it a bad idea to keep a "
 "linkend=\"nmu-team-upload\"/>). Conversely, it it a bad idea to keep a "

-"package with only the mailing list address as a Maintainer and no Uploaders."
+"package with only the mailing list address as a "
+"<literal>Maintainer</literal> and no <literal>Uploaders</literal>."

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

-#: pkgs.dbk:2301
+#: pkgs.dbk:2304

 msgid "The testing distribution"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgid "The testing distribution"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2303
+#: pkgs.dbk:2306

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

-#: pkgs.dbk:2305
+#: pkgs.dbk:2308

 msgid ""
 "Packages are usually installed into the <literal>testing</literal> "
 "distribution after they have undergone some degree of "
 msgid ""
 "Packages are usually installed into the <literal>testing</literal> "
 "distribution after they have undergone some degree of "


@@ -3024,22 +3037,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2310
+#: pkgs.dbk:2313

 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 "

-"release-critical bugs at the time they're installed into <literal>testing "
-"</literal>.  This way, <literal>testing</literal> should always be close to "
-"being a release candidate.  Please see below for details."
+"release-critical bugs at the time they're installed into "
+"<literal>testing</literal>.  This way, <literal>testing</literal> should "
+"always be close to being a release candidate.  Please see below for details."

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

-#: pkgs.dbk:2319
+#: pkgs.dbk:2322

 msgid "Updates from unstable"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "Updates from unstable"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2321
+#: pkgs.dbk:2324

 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 "


@@ -3050,14 +3063,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2329
+#: pkgs.dbk:2332

 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>
 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:2335
+#: pkgs.dbk:2338

 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 "


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

-#: pkgs.dbk:2345
+#: pkgs.dbk:2348

 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 "


@@ -3076,31 +3089,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2352
+#: pkgs.dbk:2355

 msgid ""
 "It must be available on all architectures on which it has previously been "
 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;"
+"built in <literal>unstable</literal>. <link linkend=\"dak-ls\">dak ls</link> "
+"may be of interest to check that information;"

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

-#: pkgs.dbk:2359
+#: pkgs.dbk:2362

 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>
 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:2365
+#: pkgs.dbk:2368

 msgid ""
 "The packages on which it depends must either be available in "
 "<literal>testing</literal> or they must be accepted into "
 "<literal>testing</literal> at the same time (and they will be if they "
 msgid ""
 "The packages on which it depends must either be available in "
 "<literal>testing</literal> or they must be accepted into "
 "<literal>testing</literal> at the same time (and they will be if they "

-"fulfill all the necessary criteria);"
+"fulfill all the necessary criteria)."

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

-#: pkgs.dbk:2373
+#: pkgs.dbk:2376

 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 "


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

-#: pkgs.dbk:2384
+#: pkgs.dbk:2387

 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 "


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

-#: pkgs.dbk:2391
+#: pkgs.dbk:2394

 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 "


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

-#: pkgs.dbk:2396
+#: pkgs.dbk:2399

 msgid ""
 "Some further dependency analysis is shown on <ulink "
 "url=\"http://release.debian.org/migration/\"></ulink> — but be warned, this "
 msgid ""
 "Some further dependency analysis is shown on <ulink "
 "url=\"http://release.debian.org/migration/\"></ulink> — but be warned, this "


@@ -3139,13 +3152,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2401
-msgid "out-of-date"
+#: pkgs.dbk:2404
+msgid "Out-of-date"

 msgstr ""
 
 #.  FIXME: better rename this file than document rampant professionalism? 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #.  FIXME: better rename this file than document rampant professionalism? 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2404
+#: pkgs.dbk:2407

 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 "


@@ -3157,68 +3170,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2412
+#: pkgs.dbk:2415

 msgid "Consider this example:"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2419 pkgs.dbk:2452
+#: pkgs.dbk:2422 pkgs.dbk:2455

 msgid "alpha"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2420 pkgs.dbk:2453
+#: pkgs.dbk:2423 pkgs.dbk:2456

 msgid "arm"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2425 pkgs.dbk:2459 pkgs.dbk:2521
+#: pkgs.dbk:2428 pkgs.dbk:2462 pkgs.dbk:2524

 msgid "testing"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2426 pkgs.dbk:2431 pkgs.dbk:2460 pkgs.dbk:2461 pkgs.dbk:2468
+#: pkgs.dbk:2429 pkgs.dbk:2434 pkgs.dbk:2463 pkgs.dbk:2464 pkgs.dbk:2471

 msgid "1"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2427 pkgs.dbk:2462 pkgs.dbk:2467
+#: pkgs.dbk:2430 pkgs.dbk:2465 pkgs.dbk:2470

 msgid "-"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2430 pkgs.dbk:2465 pkgs.dbk:2522
+#: pkgs.dbk:2433 pkgs.dbk:2468 pkgs.dbk:2525

 msgid "unstable"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2432 pkgs.dbk:2466
+#: pkgs.dbk:2435 pkgs.dbk:2469

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

-#: pkgs.dbk:2438
+#: pkgs.dbk:2441

 msgid ""
 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 "
-"all, the package is still out of date on <literal>alpha</literal>, and will "
-"not propagate to testing."
+"The package is out of date on <literal>alpha</literal> in "
+"<literal>unstable</literal>, and will not go to "
+"<literal>testing</literal>. Removing the package would not help at all, the "
+"package is still out of date on <literal>alpha</literal>, and will not "
+"propagate to <literal>testing</literal>."

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

-#: pkgs.dbk:2444
+#: pkgs.dbk:2447

 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>
 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:2454
+#: pkgs.dbk:2457

 msgid "hurd-i386"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgid "hurd-i386"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2474
+#: pkgs.dbk:2477

 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> "


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

-#: pkgs.dbk:2479
+#: pkgs.dbk:2482

 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 "


@@ -3234,12 +3248,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2486
+#: pkgs.dbk:2489

 msgid "Removals from testing"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgid "Removals from testing"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2488
+#: pkgs.dbk:2491

 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 "


@@ -3249,15 +3263,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2495
+#: pkgs.dbk:2498

 msgid ""
 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)."
+"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>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2500
+#: pkgs.dbk:2503

 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 "


@@ -3265,12 +3279,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2507
-msgid "circular dependencies"
+#: pkgs.dbk:2510
+msgid "Circular dependencies"

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

-#: pkgs.dbk:2509
+#: pkgs.dbk:2512

 msgid ""
 "A situation which is not handled very well by britney is if package "
 "<literal>a</literal> depends on the new version of package "
 msgid ""
 "A situation which is not handled very well by britney is if package "
 "<literal>a</literal> depends on the new version of package "


@@ -3278,49 +3292,49 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2514
+#: pkgs.dbk:2517

 msgid "An example of this is:"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2527
+#: pkgs.dbk:2530

 msgid "a"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2528
+#: pkgs.dbk:2531

 msgid "1; depends: b=1"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2529
+#: pkgs.dbk:2532

 msgid "2; depends: b=2"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2532
+#: pkgs.dbk:2535

 msgid "b"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2533
+#: pkgs.dbk:2536

 msgid "1; depends: a=1"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2534
+#: pkgs.dbk:2537

 msgid "2; depends: a=2"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgid "2; depends: a=2"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2540
+#: pkgs.dbk:2543

 msgid ""
 "Neither package <literal>a</literal> nor package <literal>b</literal> is "
 "considered for update."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 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:2544
+#: pkgs.dbk:2547

 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 "


@@ -3328,46 +3342,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2551
-msgid "influence of package in testing"
+#: pkgs.dbk:2554
+msgid "Influence of package in testing"

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

-#: pkgs.dbk:2553
+#: pkgs.dbk:2556

 msgid ""
 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 "
-"</literal> to <literal>testing</literal>, with two exceptions: If the "
-"RC-bugginess of the package goes down, it may go in even if it is still "
-"RC-buggy.  The second exception is if the version of the package in "
-"<literal> testing</literal> is out of sync on the different arches: Then any "
-"arch might just upgrade to the version of the source package; however, this "
-"can happen only if the package was previously forced through, the arch is in "
-"fuckedarches, or there was no binary package of that arch present in "
-"<literal>unstable </literal> at all during the <literal>testing</literal> "
-"migration."
+"Generally, there is nothing that the status of a package in "
+"<literal>testing</literal> means for transition of the next version from "
+"<literal>unstable</literal> to <literal>testing</literal>, with two "
+"exceptions: If the RC-bugginess of the package goes down, it may go in even "
+"if it is still RC-buggy.  The second exception is if the version of the "
+"package in <literal>testing</literal> is out of sync on the different "
+"arches: Then any arch might just upgrade to the version of the source "
+"package; however, this can happen only if the package was previously forced "
+"through, the arch is in fuckedarches, or there was no binary package of that "
+"arch present in <literal>unstable</literal> at all during the "
+"<literal>testing</literal> migration."

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

-#: pkgs.dbk:2565
+#: pkgs.dbk:2568

 msgid ""
 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."
+"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>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2572
-msgid "details"
+#: pkgs.dbk:2575
+msgid "Details"

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

-#: pkgs.dbk:2574
+#: pkgs.dbk:2577

 msgid "If you are interested in details, this is how britney works:"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2577
+#: pkgs.dbk:2580

 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 "


@@ -3380,52 +3394,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2586
+#: pkgs.dbk:2589

 msgid ""
 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 "
-"valid candidate to the testing distribution. If the number of uninstallable "
-"packages in <literal>testing</literal> doesn't increase, the package is "
-"accepted. From that point on, the accepted package is considered to be part "
-"of <literal>testing</literal>, such that all subsequent installability tests "
-"include this package.  Hints from the release team are processed before or "
-"after this main run, depending on the exact type."
+"Now, the more complex part happens: Britney tries to update "
+"<literal>testing</literal> with the valid candidates. For that, britney "
+"tries to add each valid candidate to the testing distribution. If the number "
+"of uninstallable packages in <literal>testing</literal> doesn't increase, "
+"the package is accepted. From that point on, the accepted package is "
+"considered to be part of <literal>testing</literal>, such that all "
+"subsequent installability tests include this package.  Hints from the "
+"release team are processed before or after this main run, depending on the "
+"exact type."

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

-#: pkgs.dbk:2596
+#: pkgs.dbk:2599

 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/testing/update_out</filename> to see a setup with a "
 "smaller packages file).  Via web, it's at <ulink "
 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/testing/update_out</filename> to see a setup with a "
 "smaller packages file).  Via web, it's at <ulink "

-"url=\"http://&ftp-master-host;/testing/update_out_code/\"></ulink>"
+"url=\"http://&ftp-master-host;/testing/update_out_code/\"></ulink>."

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

-#: pkgs.dbk:2603
+#: pkgs.dbk:2606

 msgid ""
 "The hints are available via <ulink "
 "url=\"http://&ftp-master-host;/testing/hints/\"></ulink>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 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:2611
+#: pkgs.dbk:2614

 msgid "Direct updates to testing"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "Direct updates to testing"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2613
+#: pkgs.dbk:2616

 msgid ""
 "The <literal>testing</literal> distribution is fed with packages from "
 "<literal>unstable</literal> according to the rules explained above.  "
 "However, in some cases, it is necessary to upload packages built only for "
 msgid ""
 "The <literal>testing</literal> distribution is fed with packages from "
 "<literal>unstable</literal> according to the rules explained above.  "
 "However, in some cases, it is necessary to upload packages built only for "

-"<literal> testing</literal>.  For that, you may want to upload to <literal> "
-"testing-proposed-updates</literal>."
+"<literal>testing</literal>.  For that, you may want to upload to "
+"<literal>testing-proposed-updates</literal>."

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

-#: pkgs.dbk:2620
+#: pkgs.dbk:2623

 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 "


@@ -3435,12 +3450,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2627
+#: pkgs.dbk:2630

 msgid ""
 "You should not upload to <literal>testing-proposed-updates</literal> when "
 "you can update your packages through <literal>unstable</literal>.  If you "
 "can't (for example because you have a newer development version in "
 msgid ""
 "You should not upload to <literal>testing-proposed-updates</literal> when "
 "you can update your packages through <literal>unstable</literal>.  If you "
 "can't (for example because you have a newer development version in "

-"<literal>unstable </literal>), you may use this facility, but it is "
+"<literal>unstable</literal>), you may use this facility, but it is "

 "recommended that you ask for authorization from the release manager first.  "
 "Even if a package is frozen, updates through <literal>unstable</literal> are "
 "possible, if the upload via <literal>unstable</literal> does not pull in any "
 "recommended that you ask for authorization from the release manager first.  "
 "Even if a package is frozen, updates through <literal>unstable</literal> are "
 "possible, if the upload via <literal>unstable</literal> does not pull in any "


@@ -3448,54 +3463,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2636
+#: pkgs.dbk:2639

 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 "

-"<literal>1.2sarge1</literal> for the first upload through "
+"<literal>1.2squeeze1</literal> for the first upload through "

 "<literal>testing-proposed-updates</literal> of package version "
 "<literal>1.2</literal>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 "<literal>testing-proposed-updates</literal> of package version "
 "<literal>1.2</literal>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2643
+#: pkgs.dbk:2646

 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>
 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:2648
+#: pkgs.dbk:2651

 msgid ""
 "Make sure that your package really needs to go through "
 msgid ""
 "Make sure that your package really needs to go through "

-"<literal>testing-proposed-updates</literal>, and can't go through <literal> "
-"unstable</literal>;"
+"<literal>testing-proposed-updates</literal>, and can't go through "
+"<literal>unstable</literal>;"

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

-#: pkgs.dbk:2655
+#: pkgs.dbk:2658

 msgid "Make sure that you included only the minimal amount of changes;"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2660
+#: pkgs.dbk:2663

 msgid "Make sure that you included an appropriate explanation in the changelog;"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2665
+#: pkgs.dbk:2668

 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>
 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:2671
+#: pkgs.dbk:2674

 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>
 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:2677
+#: pkgs.dbk:2680

 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>, "


@@ -3503,24 +3518,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2684
+#: pkgs.dbk:2687

 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>
 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:2692
+#: pkgs.dbk:2695

 msgid "Frequently asked questions"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
 msgid "Frequently asked questions"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2694
+#: pkgs.dbk:2697

 msgid "What are release-critical bugs, and how do they get counted?"
 msgstr ""
 
 #. 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>

-#: pkgs.dbk:2696
+#: pkgs.dbk:2699

 msgid ""
 "All bugs of some higher severities are by default considered "
 "release-critical; currently, these are <literal>critical</literal>, "
 msgid ""
 "All bugs of some higher severities are by default considered "
 "release-critical; currently, these are <literal>critical</literal>, "


@@ -3528,46 +3543,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2701
+#: pkgs.dbk:2704

 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 "
 "general, if a package has open release-critical bugs filed on it, it won't "
 "get into <literal>testing</literal>, and consequently won't be released 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 "
 "general, if a package has open release-critical bugs filed on it, it won't "
 "get into <literal>testing</literal>, and consequently won't be released in "

-"<literal> stable</literal>."
+"<literal>stable</literal>."

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

-#: pkgs.dbk:2708
+#: pkgs.dbk:2711

 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 "

-"<replaceable>package</replaceable>/<replaceable>version </replaceable> "
+"<replaceable>package</replaceable>/<replaceable>version</replaceable> "

 "combinations that are available in unstable for a release architecture. The "
 "<literal>testing</literal> bug count is defined analogously."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
 "combinations that are available in unstable for a release architecture. The "
 "<literal>testing</literal> bug count is defined analogously."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2716
+#: pkgs.dbk:2719

 msgid ""
 "How could installing a package into <literal>testing</literal> possibly "
 "break other packages?"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 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:2719
+#: pkgs.dbk:2722

 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 "
 "the source package <literal>acmefoo</literal> is installed into "
 "<literal>testing</literal>, along with its binary packages "
 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 "
 "the source package <literal>acmefoo</literal> is installed into "
 "<literal>testing</literal>, along with its binary packages "

-"<literal>acme-foo-bin</literal>, <literal> acme-bar-bin</literal>, "
-"<literal>libacme-foo1</literal> and <literal> libacme-foo-dev</literal>, the "
+"<literal>acme-foo-bin</literal>, <literal>acme-bar-bin</literal>, "
+"<literal>libacme-foo1</literal> and <literal>libacme-foo-dev</literal>, the "

 "old version is removed."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
 "old version is removed."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2727
+#: pkgs.dbk:2730

 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 "


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

-#: pkgs.dbk:2733
+#: pkgs.dbk:2736

 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, "


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

-#: pkgs.dbk:2739
+#: pkgs.dbk:2742

 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 "


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

-#: pkgs.dbk:2750
+#: pkgs.dbk:2753

 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 8bd89f43893b9a2d1a1595dfa592268b4d7ae0cc..155044c97c048882a1b06831cdb5eb223d3b1627 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: 2010-05-06 17:34-0400\n"
+"POT-Creation-Date: 2010-05-31 10:15-0400\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"


@@ -1509,25 +1509,37 @@ msgid ""
 "(for example Ubuntu)."
 msgstr ""
 
 "(for example Ubuntu)."
 msgstr ""
 

+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1141
+msgid "<literal>derivatives-bugs</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1144
+msgid ""
+"Bugs reports and comments from derivative distributions (for example "
+"Ubuntu)."
+msgstr ""
+

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

-#: resources.dbk:1142
+#: resources.dbk:1150

 msgid "The PTS email interface"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "The PTS email interface"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1144
+#: resources.dbk:1152

 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>
 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:1149
+#: resources.dbk:1157

 msgid "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1152
+#: resources.dbk:1160

 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 "


@@ -1538,12 +1550,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1162
+#: resources.dbk:1170

 msgid "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1165
+#: resources.dbk:1173

 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 "


@@ -1551,36 +1563,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1172
+#: resources.dbk:1180

 msgid "<literal>unsubscribeall [&lt;email&gt;]</literal>"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1175
+#: resources.dbk:1183

 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>
 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:1181
+#: resources.dbk:1189

 msgid "<literal>which [&lt;email&gt;]</literal>"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1184
+#: resources.dbk:1192

 msgid ""
 "Lists all subscriptions for the sender or the email address optionally "
 "specified."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 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:1190
+#: resources.dbk:1198

 msgid "<literal>keyword [&lt;email&gt;]</literal>"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1193
+#: resources.dbk:1201

 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 "


@@ -1588,98 +1600,105 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1200
+#: resources.dbk:1208

 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>
 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:1205
+#: resources.dbk:1213

 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>
 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:1211
+#: resources.dbk:1219

 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>
 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:1217
+#: resources.dbk:1225

 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>
 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:1223
+#: resources.dbk:1231

 msgid "<literal>cvs</literal>: notification of VCS commits"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1228
+#: resources.dbk:1236

 msgid "<literal>ddtp</literal>: translations of descriptions and debconf templates"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1233
+#: resources.dbk:1241

 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>
 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:1239
+#: resources.dbk:1247
+msgid ""
+"<literal>derivatives-bugs</literal>: bugs reports and comments from "
+"derivative distributions"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1253

 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>
 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:1245
+#: resources.dbk:1259

 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>
 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:1251
+#: resources.dbk:1265

 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>
 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:1257
+#: resources.dbk:1271

 msgid "<literal>buildd</literal>: build failures notifications from build daemons"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid "<literal>buildd</literal>: build failures notifications from build daemons"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1262
+#: resources.dbk:1276

 msgid ""
 "<literal>default</literal>: all the other mails (those which aren't "
 "automatic)"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 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:1269
+#: resources.dbk:1283

 msgid "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1272
+#: resources.dbk:1286

 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>
 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:1278
+#: resources.dbk:1292

 msgid "<literal>keyword [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</literal>"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1281
+#: resources.dbk:1295

 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 "


@@ -1687,14 +1706,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1288
+#: resources.dbk:1302

 msgid ""
 "<literal>keywordall [&lt;email&gt;] {+|-|=} &lt;list of "
 "keywords&gt;</literal>"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 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:1291
+#: resources.dbk:1305

 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 "


@@ -1702,31 +1721,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1298
+#: resources.dbk:1312

 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>
 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:1301
+#: resources.dbk:1315

 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>
 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:1307
+#: resources.dbk:1321

 msgid "<literal>quit | thanks | --</literal>"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1310
+#: resources.dbk:1324

 msgid "Stops processing commands.  All following lines are ignored by the bot."
 msgstr ""
 
 #. 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>

-#: resources.dbk:1316
+#: resources.dbk:1330

 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 "


@@ -1735,12 +1754,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:1324
+#: resources.dbk:1338

 msgid "Filtering PTS mails"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "Filtering PTS mails"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1326
+#: resources.dbk:1340

 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>.  "


@@ -1751,14 +1770,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1334
+#: resources.dbk:1348

 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:1338
+#: resources.dbk:1352

 #, no-wrap
 msgid ""
 "X-Loop: dpkg@&pts-host;\n"
 #, no-wrap
 msgid ""
 "X-Loop: dpkg@&pts-host;\n"


@@ -1768,12 +1787,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:1346
+#: resources.dbk:1360

 msgid "Forwarding VCS commits in the PTS"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "Forwarding VCS commits in the PTS"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1348
+#: resources.dbk:1362

 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 "


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

-#: resources.dbk:1354
+#: resources.dbk:1368

 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 "


@@ -1794,19 +1813,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1363
+#: resources.dbk:1377

 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>
 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:1369
+#: resources.dbk:1383

 msgid "The PTS web interface"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "The PTS web interface"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1371
+#: resources.dbk:1385

 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 "


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

-#: resources.dbk:1381
+#: resources.dbk:1395

 msgid ""
 "You can jump directly to the web page concerning a specific source package "
 "with a URL like "
 msgid ""
 "You can jump directly to the web page concerning a specific source package "
 "with a URL like "


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

-#: resources.dbk:1386
+#: resources.dbk:1400

 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 "


@@ -1836,81 +1855,81 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1392
+#: resources.dbk:1406

 msgid "Static news items can be used to indicate:"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1397
+#: resources.dbk:1411

 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>
 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:1403
+#: resources.dbk:1417

 msgid "a link to the upstream web site"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1408
+#: resources.dbk:1422

 msgid "a link to the upstream bug tracker"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1413
+#: resources.dbk:1427

 msgid "the existence of an IRC channel dedicated to the software"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1418
+#: resources.dbk:1432

 msgid ""
 "any other available resource that could be useful in the maintenance of the "
 "package"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 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:1424
+#: resources.dbk:1438

 msgid "Usual news items may be used to announce that:"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1429
+#: resources.dbk:1443

 msgid "beta packages are available for testing"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1434
+#: resources.dbk:1448

 msgid "final packages are expected for next week"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1439
+#: resources.dbk:1453

 msgid "the packaging is about to be redone from scratch"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1444
+#: resources.dbk:1458

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

-#: resources.dbk:1449
+#: resources.dbk:1463

 msgid "the maintainer is on vacation (if they wish to publish this information)"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1454
+#: resources.dbk:1468

 msgid "a NMU is being worked on"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1459
+#: resources.dbk:1473

 msgid "something important will affect the package"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "something important will affect the package"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1464
+#: resources.dbk:1478

 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 "


@@ -1924,15 +1943,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1475
+#: resources.dbk:1489

 msgid ""
 "Here are a few examples of valid mails used to generate news items 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 "
+"PTS.  The first one adds a link to the viewsvn interface of debian-cd in the "

 "Static information section:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
 "Static information section:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>

-#: resources.dbk:1480
+#: resources.dbk:1494

 #, no-wrap
 msgid ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
 #, no-wrap
 msgid ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"


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

-#: resources.dbk:1488
+#: resources.dbk:1502

 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 "


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

-#: resources.dbk:1493
+#: resources.dbk:1507

 #, no-wrap
 msgid ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
 #, no-wrap
 msgid ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"


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

-#: resources.dbk:1506
+#: resources.dbk:1520

 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 "


@@ -1979,12 +1998,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:1516
+#: resources.dbk:1530

 msgid "Developer's packages overview"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
 msgid "Developer's packages overview"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1518
+#: resources.dbk:1532

 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 "


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

-#: resources.dbk:1527
+#: resources.dbk:1541

 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 "


@@ -2004,12 +2023,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:1534
+#: resources.dbk:1548

 msgid "Debian's FusionForge installation: Alioth"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
 msgid "Debian's FusionForge installation: Alioth"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1536
+#: resources.dbk:1550

 msgid ""
 "Alioth is a Debian service based on a slightly modified version of the "
 "FusionForge software (which evolved from SourceForge and GForge). This "
 msgid ""
 "Alioth is a Debian service based on a slightly modified version of the "
 "FusionForge software (which evolved from SourceForge and GForge). This "


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

-#: resources.dbk:1543
+#: resources.dbk:1557

 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 "


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

-#: resources.dbk:1550
+#: resources.dbk:1564

 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 "


@@ -2037,42 +2056,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
 msgstr ""
 
 #. type: Content of: <chapter><section><para>

-#: resources.dbk:1555
+#: resources.dbk:1569

 msgid "For more information please visit the following links:"
 msgstr ""
 
 #. 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>

-#: resources.dbk:1558
+#: resources.dbk:1572

 msgid "<ulink url=\"&url-alioth-wiki;\" />"
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"&url-alioth-wiki;\" />"
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:1559
+#: resources.dbk:1573

 msgid "<ulink url=\"&url-alioth-faq;\" />"
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"&url-alioth-faq;\" />"
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:1560
+#: resources.dbk:1574

 msgid "<ulink url=\"&url-alioth-pkg;\" />"
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"&url-alioth-pkg;\" />"
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:1561
+#: resources.dbk:1575

 msgid "<ulink url=\"&url-alioth;\" />"
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
 msgid "<ulink url=\"&url-alioth;\" />"
 msgstr ""
 
 #. type: Content of: <chapter><section><title>

-#: resources.dbk:1566
+#: resources.dbk:1580

 msgid "Goodies for Developers"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgid "Goodies for Developers"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:1568
+#: resources.dbk:1582

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

-#: resources.dbk:1570
+#: resources.dbk:1584

 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 "


@@ -2081,12 +2100,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>

-#: resources.dbk:1577
+#: resources.dbk:1591

 msgid "Gandi.net Hosting Discount"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
 msgid "Gandi.net Hosting Discount"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>

-#: resources.dbk:1579
+#: resources.dbk:1593

 msgid ""
 "As of November 2008, Gandi.net offers a discount rate on their VPS hosting "
 "for Debian Developers.  See <ulink "
 msgid ""
 "As of November 2008, Gandi.net offers a discount rate on their VPS hosting "
 "for Debian Developers.  See <ulink "