Refresh French PO files

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

diff --git a/po4a/fr/best-pkging-practices.po b/po4a/fr/best-pkging-practices.po
index 94dd2af8f37d36a4ff721e96db784e345e20bc4f..0610b7e879f79c3e10870b2c0bc3a0a401fbf70f 100644 (file)
--- a/po4a/fr/best-pkging-practices.po
+++ b/po4a/fr/best-pkging-practices.po
@@ -1,20 +1,20 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) 2007 Free Software Foundation, Inc.
-# <>, 2007.
-# , fuzzy
-# 
-# 
+# Translation of Debian Developers Reference to French
+# Copyright (C) 2008 Christian Perrier <bubulle@debian.org>
+# This file is distributed under the same license as the developers-reference package.
+#
+# Christian Perrier <bubulle@debian.org>, 2008.

 msgid ""
 msgstr ""
 msgid ""
 msgstr ""

-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"

 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-07-01 21:16+0000\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-07-01 21:16+0000\n"

-"PO-Revision-Date: 2007-07-01 23:09+0000\n"
-"Last-Translator:  <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2008-08-06 17:27+0200\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: "
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"

 
 # type: Content of: <chapter><title>
 #: best-pkging-practices.dbk:7
 
 # type: Content of: <chapter><title>
 #: best-pkging-practices.dbk:7


@@ -32,6 +32,8 @@ msgid ""
 "tools, tools which help you, the Debian maintainer, create and maintain "
 "excellent packages."
 msgstr ""
 "tools, tools which help you, the Debian maintainer, create and maintain "
 "excellent packages."
 msgstr ""

+"La qualité de Debian est largement due à la <ulink url=\"&url-debian-policy;"
+"\">Charte Debian</ulink> qui définit les prérequis explicites de base que tous les paquets Debian doivent satisfaire. Cependant, il existe également une expérience générale partagée qui va bien au delà de la Charte Debian et constitue une somme d'années d'expérience dans la construction de paquets. De nombreux contributeurs talentueux ont créé d'excellents outils qui peuvent vous aider, en tant que mainteneur Debian, à créer et maintenir des paquets d'excellente qualité."

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


@@ -40,7 +42,7 @@ msgid ""
 "recommendations are merely that, and are not requirements or policy.  These "
 "are just some subjective hints, advice and pointers collected from Debian "
 "developers.  Feel free to pick and choose whatever works best for you."
 "recommendations are merely that, and are not requirements or policy.  These "
 "are just some subjective hints, advice and pointers collected from Debian "
 "developers.  Feel free to pick and choose whatever works best for you."

-msgstr ""
+msgstr "Ce chapitre rassemble les meilleures pratiques pou rles mainteneurs Debian. La majorité de son contenu est constitué de recommandations plus que d'obligations. Il s'agit essentiellement d'informations subjectives, d'avis et de pointeurs, rassemblés par les développeurs Debian. Il est conseillé d'y choisir ce qui vous convient le mieux."

 
 # type: Content of: <chapter><section><title>
 #: best-pkging-practices.dbk:24
 
 # type: Content of: <chapter><section><title>
 #: best-pkging-practices.dbk:24


@@ -54,12 +56,12 @@ msgid ""
 "file.  Since <filename>debian/rules</filename> controls the build process "
 "and selects the files which go into the package (directly or indirectly), "
 "it's usually the file maintainers spend the most time on."
 "file.  Since <filename>debian/rules</filename> controls the build process "
 "and selects the files which go into the package (directly or indirectly), "
 "it's usually the file maintainers spend the most time on."

-msgstr ""
+msgstr "Les recommandations qui suivent s'appliquent au fichier <filename>debian/rules</filename>. Comme ce fichier contrôle le processus de construction des paquets et fait le choix des fichiers qui entreront dans ce paquet, directement ou indirectement, il s'agit du fichier dont les mainteneurs s'occupent généralement le plus."

 
 # type: Content of: <chapter><section><section><title>
 #: best-pkging-practices.dbk:32
 msgid "Helper scripts"
 
 # type: Content of: <chapter><section><section><title>
 #: best-pkging-practices.dbk:32
 msgid "Helper scripts"

-msgstr ""
+msgstr "Scripts d'assistance"

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


@@ -75,6 +77,8 @@ msgid ""
 "Also, supposing the menu directory changed, every package would have to be "
 "changed."
 msgstr ""
 "Also, supposing the menu directory changed, every package would have to be "
 "changed."
 msgstr ""

+"La justification à l'utilisation de scripts d'assistance dans <filename>debian/rules</filename> est de permettre aux mainteneurs de définir puis utiliser une logique commune pour de nombreux paquets. Si on prend par exemple l'installaiton d'entrées de menu, il est nécessaire de placer le fichier dans <filename>/usr/lib/menu</filename> (ou <filename>/"
+"usr/lib/menu</filename> des fichiers de menu exécutables, s'il en existe), puis d'ajouter des commandes aux scripts des mainteneurs pour enregistrer ou désenregistrer les entrées de menu. Comme cette action est commune à de très nombreux paquets, pourquoi faudrait-il que chaque mainteneur ait à réécrire ses propres méthodes pour cela, bogues compris ? De plus, si jamais le répertoire des menus venait à changer, chaque paquet devrait être modifié."

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


@@ -84,7 +88,7 @@ msgid ""
 "details.  Changes in policy can be made in the helper script; then packages "
 "just need to be rebuilt with the new version of the helper and no other "
 "changes."
 "details.  Changes in policy can be made in the helper script; then packages "
 "just need to be rebuilt with the new version of the helper and no other "
 "changes."

-msgstr ""
+msgstr "Les scripts d'assistance s'occupent de ce type de tâche. À condition d'être compatible avec les conventions utilisées par le script d'assistance, celui-ci s'occupe de tous les détails. Les modifications dans la charte peuvent alors être implémentées dans le script d'assistance et les paquets n'ont plus qu'à être reconstruits sans autre modification."

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


@@ -102,6 +106,10 @@ msgid ""
 "helper scripts, where useful, in conjunction with hand-crafted commands in "
 "<filename>debian/rules</filename>."
 msgstr ""
 "helper scripts, where useful, in conjunction with hand-crafted commands in "
 "<filename>debian/rules</filename>."
 msgstr ""

+"<xref linkend=\"tools\"/> contient un certain nombre d'assistants variés. Le système le plus répandu et (selon nous) le plus adapté est <systemitem role=\"package"
+"\">debhelper</systemitem>. Des systèmes antérieurs, tels que <systemitem "
+"role=\"package\">debmake</systemitem>, étaient monolithiques ; ils ne permettaient pas de choisir quelle partie de l'assistant serait utile, en obligeant à se servir de l'ensemble de l'assistant. A contrario, <systemitem role=\"package\">debhelper</"
+"systemitem> est constitué d'un grand nombre de petits programmes <command>dh_*</command> différents. Par exemple, <command>dh_installman</command> installe et compresse les pages de manuel, <command>dh_installmenu</command> istalle les fichiers de menu, et ainsi de suite. En conséquence, il offre la possibilité d'utiliser certains des scripts d'assistance tout en conservant des commandes manuelles dans <filename>debian/rules</filename>."

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


@@ -118,6 +126,11 @@ msgid ""
 "helper, you do need to take the time to learn to use that helper, to learn "
 "its expectations and behavior."
 msgstr ""
 "helper, you do need to take the time to learn to use that helper, to learn "
 "its expectations and behavior."
 msgstr ""

+"Pour démarrer avec <systemitem role=\"package\">debhelper</systemitem>, il est conseillé de lire "
+"<citerefentry> <refentrytitle>debhelper</refentrytitle> "
+"<manvolnum>1</manvolnum> </citerefentry> et de consulter les exemples fournis avec le paquet. <command>dh_make</command>, fourni avec le paquet <systemitem "
+"role=\"package\">dh-make</systemitem> (voir <xref linkend=\"dh-make\"/> ) peut être utilisé pour convertir un paquet source originel en paquet géré par <systemitem role="
+"\"package\">debhelper</systemitem>. Cette méthode rapide ne doit cependant pas se substituer à une compréhension individuelle des commandes <command>dh_*</command>. Si vous utilisez un assistant, vous devez prendre le temps de l'apprendre, pour comprendre ses besoins et son comportement."

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


@@ -502,8 +515,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #: best-pkging-practices.dbk:348
 
 # type: Content of: <chapter><section><section><para>
 #: best-pkging-practices.dbk:348

-msgid ""
-"If there is no home page for the software, this should naturally be left out."
+msgid "If there is no home page for the software, this should naturally be left out."

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


@@ -1236,8 +1248,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #: best-pkging-practices.dbk:851
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 #: best-pkging-practices.dbk:851

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

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


@@ -1328,8 +1339,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 #: best-pkging-practices.dbk:915
 
 # type: Content of: <chapter><section><section><section><section><para>
 #: best-pkging-practices.dbk:915

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

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


@@ -2237,7 +2247,7 @@ msgid ""
 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>

-#.  or similarly named 
+#.  or similarly named

 #: best-pkging-practices.dbk:1630
 msgid ""
 "As a special exception, if the omission of non-free files would lead to the "
 #: best-pkging-practices.dbk:1630
 msgid ""
 "As a special exception, if the omission of non-free files would lead to the "

diff --git a/po4a/fr/beyond-pkging.po b/po4a/fr/beyond-pkging.po
index 2d00dd6fceceac0abd06995394bc94fb0a818f0e..550db3fb9497498c6f4470127cc412e7aa2103ff 100644 (file)
--- a/po4a/fr/beyond-pkging.po
+++ b/po4a/fr/beyond-pkging.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.
 # , fuzzy
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.
 # , fuzzy

-# 
-# 
+#
+#

 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-07-01 21:16+0000\n"
+"POT-Creation-Date: 2008-08-08 11:36-0300\n"

 "PO-Revision-Date: 2007-07-01 23:09+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "PO-Revision-Date: 2007-07-01 23:09+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: "
+"Content-Transfer-Encoding: \n"

 
 # type: Content of: <chapter><title>
 #: beyond-pkging.dbk:7
 
 # type: Content of: <chapter><title>
 #: beyond-pkging.dbk:7


@@ -195,8 +195,8 @@ msgid ""
 "as many problems as possible.  They are announced on &email-debian-devel-"
 "announce; and the announcement explains which area will be the focus of the "
 "party: usually they focus on release critical bugs but it may happen that "
 "as many problems as possible.  They are announced on &email-debian-devel-"
 "announce; and the announcement explains which area will be the focus of the "
 "party: usually they focus on release critical bugs but it may happen that "

-"they decide to help finish a major upgrade (like a new perl version which "
-"requires recompilation of all the binary modules)."
+"they decide to help finish a major upgrade (like a new <command>perl</"
+"command> version which requires recompilation of all the binary modules)."

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


@@ -285,12 +285,13 @@ msgid ""
 "There is a simple system (the MIA database) in which information about "
 "maintainers who are deemed Missing In Action is recorded.  When a member of "
 "the QA group contacts an inactive maintainer or finds more information about "
 "There is a simple system (the MIA database) in which information about "
 "maintainers who are deemed Missing In Action is recorded.  When a member of "
 "the QA group contacts an inactive maintainer or finds more information about "

-"one, this is recorded in the MIA database.  This system is available in /org/"
-"qa.debian.org/mia on the host qa.debian.org, and can be queried with a tool "
-"known as <command>mia-query</command>.  Use <command>mia-query --help</"
-"command> to see how to query the database.  If you find that no information "
-"has been recorded about an inactive maintainer yet, or that you can add more "
-"information, you should generally proceed as follows."
+"one, this is recorded in the MIA database.  This system is available in "
+"<filename>/org/qa.debian.org/mia</filename> on the host <literal>qa.debian."
+"org </literal>, and can be queried with the <command>mia-query</command> "
+"tool.  Use <command>mia-query --help</command> to see how to query the "
+"database.  If you find that no information has been recorded about an "
+"inactive maintainer yet, or that you can add more information, you should "
+"generally proceed as follows."

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


@@ -314,15 +315,16 @@ msgstr ""
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #: beyond-pkging.dbk:214
 msgid ""
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #: beyond-pkging.dbk:214
 msgid ""

-"The echelon information available through the <ulink url=\"&url-debian-db;"
-"\">developers' LDAP database</ulink>, which indicates when the developer "
-"last posted to a Debian mailing list.  (This includes uploads via debian-*-"
-"changes lists.) Also, remember to check whether the maintainer is marked as "
-"on vacation in the database."
+"The <literal>echelon</literal> information available through the <ulink url="
+"\"&url-debian-db;\">developers' LDAP database</ulink>, which indicates when "
+"the developer last posted to a Debian mailing list.  (This includes mails "
+"about uploads distributed via the &email-debian-devel-changes; list.)  Also, "
+"remember to check whether the maintainer is marked as on vacation in the "
+"database."

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

-#: beyond-pkging.dbk:223
+#: beyond-pkging.dbk:224

 msgid ""
 "The number of packages this maintainer is responsible for, and the condition "
 "of those packages.  In particular, are there any RC bugs that have been open "
 msgid ""
 "The number of packages this maintainer is responsible for, and the condition "
 "of those packages.  In particular, are there any RC bugs that have been open "


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

-#: beyond-pkging.dbk:232
+#: beyond-pkging.dbk:233

 msgid ""
 "Is there any activity of the maintainer outside of Debian? For example, they "
 "might have posted something recently to non-Debian mailing lists or news "
 msgid ""
 "Is there any activity of the maintainer outside of Debian? For example, they "
 "might have posted something recently to non-Debian mailing lists or news "


@@ -340,18 +342,18 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: beyond-pkging.dbk:239
+#: beyond-pkging.dbk:240

 msgid ""
 "A bit of a problem are packages which were sponsored — the maintainer is not "
 msgid ""
 "A bit of a problem are packages which were sponsored — the maintainer is not "

-"an official Debian developer.  The echelon information is not available for "
-"sponsored people, for example, so you need to find and contact the Debian "
-"developer who has actually uploaded the package.  Given that they signed the "
-"package, they're responsible for the upload anyhow, and are likely to know "
-"what happened to the person they sponsored."
+"an official Debian developer.  The <literal>echelon</literal> information is "
+"not available for sponsored people, for example, so you need to find and "
+"contact the Debian developer who has actually uploaded the package.  Given "
+"that they signed the package, they're responsible for the upload anyhow, and "
+"are likely to know what happened to the person they sponsored."

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

-#: beyond-pkging.dbk:247
+#: beyond-pkging.dbk:248

 msgid ""
 "It is also allowed to post a query to &email-debian-devel;, asking if anyone "
 "is aware of the whereabouts of the missing maintainer.  Please Cc: the "
 msgid ""
 "It is also allowed to post a query to &email-debian-devel;, asking if anyone "
 "is aware of the whereabouts of the missing maintainer.  Please Cc: the "


@@ -359,7 +361,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: beyond-pkging.dbk:252
+#: beyond-pkging.dbk:253

 msgid ""
 "Once you have gathered all of this, you can contact &email-mia;.  People on "
 "this alias will use the information you provide in order to decide how to "
 msgid ""
 "Once you have gathered all of this, you can contact &email-mia;.  People on "
 "this alias will use the information you provide in order to decide how to "


@@ -370,7 +372,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: beyond-pkging.dbk:260
+#: beyond-pkging.dbk:261

 msgid ""
 "One last word: please remember to be polite.  We are all volunteers and "
 "cannot dedicate all of our time to Debian.  Also, you are not aware of the "
 msgid ""
 "One last word: please remember to be polite.  We are all volunteers and "
 "cannot dedicate all of our time to Debian.  Also, you are not aware of the "


@@ -381,7 +383,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: beyond-pkging.dbk:268
+#: beyond-pkging.dbk:269

 msgid ""
 "On the other hand, although we are volunteers, we do have a responsibility.  "
 "So you can stress the importance of the greater good — if a maintainer does "
 msgid ""
 "On the other hand, although we are volunteers, we do have a responsibility.  "
 "So you can stress the importance of the greater good — if a maintainer does "


@@ -390,20 +392,21 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: beyond-pkging.dbk:274
+#: beyond-pkging.dbk:275

 msgid ""
 "If you are interested in working in the MIA team, please have a look at the "
 msgid ""
 "If you are interested in working in the MIA team, please have a look at the "

-"README file in /org/qa.debian.org/mia on qa.debian.org where the technical "
-"details and the MIA procedures are documented and contact &email-mia;."
+"README file in <filename>/org/qa.debian.org/mia</filename> on <literal> qa."
+"debian.org</literal> where the technical details and the MIA procedures are "
+"documented and contact &email-mia;."

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

-#: beyond-pkging.dbk:282
+#: beyond-pkging.dbk:283

 msgid "Interacting with prospective Debian developers"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "Interacting with prospective Debian developers"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: beyond-pkging.dbk:284
+#: beyond-pkging.dbk:285

 msgid ""
 "Debian's success depends on its ability to attract and retain new and "
 "talented volunteers.  If you are an experienced developer, we recommend that "
 msgid ""
 "Debian's success depends on its ability to attract and retain new and "
 "talented volunteers.  If you are an experienced developer, we recommend that "


@@ -412,12 +415,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: beyond-pkging.dbk:290
+#: beyond-pkging.dbk:291

 msgid "Sponsoring packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Sponsoring packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: beyond-pkging.dbk:292
+#: beyond-pkging.dbk:293

 msgid ""
 "Sponsoring a package means uploading a package for a maintainer who is not "
 "able to do it on their own, a new maintainer applicant.  Sponsoring a "
 msgid ""
 "Sponsoring a package means uploading a package for a maintainer who is not "
 "able to do it on their own, a new maintainer applicant.  Sponsoring a "


@@ -425,7 +428,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: beyond-pkging.dbk:303
+#: beyond-pkging.dbk:304

 msgid ""
 "New maintainers usually have certain difficulties creating Debian packages — "
 "this is quite understandable.  That is why the sponsor is there, to check "
 msgid ""
 "New maintainers usually have certain difficulties creating Debian packages — "
 "this is quite understandable.  That is why the sponsor is there, to check "


@@ -435,7 +438,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: beyond-pkging.dbk:310
+#: beyond-pkging.dbk:311

 msgid ""
 "Sponsoring merely by signing the upload or just recompiling is <emphasis "
 "role=\"strong\">definitely not recommended</emphasis>.  You need to build "
 msgid ""
 "Sponsoring merely by signing the upload or just recompiling is <emphasis "
 "role=\"strong\">definitely not recommended</emphasis>.  You need to build "


@@ -446,7 +449,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: beyond-pkging.dbk:317
+#: beyond-pkging.dbk:318

 msgid ""
 "If you are an application manager for a prospective developer, you can also "
 "be their sponsor.  That way you can also verify how the applicant is "
 msgid ""
 "If you are an application manager for a prospective developer, you can also "
 "be their sponsor.  That way you can also verify how the applicant is "


@@ -454,12 +457,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: beyond-pkging.dbk:324
+#: beyond-pkging.dbk:325

 msgid "Managing sponsored packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Managing sponsored packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: beyond-pkging.dbk:326
+#: beyond-pkging.dbk:327

 msgid ""
 "By uploading a sponsored package to Debian, you are certifying that the "
 "package meets minimum Debian standards.  That implies that you must build "
 msgid ""
 "By uploading a sponsored package to Debian, you are certifying that the "
 "package meets minimum Debian standards.  That implies that you must build "


@@ -467,7 +470,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: beyond-pkging.dbk:331
+#: beyond-pkging.dbk:332

 msgid ""
 "You cannot simply upload a binary <filename>.deb</filename> from the "
 "sponsoree.  In theory, you should only ask for the diff file and the "
 msgid ""
 "You cannot simply upload a binary <filename>.deb</filename> from the "
 "sponsoree.  In theory, you should only ask for the diff file and the "


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

-#: beyond-pkging.dbk:340
+#: beyond-pkging.dbk:341

 msgid ""
 "Do not be afraid to write the sponsoree back and point out changes that need "
 "to be made.  It often takes several rounds of back-and-forth email before "
 msgid ""
 "Do not be afraid to write the sponsoree back and point out changes that need "
 "to be made.  It often takes several rounds of back-and-forth email before "


@@ -487,18 +490,20 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: beyond-pkging.dbk:345
+#: beyond-pkging.dbk:346

 msgid "Once the package meets Debian standards, build and sign it with"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #: beyond-pkging.dbk:348
 #, no-wrap
 msgid "Once the package meets Debian standards, build and sign it with"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #: beyond-pkging.dbk:348
 #, no-wrap

-msgid "dpkg-buildpackage -k<replaceable>KEY-ID</replaceable>"
+msgid ""
+"\n"
+"dpkg-buildpackage -k<replaceable>KEY-ID</replaceable>\n"

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

-#: beyond-pkging.dbk:351
+#: beyond-pkging.dbk:352

 msgid ""
 "before uploading it to the incoming directory.  Of course, you can also use "
 "any part of your <replaceable>KEY-ID</replaceable>, as long as it's unique "
 msgid ""
 "before uploading it to the incoming directory.  Of course, you can also use "
 "any part of your <replaceable>KEY-ID</replaceable>, as long as it's unique "


@@ -506,7 +511,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: beyond-pkging.dbk:356
+#: beyond-pkging.dbk:357

 msgid ""
 "The Maintainer field of the <filename>control</filename> file and the "
 "<filename>changelog</filename> should list the person who did the packaging, "
 msgid ""
 "The Maintainer field of the <filename>control</filename> file and the "
 "<filename>changelog</filename> should list the person who did the packaging, "


@@ -515,40 +520,39 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: beyond-pkging.dbk:362
+#: beyond-pkging.dbk:363

 msgid ""
 "If you prefer to leave a more evident trace of your sponsorship job, you can "
 "add a line stating it in the most recent changelog entry."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "If you prefer to leave a more evident trace of your sponsorship job, you can "
 "add a line stating it in the most recent changelog entry."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: beyond-pkging.dbk:366
+#: beyond-pkging.dbk:367

 msgid ""
 "You are encouraged to keep tabs on the package you sponsor using <xref "
 "linkend=\"pkg-tracking-system\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "You are encouraged to keep tabs on the package you sponsor using <xref "
 "linkend=\"pkg-tracking-system\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: beyond-pkging.dbk:372
+#: beyond-pkging.dbk:373

 msgid "Advocating new developers"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Advocating new developers"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: beyond-pkging.dbk:374
+#: beyond-pkging.dbk:375

 msgid ""
 "See the page about <ulink url=\"&url-newmaint-advocate;\">advocating a "
 "prospective developer</ulink> at the Debian web site."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "See the page about <ulink url=\"&url-newmaint-advocate;\">advocating a "
 "prospective developer</ulink> at the Debian web site."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: beyond-pkging.dbk:381
+#: beyond-pkging.dbk:382

 msgid "Handling new maintainer applications"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Handling new maintainer applications"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: beyond-pkging.dbk:383
+#: beyond-pkging.dbk:384

 msgid ""
 "Please see <ulink url=\"&url-newmaint-amchecklist;\">Checklist for "
 "Application Managers</ulink> at the Debian web site."
 msgstr ""
 msgid ""
 "Please see <ulink url=\"&url-newmaint-amchecklist;\">Checklist for "
 "Application Managers</ulink> at the Debian web site."
 msgstr ""

-

diff --git a/po4a/fr/developer-duties.po b/po4a/fr/developer-duties.po
index 6def51f76393bafda05ab37dd8f969962bbf29a9..e62b5ded41fd1120ea0a1eb2eafc00bcae1d1dc7 100644 (file)
--- a/po4a/fr/developer-duties.po
+++ b/po4a/fr/developer-duties.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.
 # , fuzzy
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.
 # , fuzzy

-# 
-# 
+#
+#

 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-07-01 21:16+0000\n"
+"POT-Creation-Date: 2008-08-08 11:36-0300\n"

 "PO-Revision-Date: 2007-07-01 23:10+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "PO-Revision-Date: 2007-07-01 23:10+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: "
+"Content-Transfer-Encoding: \n"

 
 # type: Content of: <chapter><title>
 #: developer-duties.dbk:7
 
 # type: Content of: <chapter><title>
 #: developer-duties.dbk:7


@@ -255,8 +255,8 @@ msgid ""
 "Generally you should deal with bug reports on your packages as described in "
 "<xref linkend=\"bug-handling\"/> .  However, there's a special category of "
 "bugs that you need to take care of — the so-called release-critical bugs (RC "
 "Generally you should deal with bug reports on your packages as described in "
 "<xref linkend=\"bug-handling\"/> .  However, there's a special category of "
 "bugs that you need to take care of — the so-called release-critical bugs (RC "

-"bugs).  All bug reports that have severity <emphasis>critical</emphasis>, "
-"<emphasis>grave</emphasis> or <emphasis>serious</emphasis> are considered to "
+"bugs).  All bug reports that have severity <literal>critical</literal>, "
+"<literal>grave</literal> or <literal>serious</literal> are considered to "

 "have an impact on whether the package can be released in the next stable "
 "release of Debian.  These bugs can delay the Debian release and/or can "
 "justify the removal of a package at freeze time.  That's why these bugs need "
 "have an impact on whether the package can be released in the next stable "
 "release of Debian.  These bugs can delay the Debian release and/or can "
 "justify the removal of a package at freeze time.  That's why these bugs need "


@@ -310,4 +310,3 @@ msgid ""
 "ticket in Debian RT by sending a mail to keyring@rt.debian.org with the "
 "words 'Debian RT' somewhere in the subject line (case doesn't matter)."
 msgstr ""
 "ticket in Debian RT by sending a mail to keyring@rt.debian.org with the "
 "words 'Debian RT' somewhere in the subject line (case doesn't matter)."
 msgstr ""

-

diff --git a/po4a/fr/index.po b/po4a/fr/index.po
index dcacdb77d3e36332f313d61d95a88e778f9c1b7b..0013252275c2954faa032779c825c347a927eedb 100644 (file)
--- a/po4a/fr/index.po
+++ b/po4a/fr/index.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # debacle <>, 2007.
 # , fuzzy
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # debacle <>, 2007.
 # , fuzzy

-# 
-# 
+#
+#

 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-07-01 22:28+0000\n"
+"POT-Creation-Date: 2008-08-08 11:36-0300\n"

 "PO-Revision-Date: 2007-07-01 23:36+0000\n"
 "Last-Translator: debacle <>\n"
 "Language-Team: English <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "PO-Revision-Date: 2007-07-01 23:36+0000\n"
 "Last-Translator: debacle <>\n"
 "Language-Team: English <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"

 
 # type: Attribute 'lang' of: <book>
 #: index.dbk:7
 
 # type: Attribute 'lang' of: <book>
 #: index.dbk:7


@@ -26,6 +26,18 @@ msgstr "fr"
 msgid "Debian Developer's Reference"
 msgstr "Référence du développeur Debian"
 
 msgid "Debian Developer's Reference"
 msgstr "Référence du développeur Debian"
 

+# type: Content of: <book><bookinfo>
+#: index.dbk:11
+msgid ""
+"<author> <othername>Developer's Reference Team</othername> &email-devel-ref; "
+"</author> <author> <firstname>Andreas</firstname> <surname>Barth</surname> </"
+"author> <author> <firstname>Adam</firstname> <surname>Di Carlo</surname> </"
+"author> <author> <firstname>Raphaël</firstname> <surname>Hertzog</surname> </"
+"author> <author> <firstname>Christian</firstname> <surname>Schwarz</surname> "
+"</author> <author> <firstname>Ian</firstname> <surname>Jackson</surname> </"
+"author>"
+msgstr ""
+

 # type: Content of: <book><bookinfo><releaseinfo>
 #: index.dbk:30
 msgid "ver. &version;"
 # type: Content of: <book><bookinfo><releaseinfo>
 #: index.dbk:30
 msgid "ver. &version;"

diff --git a/po4a/fr/l10n.po b/po4a/fr/l10n.po
index 3eb1bb079a875fa2abe2489db0be77b2db97d12b..a97d69a2794deff9abc83b66952d1a80aee4cee5 100644 (file)
--- a/po4a/fr/l10n.po
+++ b/po4a/fr/l10n.po
@@ -2,25 +2,26 @@
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.
 # , fuzzy
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.
 # , fuzzy

-# 
-# 
+#
+#

 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-07-01 21:16+0000\n"
+"POT-Creation-Date: 2008-08-08 11:36-0300\n"

 "PO-Revision-Date: 2007-07-01 23:14+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "PO-Revision-Date: 2007-07-01 23:14+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: "
+"Content-Transfer-Encoding: \n"

 
 # type: Content of: <chapter><title>
 #: l10n.dbk:7
 msgid ""
 "Internationalizing, translating, being internationalized and being translated"
 
 # type: Content of: <chapter><title>
 #: l10n.dbk:7
 msgid ""
 "Internationalizing, translating, being internationalized and being translated"

-msgstr "Internationalisation, traduction, être internationalisé et être traduit"
+msgstr ""
+"Internationalisation, traduction, être internationalisé et être traduit"

 
 # type: Content of: <chapter><para>
 #: l10n.dbk:9
 
 # type: Content of: <chapter><para>
 #: l10n.dbk:9


@@ -35,21 +36,23 @@ msgstr ""
 
 # type: Content of: <chapter><para>
 #: l10n.dbk:17
 
 # type: Content of: <chapter><para>
 #: l10n.dbk:17

+#, fuzzy

 msgid ""
 "According to <ulink url=\"http://&www-debian-org;/doc/manuals/intro-i18n/"
 "\">Introduction to i18n</ulink> from Tomohiro KUBOTA, I18N "
 "(internationalization) means modification of a software or related "
 "technologies so that a software can potentially handle multiple languages, "
 msgid ""
 "According to <ulink url=\"http://&www-debian-org;/doc/manuals/intro-i18n/"
 "\">Introduction to i18n</ulink> from Tomohiro KUBOTA, I18N "
 "(internationalization) means modification of a software or related "
 "technologies so that a software can potentially handle multiple languages, "

-"customs, and so on in the world.  while L10N (localization) means "
+"customs, and so on in the world, while L10N (localization) means "

 "implementation of a specific language for an already internationalized "
 "software."
 "implementation of a specific language for an already internationalized "
 "software."

-msgstr "Selon l'<ulink url=\"http://www.debian.org/doc/manuals/intro-i18n/\">introduction à l'i18n</ulink> de Tomohiro KUBOTA, «I18N"
-"(internationalisation) veut dire la modification d'un logiciel ou de"
-"technologies liées pour qu'un logiciel puisse potentiellement gérer des"
-"langues multiples, des conventions multiples et ainsi de suite dans le"
-"monde entier» alors que «L10N (localisation) veut dire"
-"l'implémentation dans une langue spécifique pour un logiciel déjà"
-"internationalisé»."
+msgstr ""
+"Selon l'<ulink url=\"http://www.debian.org/doc/manuals/intro-i18n/"
+"\">introduction à l'i18n</ulink> de Tomohiro KUBOTA, «I18N"
+"(internationalisation) veut dire la modification d'un logiciel ou "
+"detechnologies liées pour qu'un logiciel puisse potentiellement gérer "
+"deslangues multiples, des conventions multiples et ainsi de suite dans "
+"lemonde entier» alors que «L10N (localisation) veut direl'implémentation dans "
+"une langue spécifique pour un logiciel déjàinternationalisé»."

 
 # type: Content of: <chapter><para>
 #: l10n.dbk:26
 
 # type: Content of: <chapter><para>
 #: l10n.dbk:26


@@ -67,7 +70,7 @@ msgstr ""
 msgid ""
 "Setting aside the i18n problems, where no general guideline can be given, "
 "there is actually no central infrastructure for l10n within Debian which "
 msgid ""
 "Setting aside the i18n problems, where no general guideline can be given, "
 "there is actually no central infrastructure for l10n within Debian which "

-"could be compared to the dbuild mechanism for porting.  So most of the work "
+"could be compared to the buildd mechanism for porting.  So most of the work "

 "has to be done manually."
 msgstr ""
 
 "has to be done manually."
 msgstr ""
 


@@ -344,4 +347,3 @@ msgid ""
 "In any case, cooperation can only be achieved with <emphasis role=\"strong"
 "\">mutual respect</emphasis>."
 msgstr ""
 "In any case, cooperation can only be achieved with <emphasis role=\"strong"
 "\">mutual respect</emphasis>."
 msgstr ""

-

diff --git a/po4a/fr/new-maintainer.po b/po4a/fr/new-maintainer.po
index 40f9a3e4bbe2243719557cfe56bb382a76f9cb34..182f7669335b64596f835d4b2f38004dc4937a83 100644 (file)
--- a/po4a/fr/new-maintainer.po
+++ b/po4a/fr/new-maintainer.po
@@ -1,19 +1,19 @@
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.

-# 
-# 
+#
+#

 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-07-01 21:16+0000\n"
+"POT-Creation-Date: 2008-08-08 11:36-0300\n"

 "PO-Revision-Date: 2007-07-01 23:07+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "PO-Revision-Date: 2007-07-01 23:07+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"

 
 # type: Content of: <chapter><title>
 #: new-maintainer.dbk:7
 
 # type: Content of: <chapter><title>
 #: new-maintainer.dbk:7


@@ -27,49 +27,93 @@ msgstr "Pour commencer"
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:11
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:11

-msgid "So, you've read all the documentation, you've gone through the <ulink url=\"&url-newmaint-guide;\">Debian New Maintainers' Guide</ulink>, understand what everything in the <systemitem role=\"package\">hello</systemitem> example package is for, and you're about to Debianize your favorite piece of software.  How do you actually become a Debian developer so that your work can be incorporated into the Project?"
-msgstr "Vous avez lu toute la documentation, vous avez examiné le <ulink url=\"&url-newmaint-guide;\">guide du nouveau responsable</ulink>, vous"
-"comprenez l'intérêt de tout ce qui se trouve dans le paquet d'exemple"
-"<systemitem role=\"package\">hello</systemitem> et vous vous apprêtez à mettre en paquet votre"
-"logiciel préféré. Comment devenir responsable Debian et intégrer votre"
-"travail au projet?"
+msgid ""
+"So, you've read all the documentation, you've gone through the <ulink url="
+"\"&url-newmaint-guide;\">Debian New Maintainers' Guide</ulink>, understand "
+"what everything in the <systemitem role=\"package\">hello</systemitem> "
+"example package is for, and you're about to Debianize your favorite piece of "
+"software.  How do you actually become a Debian developer so that your work "
+"can be incorporated into the Project?"
+msgstr ""
+"Vous avez lu toute la documentation, vous avez examiné le <ulink url=\"&url-"
+"newmaint-guide;\">guide du nouveau responsable</ulink>, vouscomprenez "
+"l'intérêt de tout ce qui se trouve dans le paquet d'exemple<systemitem role="
+"\"package\">hello</systemitem> et vous vous apprêtez à mettre en paquet "
+"votrelogiciel préféré. Comment devenir responsable Debian et intégrer "
+"votretravail au projet?"

 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:19
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:19

-msgid "Firstly, subscribe to &email-debian-devel; if you haven't already.  Send the word <literal>subscribe</literal> in the <emphasis>Subject</emphasis> of an email to &email-debian-devel-req;.  In case of problems, contact the list administrator at &email-listmaster;.  More information on available mailing lists can be found in <xref linkend=\"mailing-lists\"/> .  &email-debian-devel-announce; is another list which is mandatory for anyone who wishes to follow Debian's development."
-msgstr "Si vous ne l'avez pas encore fait, commencez par vous inscrire à la"
-"liste &email-debian-devel;. Pour cela, envoyez un courrier à l'adresse"
-"&email-debian-devel-req; avec le mot <literal>subscribe</literal> dans la ligne"
-"<emphasis>Objet</emphasis><footnote><para><emphasis>Subject</emphasis> en anglais</para></footnote>"
-"de votre message. En cas de problème, contactez l'administrateur de la"
-"liste &email-listmaster;. Vous trouverez plus d'informations dans la"
-"section <xref linkend=\"mailing-lists\"/>. &email-debian-devel-announce; est une"
-"autre liste incontournable pour qui veut suivre les développements de"
-"Debian."
+#, fuzzy
+msgid ""
+"Firstly, subscribe to &email-debian-devel; if you haven't already.  Send the "
+"word <literal>subscribe</literal> in the <literal>Subject</literal> of an "
+"email to &email-debian-devel-req;.  In case of problems, contact the list "
+"administrator at &email-listmaster;.  More information on available mailing "
+"lists can be found in <xref linkend=\"mailing-lists\"/> .  &email-debian-"
+"devel-announce; is another list which is mandatory for anyone who wishes to "
+"follow Debian's development."
+msgstr ""
+"Si vous ne l'avez pas encore fait, commencez par vous inscrire à laliste "
+"&email-debian-devel;. Pour cela, envoyez un courrier à l'adresse&email-"
+"debian-devel-req; avec le mot <literal>subscribe</literal> dans la "
+"ligne<emphasis>Objet</emphasis><footnote><para><emphasis>Subject</emphasis> "
+"en anglais</para></footnote>de votre message. En cas de problème, contactez "
+"l'administrateur de laliste &email-listmaster;. Vous trouverez plus "
+"d'informations dans lasection <xref linkend=\"mailing-lists\"/>. &email-"
+"debian-devel-announce; est uneautre liste incontournable pour qui veut "
+"suivre les développements deDebian."

 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:29
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:29

-msgid "You should subscribe and lurk (that is, read without posting) for a bit before doing any coding, and you should post about your intentions to work on something to avoid duplicated effort."
-msgstr "Vous suivrez les discussions de cette liste (sans poster) pendant"
-"quelque temps avant de coder quoi que ce soit et vous informerez la"
-"liste de votre intention de travailler sur quelque chose pour éviter de"
-"dupliquer le travail d'un autre."
+msgid ""
+"You should subscribe and lurk (that is, read without posting) for a bit "
+"before doing any coding, and you should post about your intentions to work "
+"on something to avoid duplicated effort."
+msgstr ""
+"Vous suivrez les discussions de cette liste (sans poster) pendantquelque "
+"temps avant de coder quoi que ce soit et vous informerez laliste de votre "
+"intention de travailler sur quelque chose pour éviter dedupliquer le travail "
+"d'un autre."

 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:34
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:34

-msgid "Another good list to subscribe to is &email-debian-mentors;.  See <xref linkend=\"mentors\"/> for details.  The IRC channel <literal>#debian</literal> can also be helpful; see <xref linkend=\"irc-channels\"/> ."
-msgstr "Une autre liste intéressante est &email-debian-mentors;. Voir la"
-"section <xref linkend=\"mentors\"/> pour les détails. Le canal IRC"
-"<literal>#debian</literal> pourra aussi être utile&nbsp;; voir <xref linkend=\"irc-channels\"/>."
+msgid ""
+"Another good list to subscribe to is &email-debian-mentors;.  See <xref "
+"linkend=\"mentors\"/> for details.  The IRC channel <literal>#debian</"
+"literal> can also be helpful; see <xref linkend=\"irc-channels\"/> ."
+msgstr ""
+"Une autre liste intéressante est &email-debian-mentors;. Voir lasection "
+"<xref linkend=\"mentors\"/> pour les détails. Le canal IRC<literal>#debian</"
+"literal> pourra aussi être utile&nbsp;; voir <xref linkend=\"irc-channels\"/"
+">."

 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:40
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:40

-msgid "When you know how you want to contribute to &debian-formal;, you should get in contact with existing Debian maintainers who are working on similar tasks.  That way, you can learn from experienced developers.  For example, if you are interested in packaging existing software for Debian, you should try to get a sponsor.  A sponsor will work together with you on your package and upload it to the Debian archive once they are happy with the packaging work you have done.  You can find a sponsor by mailing the &email-debian-mentors; mailing list, describing your package and yourself and asking for a sponsor (see <xref linkend=\"sponsoring\"/> and <ulink url=\"&url-mentors;\"></ulink> for more information on sponsoring).  On the other hand, if you are interested in porting Debian to alternative architectures or kernels you can subscribe to port specific mailing lists and ask there how to get started.  Finally, if you are interested in documentation or Quality Assurance (QA) work you can join maintainers already working on these tasks and submit patches and improvements."
+msgid ""
+"When you know how you want to contribute to &debian-formal;, you should get "
+"in contact with existing Debian maintainers who are working on similar "
+"tasks.  That way, you can learn from experienced developers.  For example, "
+"if you are interested in packaging existing software for Debian, you should "
+"try to get a sponsor.  A sponsor will work together with you on your package "
+"and upload it to the Debian archive once they are happy with the packaging "
+"work you have done.  You can find a sponsor by mailing the &email-debian-"
+"mentors; mailing list, describing your package and yourself and asking for a "
+"sponsor (see <xref linkend=\"sponsoring\"/> and <ulink url=\"&url-mentors;"
+"\"></ulink> for more information on sponsoring).  On the other hand, if you "
+"are interested in porting Debian to alternative architectures or kernels you "
+"can subscribe to port specific mailing lists and ask there how to get "
+"started.  Finally, if you are interested in documentation or Quality "
+"Assurance (QA) work you can join maintainers already working on these tasks "
+"and submit patches and improvements."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:57
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:57

-msgid "One pitfall could be a too-generic local part in your mailadress: Terms like mail, admin, root, master should be avoided, please see <ulink url=\"&url-debian-lists;\"></ulink> for details."
+msgid ""
+"One pitfall could be a too-generic local part in your mailadress: Terms like "
+"mail, admin, root, master should be avoided, please see <ulink url=\"&url-"
+"debian-lists;\"></ulink> for details."

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


@@ -79,12 +123,18 @@ msgstr "Mentors et parrains Debian"
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:66
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:66

-msgid "The mailing list &email-debian-mentors; has been set up for novice maintainers who seek help with initial packaging and other developer-related issues.  Every new developer is invited to subscribe to that list (see <xref linkend=\"mailing-lists\"/> for details)."
+msgid ""
+"The mailing list &email-debian-mentors; has been set up for novice "
+"maintainers who seek help with initial packaging and other developer-related "
+"issues.  Every new developer is invited to subscribe to that list (see <xref "
+"linkend=\"mailing-lists\"/> for details)."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:72
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:72

-msgid "Those who prefer one-on-one help (e.g., via private email) should also post to that list and an experienced developer will volunteer to help."
+msgid ""
+"Those who prefer one-on-one help (e.g., via private email) should also post "
+"to that list and an experienced developer will volunteer to help."

 msgstr ""
 
 #
 msgstr ""
 
 #


@@ -96,12 +146,20 @@ msgstr ""
 #. Those who are seeking a
 #. sponsor can request one at <ulink url="http://www.internatif.org/bortzmeyer/debian/sponsor/"></ulink>.
 #: new-maintainer.dbk:76
 #. Those who are seeking a
 #. sponsor can request one at <ulink url="http://www.internatif.org/bortzmeyer/debian/sponsor/"></ulink>.
 #: new-maintainer.dbk:76

-msgid "In addition, if you have some packages ready for inclusion in Debian, but are waiting for your new maintainer application to go through, you might be able find a sponsor to upload your package for you.  Sponsors are people who are official Debian Developers, and who are willing to criticize and upload your packages for you.  Please read the unofficial debian-mentors FAQ at <ulink url=\"&url-mentors;\"></ulink> first."
+msgid ""
+"In addition, if you have some packages ready for inclusion in Debian, but "
+"are waiting for your new maintainer application to go through, you might be "
+"able find a sponsor to upload your package for you.  Sponsors are people who "
+"are official Debian Developers, and who are willing to criticize and upload "
+"your packages for you.  Please read the unofficial debian-mentors FAQ at "
+"<ulink url=\"&url-mentors;\"></ulink> first."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:89
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:89

-msgid "If you wish to be a mentor and/or sponsor, more information is available in <xref linkend=\"newmaint\"/> ."
+msgid ""
+"If you wish to be a mentor and/or sponsor, more information is available in "
+"<xref linkend=\"newmaint\"/> ."

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


@@ -111,86 +169,190 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:97
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:97

-msgid "Before you decide to register with &debian-formal;, you will need to read all the information available at the <ulink url=\"&url-newmaint;\">New Maintainer's Corner</ulink>.  It describes in detail the preparations you have to do before you can register to become a Debian developer.  For example, before you apply, you have to read the <ulink url=\"&url-social-contract;\">Debian Social Contract</ulink>.  Registering as a developer means that you agree with and pledge to uphold the Debian Social Contract; it is very important that maintainers are in accord with the essential ideas behind &debian-formal;.  Reading the <ulink url=\"&url-gnu-manifesto;\">GNU Manifesto</ulink> would also be a good idea."
+msgid ""
+"Before you decide to register with &debian-formal;, you will need to read "
+"all the information available at the <ulink url=\"&url-newmaint;\">New "
+"Maintainer's Corner</ulink>.  It describes in detail the preparations you "
+"have to do before you can register to become a Debian developer.  For "
+"example, before you apply, you have to read the <ulink url=\"&url-social-"
+"contract;\">Debian Social Contract</ulink>.  Registering as a developer "
+"means that you agree with and pledge to uphold the Debian Social Contract; "
+"it is very important that maintainers are in accord with the essential ideas "
+"behind &debian-formal;.  Reading the <ulink url=\"&url-gnu-manifesto;\">GNU "
+"Manifesto</ulink> would also be a good idea."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:111
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:111

-msgid "The process of registering as a developer is a process of verifying your identity and intentions, and checking your technical skills.  As the number of people working on &debian-formal; has grown to over &number-of-maintainers; and our systems are used in several very important places, we have to be careful about being compromised.  Therefore, we need to verify new maintainers before we can give them accounts on our servers and let them upload packages."
+msgid ""
+"The process of registering as a developer is a process of verifying your "
+"identity and intentions, and checking your technical skills.  As the number "
+"of people working on &debian-formal; has grown to over &number-of-"
+"maintainers; and our systems are used in several very important places, we "
+"have to be careful about being compromised.  Therefore, we need to verify "
+"new maintainers before we can give them accounts on our servers and let them "
+"upload packages."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:120
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:120

-msgid "Before you actually register you should have shown that you can do competent work and will be a good contributor.  You show this by submitting patches through the Bug Tracking System and having a package sponsored by an existing Debian Developer for a while.  Also, we expect that contributors are interested in the whole project and not just in maintaining their own packages.  If you can help other maintainers by providing further information on a bug or even a patch, then do so!"
+msgid ""
+"Before you actually register you should have shown that you can do competent "
+"work and will be a good contributor.  You show this by submitting patches "
+"through the Bug Tracking System and having a package sponsored by an "
+"existing Debian Developer for a while.  Also, we expect that contributors "
+"are interested in the whole project and not just in maintaining their own "
+"packages.  If you can help other maintainers by providing further "
+"information on a bug or even a patch, then do so!"

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:129
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:129

-msgid "Registration requires that you are familiar with Debian's philosophy and technical documentation.  Furthermore, you need a GnuPG key which has been signed by an existing Debian maintainer.  If your GnuPG key is not signed yet, you should try to meet a Debian Developer in person to get your key signed.  There's a <ulink url=\"&url-gpg-coord;\">GnuPG Key Signing Coordination page</ulink> which should help you find a Debian Developer close to you.  (If there is no Debian Developer close to you, alternative ways to pass the ID check may be permitted as an absolute exception on a case-by-case-basis.  See the <ulink url=\"&url-newmaint-id;\">identification page</ulink> for more information.)"
+msgid ""
+"Registration requires that you are familiar with Debian's philosophy and "
+"technical documentation.  Furthermore, you need a GnuPG key which has been "
+"signed by an existing Debian maintainer.  If your GnuPG key is not signed "
+"yet, you should try to meet a Debian Developer in person to get your key "
+"signed.  There's a <ulink url=\"&url-gpg-coord;\">GnuPG Key Signing "
+"Coordination page</ulink> which should help you find a Debian Developer "
+"close to you.  (If there is no Debian Developer close to you, alternative "
+"ways to pass the ID check may be permitted as an absolute exception on a "
+"case-by-case-basis.  See the <ulink url=\"&url-newmaint-id;\">identification "
+"page</ulink> for more information.)"

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:142
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:142

-msgid "If you do not have an OpenPGP key yet, generate one.  Every developer needs an OpenPGP key in order to sign and verify package uploads.  You should read the manual for the software you are using, since it has much important information which is critical to its security.  Many more security failures are due to human error than to software failure or high-powered spy techniques.  See <xref linkend=\"key-maint\"/> for more information on maintaining your public key."
+msgid ""
+"If you do not have an OpenPGP key yet, generate one.  Every developer needs "
+"an OpenPGP key in order to sign and verify package uploads.  You should read "
+"the manual for the software you are using, since it has much important "
+"information which is critical to its security.  Many more security failures "
+"are due to human error than to software failure or high-powered spy "
+"techniques.  See <xref linkend=\"key-maint\"/> for more information on "
+"maintaining your public key."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:150
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:150

-msgid "Debian uses the <command>GNU Privacy Guard</command> (package <systemitem role=\"package\">gnupg</systemitem> version 1 or better) as its baseline standard.  You can use some other implementation of OpenPGP as well.  Note that OpenPGP is an open standard based on <ulink url=\"&url-rfc2440;\">RFC 2440</ulink>."
+msgid ""
+"Debian uses the <command>GNU Privacy Guard</command> (package <systemitem "
+"role=\"package\">gnupg</systemitem> version 1 or better) as its baseline "
+"standard.  You can use some other implementation of OpenPGP as well.  Note "
+"that OpenPGP is an open standard based on <ulink url=\"&url-rfc2440;\">RFC "
+"2440</ulink>."

 msgstr ""
 
 # type: Content of: <chapter><section><para><footnote>
 #: new-maintainer.dbk:157
 msgstr ""
 
 # type: Content of: <chapter><section><para><footnote>
 #: new-maintainer.dbk:157

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

 msgstr ""
 
 # type: Content of: <chapter><section><para><footnote><para>
 #: new-maintainer.dbk:159
 msgstr ""
 
 # type: Content of: <chapter><section><para><footnote><para>
 #: new-maintainer.dbk:159

-msgid "Version 4 keys are keys conforming to the OpenPGP standard as defined in RFC 2440.  Version 4 is the key type that has always been created when using GnuPG.  PGP versions since 5.x also could create v4 keys, the other choice having beein pgp 2.6.x compatible v3 keys (also called legacy RSA by PGP)."
+msgid ""
+"Version 4 keys are keys conforming to the OpenPGP standard as defined in RFC "
+"2440.  Version 4 is the key type that has always been created when using "
+"GnuPG.  PGP versions since 5.x also could create v4 keys, the other choice "
+"having beein pgp 2.6.x compatible v3 keys (also called legacy RSA by PGP)."

 msgstr ""
 
 # type: Content of: <chapter><section><para><footnote><para>
 #: new-maintainer.dbk:163
 msgstr ""
 
 # type: Content of: <chapter><section><para><footnote><para>
 #: new-maintainer.dbk:163

-msgid "Version 4 (primary) keys can either use the RSA or the DSA algorithms, so this has nothing to do with GnuPG's question about which kind of key do you want: (1) DSA and Elgamal, (2)  DSA (sign only), (5) RSA (sign only).  If you don't have any special requirements just pick the default."
+msgid ""
+"Version 4 (primary) keys can either use the RSA or the DSA algorithms, so "
+"this has nothing to do with GnuPG's question about which kind of key do you "
+"want: (1) DSA and Elgamal, (2)  DSA (sign only), (5) RSA (sign only).  If "
+"you don't have any special requirements just pick the default."

 msgstr ""
 
 # type: Content of: <chapter><section><para><footnote><para>
 #: new-maintainer.dbk:167
 msgstr ""
 
 # type: Content of: <chapter><section><para><footnote><para>
 #: new-maintainer.dbk:167

-msgid "The easiest way to tell whether an existing key is a v4 key or a v3 (or v2) key is to look at the fingerprint: Fingerprints of version 4 keys are the SHA-1 hash of some key material, so they are 40 hex digits, usually grouped in blocks of 4.  Fingerprints of older key format versions used MD5 and are generally shown in blocks of 2 hex digits.  For example if your fingerprint looks like <literal>5B00 C96D 5D54 AEE1 206B  AF84 DE7A AF6E 94C0 9C7F</literal> then it's a v4 key."
+msgid ""
+"The easiest way to tell whether an existing key is a v4 key or a v3 (or v2) "
+"key is to look at the fingerprint: Fingerprints of version 4 keys are the "
+"SHA-1 hash of some key material, so they are 40 hex digits, usually grouped "
+"in blocks of 4.  Fingerprints of older key format versions used MD5 and are "
+"generally shown in blocks of 2 hex digits.  For example if your fingerprint "
+"looks like <literal>5B00 C96D 5D54 AEE1 206B  AF84 DE7A AF6E 94C0 9C7F</"
+"literal> then it's a v4 key."

 msgstr ""
 
 # type: Content of: <chapter><section><para><footnote><para>
 #: new-maintainer.dbk:174
 msgstr ""
 
 # type: Content of: <chapter><section><para><footnote><para>
 #: new-maintainer.dbk:174

-msgid "Another possibility is to pipe the key into <command>pgpdump</command>, which will say something like Public Key Packet - Ver 4."
+msgid ""
+"Another possibility is to pipe the key into <command>pgpdump</command>, "
+"which will say something like Public Key Packet - Ver 4."

 msgstr ""
 
 # type: Content of: <chapter><section><para><footnote><para>
 #: new-maintainer.dbk:176
 msgstr ""
 
 # type: Content of: <chapter><section><para><footnote><para>
 #: new-maintainer.dbk:176

-msgid "Also note that your key must be self-signed (i.e.  it has to sign all its own user IDs; this prevents user ID tampering).  All modern OpenPGP software does that automatically, but if you have an older key you may have to manually add those signatures."
+msgid ""
+"Also note that your key must be self-signed (i.e.  it has to sign all its "
+"own user IDs; this prevents user ID tampering).  All modern OpenPGP software "
+"does that automatically, but if you have an older key you may have to "
+"manually add those signatures."
+msgstr ""
+
+# type: Content of: <chapter><section><para>
+#: new-maintainer.dbk:179
+msgid "</footnote>"

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:182
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:182

-msgid "If your public key isn't on a public key server such as &pgp-keyserv;, please read the documentation available at <ulink url=\"&url-newmaint-id;\">NM Step 2: Identification</ulink>.  That document contains instructions on how to put your key on the public key servers.  The New Maintainer Group will put your public key on the servers if it isn't already there."
+msgid ""
+"If your public key isn't on a public key server such as &pgp-keyserv;, "
+"please read the documentation available at <ulink url=\"&url-newmaint-id;"
+"\">NM Step 2: Identification</ulink>.  That document contains instructions "
+"on how to put your key on the public key servers.  The New Maintainer Group "
+"will put your public key on the servers if it isn't already there."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:190
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:190

-msgid "Some countries restrict the use of cryptographic software by their citizens.  This need not impede one's activities as a Debian package maintainer however, as it may be perfectly legal to use cryptographic products for authentication, rather than encryption purposes.  If you live in a country where use of cryptography even for authentication is forbidden then please contact us so we can make special arrangements."
+msgid ""
+"Some countries restrict the use of cryptographic software by their "
+"citizens.  This need not impede one's activities as a Debian package "
+"maintainer however, as it may be perfectly legal to use cryptographic "
+"products for authentication, rather than encryption purposes.  If you live "
+"in a country where use of cryptography even for authentication is forbidden "
+"then please contact us so we can make special arrangements."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:198
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:198

-msgid "To apply as a new maintainer, you need an existing Debian Developer to support your application (an <emphasis>advocate</emphasis>).  After you have contributed to Debian for a while, and you want to apply to become a registered developer, an existing developer with whom you have worked over the past months has to express their belief that you can contribute to Debian successfully."
+msgid ""
+"To apply as a new maintainer, you need an existing Debian Developer to "
+"support your application (an <literal>advocate</literal>).  After you have "
+"contributed to Debian for a while, and you want to apply to become a "
+"registered developer, an existing developer with whom you have worked over "
+"the past months has to express their belief that you can contribute to "
+"Debian successfully."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:205
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:205

-msgid "When you have found an advocate, have your GnuPG key signed and have already contributed to Debian for a while, you're ready to apply.  You can simply register on our <ulink url=\"&url-newmaint-apply;\">application page</ulink>.  After you have signed up, your advocate has to confirm your application.  When your advocate has completed this step you will be assigned an Application Manager who will go with you through the necessary steps of the New Maintainer process.  You can always check your status on the <ulink url=\"&url-newmaint-db;\">applications status board</ulink>."
+msgid ""
+"When you have found an advocate, have your GnuPG key signed and have already "
+"contributed to Debian for a while, you're ready to apply.  You can simply "
+"register on our <ulink url=\"&url-newmaint-apply;\">application page</"
+"ulink>.  After you have signed up, your advocate has to confirm your "
+"application.  When your advocate has completed this step you will be "
+"assigned an Application Manager who will go with you through the necessary "
+"steps of the New Maintainer process.  You can always check your status on "
+"the <ulink url=\"&url-newmaint-db;\">applications status board</ulink>."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:215
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: new-maintainer.dbk:215

-msgid "For more details, please consult <ulink url=\"&url-newmaint;\">New Maintainer's Corner</ulink> at the Debian web site.  Make sure that you are familiar with the necessary steps of the New Maintainer process before actually applying.  If you are well prepared, you can save a lot of time later on."
+msgid ""
+"For more details, please consult <ulink url=\"&url-newmaint;\">New "
+"Maintainer's Corner</ulink> at the Debian web site.  Make sure that you are "
+"familiar with the necessary steps of the New Maintainer process before "
+"actually applying.  If you are well prepared, you can save a lot of time "
+"later on."

 msgstr ""
 msgstr ""

-

diff --git a/po4a/fr/pkgs.po b/po4a/fr/pkgs.po
index 155efa5f0090ce1e8600da183b5fdba2d1c4b888..1172eaf033707a79bd7c7b79d1cae3d7393266ae 100644 (file)
--- a/po4a/fr/pkgs.po
+++ b/po4a/fr/pkgs.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.
 # , fuzzy
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.
 # , fuzzy

-# 
-# 
+#
+#

 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-07-01 21:16+0000\n"
+"POT-Creation-Date: 2008-08-08 11:36-0300\n"

 "PO-Revision-Date: 2007-07-01 23:15+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "PO-Revision-Date: 2007-07-01 23:15+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: "
+"Content-Transfer-Encoding: \n"

 
 # type: Content of: <chapter><title>
 #: pkgs.dbk:7
 
 # type: Content of: <chapter><title>
 #: pkgs.dbk:7


@@ -26,8 +26,9 @@ msgstr "Gestion des paquets"
 msgid ""
 "This chapter contains information related to creating, uploading, "
 "maintaining, and porting packages."
 msgid ""
 "This chapter contains information related to creating, uploading, "
 "maintaining, and porting packages."

-msgstr "Ce chapitre contient des informations relatives à la création, l'envoi,"
-"la maintenance et le portage des paquets."
+msgstr ""
+"Ce chapitre contient des informations relatives à la création, l'envoi,la "
+"maintenance et le portage des paquets."

 
 # type: Content of: <chapter><section><title>
 #: pkgs.dbk:13
 
 # type: Content of: <chapter><section><title>
 #: pkgs.dbk:13


@@ -59,18 +60,21 @@ msgstr ""
 # type: Content of: <chapter><section><para>
 #: pkgs.dbk:31
 msgid ""
 # type: Content of: <chapter><section><para>
 #: pkgs.dbk:31
 msgid ""

-"You should set the subject of the bug to ``ITP: <replaceable>foo</"
-"replaceable> -- <replaceable>short description</replaceable>'', substituting "
-"the name of the new package for <replaceable>foo</replaceable>.  The "
-"severity of the bug report must be set to <emphasis>wishlist</emphasis>.  If "
-"you feel it's necessary, send a copy to &email-debian-devel; by putting the "
-"address in the <literal>X-Debbugs-CC:</literal> header of the message (no, "
-"don't use <literal>CC:</literal>, because that way the message's subject "
-"won't indicate the bug number)."
+"You should set the subject of the bug to <literal>ITP: <replaceable>foo</"
+"replaceable> -- <replaceable>short description</replaceable></literal>, "
+"substituting the name of the new package for <replaceable>foo</"
+"replaceable>.  The severity of the bug report must be set to "
+"<literal>wishlist</literal>.  Please send a copy to &email-debian-devel; by "
+"using the X-Debbugs-CC header (don't use CC:, because that way the message's "
+"subject won't indicate the bug number). If you are packaging so many new "
+"packages (>10)  that notifying the mailing list in seperate messages is too "
+"disruptive, do send a summary after filing the bugs to the debian-devel list "
+"instead.  This will inform the other developers about upcoming packages and "
+"will allow a review of your description and package name."

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

-#: pkgs.dbk:41
+#: pkgs.dbk:45

 msgid ""
 "Please include a <literal>Closes: bug#<replaceable>nnnnn</replaceable></"
 "literal> entry in the changelog of the new package in order for the bug "
 msgid ""
 "Please include a <literal>Closes: bug#<replaceable>nnnnn</replaceable></"
 "literal> entry in the changelog of the new package in order for the bug "


@@ -79,7 +83,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:47
+#: pkgs.dbk:51

 msgid ""
 "When closing security bugs include CVE numbers as well as the Closes: "
 "#nnnnn.  This is useful for the security team to track vulnerabilities.  If "
 msgid ""
 "When closing security bugs include CVE numbers as well as the Closes: "
 "#nnnnn.  This is useful for the security team to track vulnerabilities.  If "


@@ -90,14 +94,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:55
+#: pkgs.dbk:59

 msgid ""
 "There are a number of reasons why we ask maintainers to announce their "
 "intentions:"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid ""
 "There are a number of reasons why we ask maintainers to announce their "
 "intentions:"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:61
+#: pkgs.dbk:65

 msgid ""
 "It helps the (potentially new) maintainer to tap into the experience of "
 "people on the list, and lets them know if anyone else is working on it "
 msgid ""
 "It helps the (potentially new) maintainer to tap into the experience of "
 "people on the list, and lets them know if anyone else is working on it "


@@ -105,48 +109,48 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:67
+#: pkgs.dbk:71

 msgid ""
 "It lets other people thinking about working on the package know that there "
 "already is a volunteer, so efforts may be shared."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid ""
 "It lets other people thinking about working on the package know that there "
 "already is a volunteer, so efforts may be shared."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:73
+#: pkgs.dbk:77

 msgid ""
 "It lets the rest of the maintainers know more about the package than the one "
 "line description and the usual changelog entry ``Initial release'' that gets "
 msgid ""
 "It lets the rest of the maintainers know more about the package than the one "
 "line description and the usual changelog entry ``Initial release'' that gets "

-"posted to <literal>debian-devel-changes</literal>."
+"posted to &email-debian-devel-changes;."

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

-#: pkgs.dbk:80
+#: pkgs.dbk:84

 msgid ""
 msgid ""

-"It is helpful to the people who live off unstable (and form our first line "
-"of testers).  We should encourage these people."
+"It is helpful to the people who live off <literal>unstable</literal> (and "
+"form our first line of testers).  We should encourage these people."

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

-#: pkgs.dbk:86
+#: pkgs.dbk:90

 msgid ""
 "The announcements give maintainers and other interested parties a better "
 "feel of what is going on, and what is new, in the project."
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid ""
 "The announcements give maintainers and other interested parties a better "
 "feel of what is going on, and what is new, in the project."
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:92
+#: pkgs.dbk:96

 msgid ""
 "Please see <ulink url=\"http://&ftp-master-host;/REJECT-FAQ.html\"></ulink> "
 "for common rejection reasons for a new package."
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgid ""
 "Please see <ulink url=\"http://&ftp-master-host;/REJECT-FAQ.html\"></ulink> "
 "for common rejection reasons for a new package."
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: pkgs.dbk:98
+#: pkgs.dbk:102

 msgid "Recording changes in the package"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "Recording changes in the package"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:100
+#: pkgs.dbk:104

 msgid ""
 "Changes that you make to the package need to be recorded in the "
 "<filename>debian/changelog</filename>.  These changes should provide a "
 msgid ""
 "Changes that you make to the package need to be recorded in the "
 "<filename>debian/changelog</filename>.  These changes should provide a "


@@ -159,18 +163,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:111
+#: pkgs.dbk:115

 msgid ""
 "The <filename>debian/changelog</filename> file conforms to a certain "
 "structure, with a number of different fields.  One field of note, the "
 msgid ""
 "The <filename>debian/changelog</filename> file conforms to a certain "
 "structure, with a number of different fields.  One field of note, the "

-"<emphasis>distribution</emphasis>, is described in <xref linkend="
-"\"distribution\"/> .  More information about the structure of this file can "
-"be found in the Debian Policy section titled <filename>debian/changelog</"
-"filename>."
+"<literal>distribution</literal>, is described in <xref linkend=\"distribution"
+"\"/> .  More information about the structure of this file can be found in "
+"the Debian Policy section titled <filename>debian/changelog</filename>."

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

-#: pkgs.dbk:119
+#: pkgs.dbk:123

 msgid ""
 "Changelog entries can be used to automatically close Debian bugs when the "
 "package is installed into the archive.  See <xref linkend=\"upload-bugfix\"/"
 msgid ""
 "Changelog entries can be used to automatically close Debian bugs when the "
 "package is installed into the archive.  See <xref linkend=\"upload-bugfix\"/"


@@ -178,20 +181,22 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:123
+#: pkgs.dbk:127

 msgid ""
 "It is conventional that the changelog entry of a package that contains a new "
 "upstream version of the software looks like this:"
 msgstr ""
 
 # type: Content of: <chapter><section><screen>
 msgid ""
 "It is conventional that the changelog entry of a package that contains a new "
 "upstream version of the software looks like this:"
 msgstr ""
 
 # type: Content of: <chapter><section><screen>

-#: pkgs.dbk:127
+#: pkgs.dbk:130

 #, no-wrap
 #, no-wrap

-msgid "* new upstream version"
+msgid ""
+"\n"
+"  * new upstream version\n"

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

-#: pkgs.dbk:130
+#: pkgs.dbk:134

 msgid ""
 "There are tools to help you create entries and finalize the "
 "<filename>changelog</filename> for release — see <xref linkend=\"devscripts"
 msgid ""
 "There are tools to help you create entries and finalize the "
 "<filename>changelog</filename> for release — see <xref linkend=\"devscripts"


@@ -199,17 +204,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:135
+#: pkgs.dbk:139

 msgid "See also <xref linkend=\"bpp-debian-changelog\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgid "See also <xref linkend=\"bpp-debian-changelog\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: pkgs.dbk:140
+#: pkgs.dbk:144

 msgid "Testing the package"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "Testing the package"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:142
+#: pkgs.dbk:146

 msgid ""
 "Before you upload your package, you should do basic testing on it.  At a "
 "minimum, you should try the following activities (you'll need to have an "
 msgid ""
 "Before you upload your package, you should do basic testing on it.  At a "
 "minimum, you should try the following activities (you'll need to have an "


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

-#: pkgs.dbk:149
+#: pkgs.dbk:153

 msgid ""
 "Install the package and make sure the software works, or upgrade the package "
 "from an older version to your new version if a Debian package for it already "
 msgid ""
 "Install the package and make sure the software works, or upgrade the package "
 "from an older version to your new version if a Debian package for it already "


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

-#: pkgs.dbk:156
+#: pkgs.dbk:160

 msgid ""
 "Run <command>lintian</command> over the package.  You can run "
 "<command>lintian</command> as follows: <literal>lintian -v "
 msgid ""
 "Run <command>lintian</command> over the package.  You can run "
 "<command>lintian</command> as follows: <literal>lintian -v "


@@ -237,40 +242,40 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:165
+#: pkgs.dbk:169

 msgid ""
 "Normally, a package should <emphasis>not</emphasis> be uploaded if it causes "
 "lintian to emit errors (they will start with <literal>E</literal>)."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid ""
 "Normally, a package should <emphasis>not</emphasis> be uploaded if it causes "
 "lintian to emit errors (they will start with <literal>E</literal>)."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:169
+#: pkgs.dbk:173

 msgid ""
 "For more information on <command>lintian</command>, see <xref linkend="
 "\"lintian\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid ""
 "For more information on <command>lintian</command>, see <xref linkend="
 "\"lintian\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:175
+#: pkgs.dbk:179

 msgid ""
 "Optionally run <xref linkend=\"debdiff\"/> to analyze changes from an older "
 "version, if one exists."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid ""
 "Optionally run <xref linkend=\"debdiff\"/> to analyze changes from an older "
 "version, if one exists."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:181
+#: pkgs.dbk:185

 msgid ""
 "Downgrade the package to the previous version (if one exists) — this tests "
 "the <filename>postrm</filename> and <filename>prerm</filename> scripts."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid ""
 "Downgrade the package to the previous version (if one exists) — this tests "
 "the <filename>postrm</filename> and <filename>prerm</filename> scripts."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:187
+#: pkgs.dbk:191

 msgid "Remove the package, then reinstall it."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "Remove the package, then reinstall it."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:192
+#: pkgs.dbk:196

 msgid ""
 "Copy the source package in a different directory and try unpacking it and "
 "rebuilding it.  This tests if the package relies on existing files outside "
 msgid ""
 "Copy the source package in a different directory and try unpacking it and "
 "rebuilding it.  This tests if the package relies on existing files outside "


@@ -279,31 +284,31 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: pkgs.dbk:202
+#: pkgs.dbk:206

 msgid "Layout of the source package"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "Layout of the source package"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:204
+#: pkgs.dbk:208

 msgid "There are two types of Debian source packages:"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "There are two types of Debian source packages:"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:209
+#: pkgs.dbk:213

 msgid ""
 msgid ""

-"the so-called <emphasis>native</emphasis> packages, where there is no "
+"the so-called <literal>native</literal> packages, where there is no "

 "distinction between the original sources and the patches applied for Debian"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 "distinction between the original sources and the patches applied for Debian"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:215
+#: pkgs.dbk:219

 msgid ""
 "the (more common) packages where there's an original source tarball file "
 "accompanied by another file that contains the patches applied for Debian"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid ""
 "the (more common) packages where there's an original source tarball file "
 "accompanied by another file that contains the patches applied for Debian"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:221
+#: pkgs.dbk:225

 msgid ""
 "For the native packages, the source package includes a Debian source control "
 "file (<literal>.dsc</literal>) and the source tarball (<literal>.tar.gz</"
 msgid ""
 "For the native packages, the source package includes a Debian source control "
 "file (<literal>.dsc</literal>) and the source tarball (<literal>.tar.gz</"


@@ -313,7 +318,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:229
+#: pkgs.dbk:233

 msgid ""
 "Whether a package is native or not is determined when it is built by "
 "<citerefentry> <refentrytitle>dpkg-buildpackage</refentrytitle> "
 msgid ""
 "Whether a package is native or not is determined when it is built by "
 "<citerefentry> <refentrytitle>dpkg-buildpackage</refentrytitle> "


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

-#: pkgs.dbk:235
+#: pkgs.dbk:239

 msgid ""
 "The first time a version is uploaded which corresponds to a particular "
 "upstream version, the original source tar file should be uploaded and "
 msgid ""
 "The first time a version is uploaded which corresponds to a particular "
 "upstream version, the original source tar file should be uploaded and "


@@ -332,7 +337,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:242
+#: pkgs.dbk:246

 msgid ""
 "By default, <command>dpkg-genchanges</command> and <command>dpkg-"
 "buildpackage</command> will include the original source tar file if and only "
 msgid ""
 "By default, <command>dpkg-genchanges</command> and <command>dpkg-"
 "buildpackage</command> will include the original source tar file if and only "


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

-#: pkgs.dbk:250
+#: pkgs.dbk:254

 msgid ""
 "If no original source is included in the upload, the original source tar-"
 "file used by <command>dpkg-source</command> when constructing the <filename>."
 msgid ""
 "If no original source is included in the upload, the original source tar-"
 "file used by <command>dpkg-source</command> when constructing the <filename>."


@@ -352,7 +357,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:257
+#: pkgs.dbk:261

 msgid ""
 "Please notice that, in non-native packages, permissions on files that are "
 "not present in the .orig.tar.gz will not be preserved, as diff does not "
 msgid ""
 "Please notice that, in non-native packages, permissions on files that are "
 "not present in the .orig.tar.gz will not be preserved, as diff does not "


@@ -360,12 +365,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: pkgs.dbk:264
+#: pkgs.dbk:268

 msgid "Picking a distribution"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "Picking a distribution"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:266
+#: pkgs.dbk:270

 msgid ""
 "Each upload needs to specify which distribution the package is intended "
 "for.  The package build process extracts this information from the first "
 msgid ""
 "Each upload needs to specify which distribution the package is intended "
 "for.  The package build process extracts this information from the first "


@@ -375,154 +380,160 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:272
+#: pkgs.dbk:276

 msgid ""
 msgid ""

-"There are several possible values for this field: `stable', `unstable', "
-"`testing-proposed-updates' and `experimental'.  Normally, packages are "
-"uploaded into <emphasis>unstable</emphasis>."
+"There are several possible values for this field: <literal>stable</literal>, "
+"<literal>unstable</literal>, <literal>testing-proposed-updates</literal> and "
+"<literal>experimental</literal>.  Normally, packages are uploaded into "
+"<literal>unstable</literal>."

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

-#: pkgs.dbk:277
+#: pkgs.dbk:282

 msgid ""
 msgid ""

-"Actually, there are two other possible distributions: `stable-security' and "
-"`testing-security', but read <xref linkend=\"bug-security\"/> for more "
-"information on those."
+"Actually, there are two other possible distributions: <literal>stable-"
+"security </literal> and <literal>testing-security</literal>, but read <xref "
+"linkend=\"bug-security\"/> for more information on those."

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

-#: pkgs.dbk:282
+#: pkgs.dbk:287

 msgid ""
 "It is not possible to upload a package into several distributions at the "
 "same time."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "It is not possible to upload a package into several distributions at the "
 "same time."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:286
-msgid "Special case: uploads to the <emphasis>stable</emphasis> distribution"
+#: pkgs.dbk:291
+msgid ""
+"Special case: uploads to the <literal>stable</literal> and "
+"<literal>oldstable</literal> distributions"

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

-#: pkgs.dbk:288
+#: pkgs.dbk:294

 msgid ""
 msgid ""

-"Uploading to <emphasis>stable</emphasis> means that the package will "
-"transfered to the <emphasis>p-u-new</emphasis>-queue for review by the "
-"stable release managers, and if approved will be installed in "
+"Uploading to <literal>stable</literal> means that the package will "
+"transfered to the <literal>proposed-updates-new</literal> queue for review "
+"by the stable release managers, and if approved will be installed in "

 "<filename>stable-proposed-updates</filename> directory of the Debian "
 "<filename>stable-proposed-updates</filename> directory of the Debian "

-"archive.  From there, it will be included in <emphasis>stable</emphasis> "
-"with the next point release."
+"archive.  From there, it will be included in <literal>stable</literal> with "
+"the next point release."
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:302
+msgid ""
+"To ensure that your upload will be accepted, you should discuss the changes "
+"with the stable release team before you upload. For that, send a mail to the "
+"&email-debian-release; mailing list, including the patch you want to apply "
+"to the package version currently in <literal>stable</literal>. Always be "
+"verbose and detailed in your changelog entries for uploads to the "
+"<literal>stable</literal> distribution."

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

-#: pkgs.dbk:296
+#: pkgs.dbk:310

 msgid ""
 msgid ""

-"Extra care should be taken when uploading to <emphasis>stable</emphasis>.  "
-"Basically, a package should only be uploaded to stable if one of the "
-"following happens:"
+"Extra care should be taken when uploading to <literal>stable</literal>.  "
+"Basically, a package should only be uploaded to <literal>stable</literal> if "
+"one of the following happens:"

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

-#: pkgs.dbk:303
+#: pkgs.dbk:317

 msgid "a truly critical functionality problem"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "a truly critical functionality problem"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:308
+#: pkgs.dbk:322

 msgid "the package becomes uninstallable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "the package becomes uninstallable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:313
+#: pkgs.dbk:327

 msgid "a released architecture lacks the package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "a released architecture lacks the package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:318
+#: pkgs.dbk:332

 msgid ""
 msgid ""

-"In the past, uploads to <emphasis>stable</emphasis> were used to address "
+"In the past, uploads to <literal>stable</literal> were used to address "

 "security problems as well.  However, this practice is deprecated, as uploads "
 "used for Debian security advisories are automatically copied to the "
 "appropriate <filename>proposed-updates</filename> archive when the advisory "
 "is released.  See <xref linkend=\"bug-security\"/> for detailed information "
 "security problems as well.  However, this practice is deprecated, as uploads "
 "used for Debian security advisories are automatically copied to the "
 "appropriate <filename>proposed-updates</filename> archive when the advisory "
 "is released.  See <xref linkend=\"bug-security\"/> for detailed information "

-"on handling security problems."
+"on handling security problems. If the security teams deems the problem to be "
+"too benign to be fixed through a <literal>DSA</literal>, the stable release "
+"managers are usually willing to include your fix nonetheless in a regular "
+"upload to <literal>stable</literal>."

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

-#: pkgs.dbk:326
+#: pkgs.dbk:343

 msgid ""
 "Changing anything else in the package that isn't important is discouraged, "
 "because even trivial fixes can cause bugs later on."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "Changing anything else in the package that isn't important is discouraged, "
 "because even trivial fixes can cause bugs later on."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:330
+#: pkgs.dbk:347

 msgid ""
 msgid ""

-"Packages uploaded to <emphasis>stable</emphasis> need to be compiled on "
-"systems running <emphasis>stable</emphasis>, so that their dependencies are "
-"limited to the libraries (and other packages) available in <emphasis>stable</"
-"emphasis>; for example, a package uploaded to <emphasis>stable</emphasis> "
-"that depends on a library package that only exists in unstable will be "
-"rejected.  Making changes to dependencies of other packages (by messing with "
-"<literal>Provides</literal> or shlibs files), possibly making those other "
-"packages uninstallable, is strongly discouraged."
+"Packages uploaded to <literal>stable</literal> need to be compiled on "
+"systems running <literal>stable</literal>, so that their dependencies are "
+"limited to the libraries (and other packages) available in <literal>stable</"
+"literal>; for example, a package uploaded to <literal>stable</literal> that "
+"depends on a library package that only exists in <literal>unstable</literal> "
+"will be rejected.  Making changes to dependencies of other packages (by "
+"messing with <literal>Provides</literal> or <literal>shlibs</literal> "
+"files), possibly making those other packages uninstallable, is strongly "
+"discouraged."

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

-#: pkgs.dbk:340
-msgid ""
-"The Release Team (which can be reached at &email-debian-release;) will "
-"regularly evaluate the uploads To <emphasis>stable-proposed-updates</"
-"emphasis> and decide if your package can be included in <emphasis>stable</"
-"emphasis>.  Please be clear (and verbose, if necessary) in your changelog "
-"entries for uploads to <emphasis>stable</emphasis>, because otherwise the "
-"package won't be considered for inclusion."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:349
+#: pkgs.dbk:357

 msgid ""
 msgid ""

-"It's best practice to speak with the stable release manager "
-"<emphasis>before</emphasis> uploading to <emphasis>stable</emphasis>/"
-"<emphasis>stable-proposed-updates</emphasis>, so that the uploaded package "
-"fits the needs of the next point release."
+"Uploads to the <literal>oldstable</literal> distributions are possible as "
+"long as it hasn't been archived. The same rules as for <literal>stable </"
+"literal> apply."

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

-#: pkgs.dbk:357
+#: pkgs.dbk:364

 msgid ""
 msgid ""

-"Special case: uploads to <emphasis>testing/testing-proposed-updates</"
-"emphasis>"
+"Special case: uploads to <literal>testing/testing-proposed-updates</literal>"

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

-#: pkgs.dbk:359
+#: pkgs.dbk:366

 msgid ""
 "Please see the information in the <link linkend=\"t-p-u\">testing section</"
 "link> for details."
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgid ""
 "Please see the information in the <link linkend=\"t-p-u\">testing section</"
 "link> for details."
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: pkgs.dbk:367
+#: pkgs.dbk:374

 msgid "Uploading a package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid "Uploading a package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:369
+#: pkgs.dbk:376

 msgid "Uploading to <literal>ftp-master</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Uploading to <literal>ftp-master</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:371
+#: pkgs.dbk:378

 msgid ""
 "To upload a package, you should upload the files (including the signed "
 "changes and dsc-file) with anonymous ftp to <literal>&ftp-master-host;</"
 "literal> in the directory <ulink url=\"ftp://&ftp-master-host;&upload-queue;"
 "\">&upload-queue;</ulink>.  To get the files processed there, they need to "
 msgid ""
 "To upload a package, you should upload the files (including the signed "
 "changes and dsc-file) with anonymous ftp to <literal>&ftp-master-host;</"
 "literal> in the directory <ulink url=\"ftp://&ftp-master-host;&upload-queue;"
 "\">&upload-queue;</ulink>.  To get the files processed there, they need to "

-"be signed with a key in the debian keyring."
+"be signed with a key in the Debian Developers keyring or the Debian "
+"Maintainers keyring (see <ulink url=\"&url-wiki-dm;\"></ulink>)."

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

-#: pkgs.dbk:379
+#: pkgs.dbk:387

 msgid ""
 "Please note that you should transfer the changes file last.  Otherwise, your "
 "upload may be rejected because the archive maintenance software will parse "
 msgid ""
 "Please note that you should transfer the changes file last.  Otherwise, your "
 "upload may be rejected because the archive maintenance software will parse "


@@ -530,7 +541,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:384
+#: pkgs.dbk:392

 msgid ""
 "You may also find the Debian packages <xref linkend=\"dupload\"/> or <xref "
 "linkend=\"dput\"/> useful when uploading packages.  These handy programs "
 msgid ""
 "You may also find the Debian packages <xref linkend=\"dupload\"/> or <xref "
 "linkend=\"dput\"/> useful when uploading packages.  These handy programs "


@@ -538,101 +549,95 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:389
+#: pkgs.dbk:397

 msgid ""
 "For removing packages, please see the README file in that ftp directory, and "
 "the Debian package <xref linkend=\"dcut\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "For removing packages, please see the README file in that ftp directory, and "
 "the Debian package <xref linkend=\"dcut\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:395
-msgid "Uploading to <literal>non-US</literal>"
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:397
-msgid ""
-"<emphasis>Note:</emphasis> non-us was discontinued with the release of sarge."
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:402
+#: pkgs.dbk:403

 msgid "Delayed uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Delayed uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:404
+#: pkgs.dbk:405

 msgid ""
 msgid ""

-"Delayed uploads are done for the moment via the delayed queue at gluck.  The "
-"upload-directory is <literal>gluck:~tfheen/DELAYED/[012345678]-day</"
-"literal>.  0-day is uploaded multiple times per day to ftp-master."
+"Delayed uploads are done for the moment via the delayed queue at "
+"<literal>gluck </literal>. The upload-directory is <literal>gluck:~tfheen/"
+"DELAYED/[012345678]-day</literal>. 0-day is uploaded multiple times per day "
+"to <literal>&ftp-master-host;</literal>."

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

-#: pkgs.dbk:409
+#: pkgs.dbk:411

 msgid "With a fairly recent dput, this section"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgid "With a fairly recent dput, this section"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:412
+#: pkgs.dbk:413

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

+"\n"

 "[tfheen_delayed]\n"
 "method = scp\n"
 "fqdn = gluck.debian.org\n"
 "[tfheen_delayed]\n"
 "method = scp\n"
 "fqdn = gluck.debian.org\n"

-"incoming = ~tfheen"
+"incoming = ~tfheen\n"

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

-#: pkgs.dbk:418
-msgid "in ~/.dput.cf should work fine for uploading to the DELAYED queue."
+#: pkgs.dbk:420
+msgid ""
+"in <filename>~/.dput.cf</filename> should work fine for uploading to the "
+"<literal>DELAYED</literal> queue."

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

-#: pkgs.dbk:421
+#: pkgs.dbk:424

 msgid ""
 msgid ""

-"<emphasis>Note:</emphasis> Since this upload queue goes to <literal>ftp-"
-"master</literal>, the prescription found in <xref linkend=\"upload-ftp-master"
-"\"/> applies here as well."
+"<emphasis>Note:</emphasis> Since this upload queue goes to <literal>&ftp-"
+"master-host;</literal>, the prescription found in <xref linkend=\"upload-ftp-"
+"master\"/> applies here as well."

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

-#: pkgs.dbk:428
+#: pkgs.dbk:431

 msgid "Security uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Security uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:430
+#: pkgs.dbk:433

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "

-"upload queue (oldstable-security, stable-security, etc.) without prior "
-"authorization from the security team.  If the package does not exactly meet "
-"the team's requirements, it will cause many problems and delays in dealing "
-"with the unwanted upload.  For details, please see section <xref linkend="
-"\"bug-security\"/> ."
+"upload queue (<literal>oldstable-security</literal>, <literal>stable-"
+"security </literal>, etc.) without prior authorization from the security "
+"team.  If the package does not exactly meet the team's requirements, it will "
+"cause many problems and delays in dealing with the unwanted upload.  For "
+"details, please see section <xref linkend=\"bug-security\"/> ."

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

-#: pkgs.dbk:440
+#: pkgs.dbk:443

 msgid "Other upload queues"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Other upload queues"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:442
+#: pkgs.dbk:445

 msgid ""
 msgid ""

-"The scp queues on ftp-master, and security are mostly unusable due to the "
-"login restrictions on those hosts."
+"The scp queues on <literal>&ftp-master-host;</literal>, and <literal> "
+"security.debian.org</literal> are mostly unusable due to the login "
+"restrictions on those hosts."

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

-#: pkgs.dbk:446
+#: pkgs.dbk:450

 msgid ""
 "The anonymous queues on ftp.uni-erlangen.de and ftp.uk.debian.org are "
 "currently down.  Work is underway to resurrect them."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "The anonymous queues on ftp.uni-erlangen.de and ftp.uk.debian.org are "
 "currently down.  Work is underway to resurrect them."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:450
+#: pkgs.dbk:454

 msgid ""
 "The queues on master.debian.org, samosa.debian.org, master.debian.or.jp, and "
 "ftp.chiark.greenend.org.uk are down permanently, and will not be "
 msgid ""
 "The queues on master.debian.org, samosa.debian.org, master.debian.or.jp, and "
 "ftp.chiark.greenend.org.uk are down permanently, and will not be "


@@ -640,30 +645,22 @@ msgid ""
 "debian.or.jp some day."
 msgstr ""
 
 "debian.or.jp some day."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:456
-msgid ""
-"For the time being, the anonymous ftp queue on auric.debian.org (the former "
-"ftp-master) works, but it is deprecated and will be removed at some point in "
-"the future."
-msgstr ""
-

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

-#: pkgs.dbk:463
+#: pkgs.dbk:462

 msgid "Notification that a new package has been installed"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Notification that a new package has been installed"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:465
+#: pkgs.dbk:464

 msgid ""
 "The Debian archive maintainers are responsible for handling package "
 "uploads.  For the most part, uploads are automatically handled on a daily "
 "basis by the archive maintenance tools, <command>katie</command>.  "
 msgid ""
 "The Debian archive maintainers are responsible for handling package "
 "uploads.  For the most part, uploads are automatically handled on a daily "
 "basis by the archive maintenance tools, <command>katie</command>.  "

-"Specifically, updates to existing packages to the `unstable' distribution "
-"are handled automatically.  In other cases, notably new packages, placing "
-"the uploaded package into the distribution is handled manually.  When "
-"uploads are handled manually, the change to the archive may take up to a "
-"month to occur.  Please be patient."
+"Specifically, updates to existing packages to the <literal>unstable</"
+"literal> distribution are handled automatically.  In other cases, notably "
+"new packages, placing the uploaded package into the distribution is handled "
+"manually.  When uploads are handled manually, the change to the archive may "
+"take up to a month to occur.  Please be patient."

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


@@ -710,13 +707,13 @@ msgstr ""
 #: pkgs.dbk:503
 msgid ""
 "The archive maintainers keep track of the canonical sections and priorities "
 #: pkgs.dbk:503
 msgid ""
 "The archive maintainers keep track of the canonical sections and priorities "

-"for packages in the <emphasis>override file</emphasis>.  If there is a "
-"disparity between the <emphasis>override file</emphasis> and the package's "
+"for packages in the <literal>override file</literal>.  If there is a "
+"disparity between the <literal>override file</literal> and the package's "

 "fields as indicated in <filename>debian/control</filename>, then you will "
 "receive an email noting the divergence when the package is installed into "
 "the archive.  You can either correct your <filename>debian/control</"
 "filename> file for your next upload, or else you may wish to make a change "
 "fields as indicated in <filename>debian/control</filename>, then you will "
 "receive an email noting the divergence when the package is installed into "
 "the archive.  You can either correct your <filename>debian/control</"
 "filename> file for your next upload, or else you may wish to make a change "

-"in the <emphasis>override file</emphasis>."
+"in the <literal>override file</literal>."

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


@@ -733,7 +730,7 @@ msgstr ""
 # type: Content of: <chapter><section><para>
 #: pkgs.dbk:521
 msgid ""
 # type: Content of: <chapter><section><para>
 #: pkgs.dbk:521
 msgid ""

-"For more information about <emphasis>override files</emphasis>, see "
+"For more information about <literal>override files</literal>, see "

 "<citerefentry> <refentrytitle>dpkg-scanpackages</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> and <ulink url=\"&url-bts-devel;"
 "#maintincorrect\"></ulink>."
 "<citerefentry> <refentrytitle>dpkg-scanpackages</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> and <ulink url=\"&url-bts-devel;"
 "#maintincorrect\"></ulink>."


@@ -816,11 +813,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:579
+#: pkgs.dbk:578

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

+"\n"

 "# ask for weekly reports of bugs in my packages\n"
 "# ask for weekly reports of bugs in my packages\n"

-"&cron-bug-report;"
+"&cron-bug-report;\n"

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


@@ -858,7 +856,7 @@ msgstr ""
 #: pkgs.dbk:604
 msgid ""
 "Once you've dealt with a bug report (e.g.  fixed it), mark it as "
 #: pkgs.dbk:604
 msgid ""
 "Once you've dealt with a bug report (e.g.  fixed it), mark it as "

-"<emphasis>done</emphasis> (close it) by sending an explanation message to "
+"<literal>done</literal> (close it) by sending an explanation message to "

 "<email>123-done@&bugs-host;</email>.  If you're fixing a bug by changing and "
 "uploading the package, you can automate bug closing as described in <xref "
 "linkend=\"upload-bugfix\"/> ."
 "<email>123-done@&bugs-host;</email>.  If you're fixing a bug by changing and "
 "uploading the package, you can automate bug closing as described in <xref "
 "linkend=\"upload-bugfix\"/> ."


@@ -939,13 +937,28 @@ msgid ""
 "If the bug is real but it's caused by another package, just reassign the bug "
 "to the right package.  If you don't know which package it should be "
 "reassigned to, you should ask for help on <link linkend=\"irc-channels"
 "If the bug is real but it's caused by another package, just reassign the bug "
 "to the right package.  If you don't know which package it should be "
 "reassigned to, you should ask for help on <link linkend=\"irc-channels"

-"\">IRC</link> or on &email-debian-devel;.  Please make sure that the "
-"maintainer(s) of the package the bug is reassigned to know why you "
-"reassigned it."
+"\">IRC</link> or on &email-debian-devel;.  Please inform the maintainer(s) "
+"of the package you reassign the bug to, for example by Cc:ing the message "
+"that does the reassign to <email>packagename@packages.debian.org</email> and "
+"explaining your reasons in that mail. Please note that a simple reassignment "
+"is <emphasis>not</emphasis> e-mailed to the maintainers of the package being "
+"reassigned to, so they won't know about it until they look at a bug overview "
+"for their packages."
+msgstr ""
+
+# type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:678
+msgid ""
+"If the bug affects the operation of your package, please consider cloning "
+"the bug and reassigning the clone to the package that really causes the "
+"behavior. Otherwise, the bug will not be shown in your package's bug list, "
+"possibly causing users to report the same bug over and over again. You "
+"should block \"your\" bug with the reassigned, cloned bug to document the "
+"relationship."

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

-#: pkgs.dbk:674
+#: pkgs.dbk:688

 msgid ""
 "Sometimes you also have to adjust the severity of the bug so that it matches "
 "our definition of the severity.  That's because people tend to inflate the "
 msgid ""
 "Sometimes you also have to adjust the severity of the bug so that it matches "
 "our definition of the severity.  That's because people tend to inflate the "


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

-#: pkgs.dbk:682
+#: pkgs.dbk:696

 msgid ""
 "If the bug is real but the same problem has already been reported by someone "
 "else, then the two relevant bug reports should be merged into one using the "
 msgid ""
 "If the bug is real but the same problem has already been reported by someone "
 "else, then the two relevant bug reports should be merged into one using the "


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

-#: pkgs.dbk:693
+#: pkgs.dbk:707

 msgid ""
 "The bug submitter may have forgotten to provide some information, in which "
 "case you have to ask them for the required information.  You may use the "
 msgid ""
 "The bug submitter may have forgotten to provide some information, in which "
 "case you have to ask them for the required information.  You may use the "


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

-#: pkgs.dbk:704
+#: pkgs.dbk:718

 msgid ""
 "If the bug is related to the packaging, you just fix it.  If you are not "
 "able to fix it yourself, then tag the bug as <literal>help</literal>.  You "
 msgid ""
 "If the bug is related to the packaging, you just fix it.  If you are not "
 "able to fix it yourself, then tag the bug as <literal>help</literal>.  You "


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

-#: pkgs.dbk:718
+#: pkgs.dbk:732

 msgid ""
 "If you have fixed a bug in your local copy, or if a fix has been committed "
 "to the CVS repository, you may tag the bug as <literal>pending</literal> to "
 msgid ""
 "If you have fixed a bug in your local copy, or if a fix has been committed "
 "to the CVS repository, you may tag the bug as <literal>pending</literal> to "


@@ -1005,20 +1018,20 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:728
+#: pkgs.dbk:742

 msgid ""
 msgid ""

-"Once a corrected package is available in the <emphasis>unstable</emphasis> "
-"distribution, you can close the bug.  This can be done automatically, read "
-"<xref linkend=\"upload-bugfix\"/> ."
+"Once a corrected package is available in the archive, the bug should be "
+"closed indicating the version in which it was fixed. This can be done "
+"automatically, read <xref linkend=\"upload-bugfix\"/>."

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

-#: pkgs.dbk:737
+#: pkgs.dbk:751

 msgid "When bugs are closed by new uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "When bugs are closed by new uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:739
+#: pkgs.dbk:753

 msgid ""
 "As bugs and problems are fixed in your packages, it is your responsibility "
 "as the package maintainer to close these bugs.  However, you should not "
 msgid ""
 "As bugs and problems are fixed in your packages, it is your responsibility "
 "as the package maintainer to close these bugs.  However, you should not "


@@ -1029,7 +1042,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:747
+#: pkgs.dbk:761

 msgid ""
 "However, it's possible to avoid having to manually close bugs after the "
 "upload — just list the fixed bugs in your <filename>debian/changelog</"
 msgid ""
 "However, it's possible to avoid having to manually close bugs after the "
 "upload — just list the fixed bugs in your <filename>debian/changelog</"


@@ -1038,32 +1051,35 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:753
+#: pkgs.dbk:766

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

+"\n"

 "acme-cannon (3.1415) unstable; urgency=low\n"
 "\n"
 "  * Frobbed with options (closes: Bug#98339)\n"
 "  * Added safety to prevent operator dismemberment, closes: bug#98765,\n"
 "    bug#98713, #98714.\n"
 "acme-cannon (3.1415) unstable; urgency=low\n"
 "\n"
 "  * Frobbed with options (closes: Bug#98339)\n"
 "  * Added safety to prevent operator dismemberment, closes: bug#98765,\n"
 "    bug#98713, #98714.\n"

-"  * Added man page. Closes: #98725."
+"  * Added man page. Closes: #98725.\n"

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

-#: pkgs.dbk:761
+#: pkgs.dbk:775

 msgid ""
 "Technically speaking, the following Perl regular expression describes how "
 "bug closing changelogs are identified:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgid ""
 "Technically speaking, the following Perl regular expression describes how "
 "bug closing changelogs are identified:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:765
+#: pkgs.dbk:778

 #, no-wrap
 #, no-wrap

-msgid "/closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig"
+msgid ""
+"\n"
+"  /closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig\n"

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

-#: pkgs.dbk:768
+#: pkgs.dbk:782

 msgid ""
 "We prefer the <literal>closes: #<replaceable>XXX</replaceable></literal> "
 "syntax, as it is the most concise entry and the easiest to integrate with "
 msgid ""
 "We prefer the <literal>closes: #<replaceable>XXX</replaceable></literal> "
 "syntax, as it is the most concise entry and the easiest to integrate with "


@@ -1075,7 +1091,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:777
+#: pkgs.dbk:791

 msgid ""
 "Historically, uploads identified as <link linkend=\"nmu\">Non-maintainer "
 "upload (NMU)</link> were tagged <literal>fixed</literal> instead of being "
 msgid ""
 "Historically, uploads identified as <link linkend=\"nmu\">Non-maintainer "
 "upload (NMU)</link> were tagged <literal>fixed</literal> instead of being "


@@ -1084,7 +1100,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:783
+#: pkgs.dbk:797

 msgid ""
 "If you happen to mistype a bug number or forget a bug in the changelog "
 "entries, don't hesitate to undo any damage the error caused.  To reopen "
 msgid ""
 "If you happen to mistype a bug number or forget a bug in the changelog "
 "entries, don't hesitate to undo any damage the error caused.  To reopen "


@@ -1099,7 +1115,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:795
+#: pkgs.dbk:809

 msgid ""
 "Bear in mind that it is not obligatory to close bugs using the changelog as "
 "described above.  If you simply want to close bugs that don't have anything "
 msgid ""
 "Bear in mind that it is not obligatory to close bugs using the changelog as "
 "described above.  If you simply want to close bugs that don't have anything "


@@ -1110,54 +1126,54 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:803
+#: pkgs.dbk:817

 msgid ""
 "For general information on how to write your changelog entries, see <xref "
 "linkend=\"bpp-debian-changelog\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "For general information on how to write your changelog entries, see <xref "
 "linkend=\"bpp-debian-changelog\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:809
+#: pkgs.dbk:823

 msgid "Handling security-related bugs"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Handling security-related bugs"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:811
+#: pkgs.dbk:825

 msgid ""
 "Due to their sensitive nature, security-related bugs must be handled "
 "carefully.  The Debian Security Team exists to coordinate this activity, "
 "keeping track of outstanding security problems, helping maintainers with "
 "security problems or fixing them themselves, sending security advisories, "
 msgid ""
 "Due to their sensitive nature, security-related bugs must be handled "
 "carefully.  The Debian Security Team exists to coordinate this activity, "
 "keeping track of outstanding security problems, helping maintainers with "
 "security problems or fixing them themselves, sending security advisories, "

-"and maintaining security.debian.org."
+"and maintaining <literal>security.debian.org</literal>."

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

-#: pkgs.dbk:820
+#: pkgs.dbk:834

 msgid ""
 "When you become aware of a security-related bug in a Debian package, whether "
 "or not you are the maintainer, collect pertinent information about the "
 "problem, and promptly contact the security team at &email-security-team; as "
 "soon as possible.  <emphasis role=\"strong\">DO NOT UPLOAD</emphasis> any "
 msgid ""
 "When you become aware of a security-related bug in a Debian package, whether "
 "or not you are the maintainer, collect pertinent information about the "
 "problem, and promptly contact the security team at &email-security-team; as "
 "soon as possible.  <emphasis role=\"strong\">DO NOT UPLOAD</emphasis> any "

-"packages for stable; the security team will do that.  Useful information "
-"includes, for example:"
+"packages for <literal>stable</literal>; the security team will do that.  "
+"Useful information includes, for example:"

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

-#: pkgs.dbk:830
+#: pkgs.dbk:844

 msgid ""
 "Which versions of the package are known to be affected by the bug.  Check "
 "each version that is present in a supported Debian release, as well as "
 msgid ""
 "Which versions of the package are known to be affected by the bug.  Check "
 "each version that is present in a supported Debian release, as well as "

-"testing and unstable."
+"<literal>testing</literal> and <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:837
+#: pkgs.dbk:851

 msgid ""
 "The nature of the fix, if any is available (patches are especially helpful)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "The nature of the fix, if any is available (patches are especially helpful)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:842
+#: pkgs.dbk:856

 msgid ""
 "Any fixed packages that you have prepared yourself (send only the <literal>."
 "diff.gz</literal> and <literal>.dsc</literal> files and read <xref linkend="
 msgid ""
 "Any fixed packages that you have prepared yourself (send only the <literal>."
 "diff.gz</literal> and <literal>.dsc</literal> files and read <xref linkend="


@@ -1165,26 +1181,26 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:849
+#: pkgs.dbk:863

 msgid ""
 "Any assistance you can provide to help with testing (exploits, regression "
 "testing, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "Any assistance you can provide to help with testing (exploits, regression "
 "testing, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:855
+#: pkgs.dbk:869

 msgid ""
 "Any information needed for the advisory (see <xref linkend=\"bug-security-"
 "advisories\"/> )"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgid ""
 "Any information needed for the advisory (see <xref linkend=\"bug-security-"
 "advisories\"/> )"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:861
+#: pkgs.dbk:875

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

-#: pkgs.dbk:863
+#: pkgs.dbk:877

 msgid ""
 "Unlike most other activities within Debian, information about security "
 "issues must sometimes be kept private for a time.  This allows software "
 msgid ""
 "Unlike most other activities within Debian, information about security "
 "issues must sometimes be kept private for a time.  This allows software "


@@ -1195,27 +1211,27 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:870
+#: pkgs.dbk:884

 msgid "There are several ways developers can learn of a security problem:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "There are several ways developers can learn of a security problem:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:875
+#: pkgs.dbk:889

 msgid "they notice it on a public forum (mailing list, web site, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "they notice it on a public forum (mailing list, web site, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:880
+#: pkgs.dbk:894

 msgid "someone files a bug report"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "someone files a bug report"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:885
+#: pkgs.dbk:899

 msgid "someone informs them via private email"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "someone informs them via private email"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:890
+#: pkgs.dbk:904

 msgid ""
 "In the first two cases, the information is public and it is important to "
 "have a fix as soon as possible.  In the last case, however, it might not be "
 msgid ""
 "In the first two cases, the information is public and it is important to "
 "have a fix as soon as possible.  In the last case, however, it might not be "


@@ -1224,14 +1240,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:898
+#: pkgs.dbk:912

 msgid ""
 "If the security exposure is minor, there is sometimes no need to keep the "
 "problem a secret and a fix should be made and released."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "If the security exposure is minor, there is sometimes no need to keep the "
 "problem a secret and a fix should be made and released."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:904
+#: pkgs.dbk:918

 msgid ""
 "If the problem is severe, it is preferable to share the information with "
 "other vendors and coordinate a release.  The security team keeps in contact "
 msgid ""
 "If the problem is severe, it is preferable to share the information with "
 "other vendors and coordinate a release.  The security team keeps in contact "


@@ -1239,7 +1255,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:911
+#: pkgs.dbk:925

 msgid ""
 "In all cases if the person who reports the problem asks that it not be "
 "disclosed, such requests should be honored, with the obvious exception of "
 msgid ""
 "In all cases if the person who reports the problem asks that it not be "
 "disclosed, such requests should be honored, with the obvious exception of "


@@ -1249,16 +1265,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:918
+#: pkgs.dbk:932

 msgid ""
 msgid ""

-"Please note that if secrecy is needed you may not upload a fix to unstable "
-"(or anywhere else, such as a public CVS 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."
+"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 "
+"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."

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

-#: pkgs.dbk:924
+#: pkgs.dbk:939

 msgid ""
 "There are two reasons for releasing information even though secrecy is "
 "requested: the problem has been known for a while, or the problem or exploit "
 msgid ""
 "There are two reasons for releasing information even though secrecy is "
 "requested: the problem has been known for a while, or the problem or exploit "


@@ -1266,77 +1283,78 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:931
+#: pkgs.dbk:946

 msgid "Security Advisories"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Security Advisories"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:933
+#: pkgs.dbk:948

 msgid ""
 "Security advisories are only issued for the current, released stable "
 msgid ""
 "Security advisories are only issued for the current, released stable "

-"distribution, and <emphasis>not</emphasis> for testing or unstable.  When "
-"released, advisories are sent to the &email-debian-security-announce; "
-"mailing list and posted on <ulink url=\"&url-debian-security-advisories;"
-"\">the security web page</ulink>.  Security advisories are written and "
-"posted by the security team.  However they certainly do not mind if a "
-"maintainer can supply some of the information for them, or write part of the "
-"text.  Information that should be in an advisory includes:"
+"distribution, and <emphasis>not</emphasis> for <literal>testing</literal> or "
+"<literal>unstable</literal>.  When released, advisories are sent to the "
+"&email-debian-security-announce; mailing list and posted on <ulink url="
+"\"&url-debian-security-advisories;\">the security web page</ulink>.  "
+"Security advisories are written and posted by the security team.  However "
+"they certainly do not mind if a maintainer can supply some of the "
+"information for them, or write part of the text.  Information that should be "
+"in an advisory includes:"

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

-#: pkgs.dbk:946
+#: pkgs.dbk:961

 msgid "A description of the problem and its scope, including:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "A description of the problem and its scope, including:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

-#: pkgs.dbk:951
+#: pkgs.dbk:966

 msgid "The type of problem (privilege escalation, denial of service, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "The type of problem (privilege escalation, denial of service, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

-#: pkgs.dbk:956
+#: pkgs.dbk:971

 msgid "What privileges may be gained, and by whom (if any)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "What privileges may be gained, and by whom (if any)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

-#: pkgs.dbk:961
+#: pkgs.dbk:976

 msgid "How it can be exploited"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "How it can be exploited"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

-#: pkgs.dbk:966
+#: pkgs.dbk:981

 msgid "Whether it is remotely or locally exploitable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Whether it is remotely or locally exploitable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

-#: pkgs.dbk:971
+#: pkgs.dbk:986

 msgid "How the problem was fixed"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "How the problem was fixed"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:976
+#: pkgs.dbk:991

 msgid "This information allows users to assess the threat to their systems."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "This information allows users to assess the threat to their systems."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:981
+#: pkgs.dbk:996

 msgid "Version numbers of affected packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "Version numbers of affected packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:986
+#: pkgs.dbk:1001

 msgid "Version numbers of fixed packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "Version numbers of fixed packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:991
+#: pkgs.dbk:1006

 msgid ""
 "Information on where to obtain the updated packages (usually from the Debian "
 "security archive)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "Information on where to obtain the updated packages (usually from the Debian "
 "security archive)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:997
+#: pkgs.dbk:1012

 msgid ""
 "References to upstream advisories, <ulink url=\"http://cve.mitre.org\">CVE</"
 "ulink> identifiers, and any other information useful in cross-referencing "
 msgid ""
 "References to upstream advisories, <ulink url=\"http://cve.mitre.org\">CVE</"
 "ulink> identifiers, and any other information useful in cross-referencing "


@@ -1344,12 +1362,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1006
+#: pkgs.dbk:1021

 msgid "Preparing packages to address security issues"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Preparing packages to address security issues"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1008
+#: pkgs.dbk:1023

 msgid ""
 "One way that you can assist the security team in their duties is to provide "
 "them with fixed packages suitable for a security advisory for the stable "
 msgid ""
 "One way that you can assist the security team in their duties is to provide "
 "them with fixed packages suitable for a security advisory for the stable "


@@ -1357,7 +1375,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1013
+#: pkgs.dbk:1028

 msgid ""
 "When an update is made to the stable release, care must be taken to avoid "
 "changing system behavior or introducing new bugs.  In order to do this, make "
 msgid ""
 "When an update is made to the stable release, care must be taken to avoid "
 "changing system behavior or introducing new bugs.  In order to do this, make "


@@ -1368,7 +1386,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1021
+#: pkgs.dbk:1036

 msgid ""
 "This means that moving to a new upstream version is not a good solution.  "
 "Instead, the relevant changes should be back-ported to the version present "
 msgid ""
 "This means that moving to a new upstream version is not a good solution.  "
 "Instead, the relevant changes should be back-ported to the version present "


@@ -1378,7 +1396,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1027
+#: pkgs.dbk:1042

 msgid ""
 "In some cases, it is not possible to back-port a security fix, for example "
 "when large amounts of source code need to be modified or rewritten.  If this "
 msgid ""
 "In some cases, it is not possible to back-port a security fix, for example "
 "when large amounts of source code need to be modified or rewritten.  If this "


@@ -1388,7 +1406,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1034
+#: pkgs.dbk:1049

 msgid ""
 "Related to this is another important guideline: always test your changes.  "
 "If you have an exploit available, try it and see if it indeed succeeds on "
 msgid ""
 "Related to this is another important guideline: always test your changes.  "
 "If you have an exploit available, try it and see if it indeed succeeds on "


@@ -1398,7 +1416,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1041
+#: pkgs.dbk:1056

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> include any changes in your "
 "package which are not directly related to fixing the vulnerability.  These "
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> include any changes in your "
 "package which are not directly related to fixing the vulnerability.  These "


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

-#: pkgs.dbk:1051
+#: pkgs.dbk:1066

 msgid ""
 "Review and test your changes as much as possible.  Check the differences "
 "from the previous version repeatedly (<command>interdiff</command> from the "
 msgid ""
 "Review and test your changes as much as possible.  Check the differences "
 "from the previous version repeatedly (<command>interdiff</command> from the "


@@ -1421,54 +1439,54 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1059
+#: pkgs.dbk:1074

 msgid "Be sure to verify the following items:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "Be sure to verify the following items:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1064
+#: pkgs.dbk:1079

 msgid ""
 "Target the right distribution in your <filename>debian/changelog</"
 msgid ""
 "Target the right distribution in your <filename>debian/changelog</"

-"filename>.  For stable this is <literal>stable-security</literal> and for "
-"testing this is <literal>testing-security</literal>, and for the previous "
-"stable release, this is <literal>oldstable-security</literal>.  Do not "
-"target <replaceable>distribution</replaceable>-proposed-updates or "
-"<literal>stable</literal>!"
+"filename>.  For <literal>stable</literal> this is <literal>stable-security</"
+"literal> and for testing this is <literal>testing-security</literal>, and "
+"for the previous stable release, this is <literal>oldstable-security</"
+"literal>.  Do not target <replaceable>distribution</replaceable><literal>-"
+"proposed-updates</literal> or <literal>stable</literal>!"

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

-#: pkgs.dbk:1074
+#: pkgs.dbk:1089

 msgid "The upload should have urgency=high."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "The upload should have urgency=high."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1079
+#: pkgs.dbk:1094

 msgid ""
 "Make descriptive, meaningful changelog entries.  Others will rely on them to "
 "determine whether a particular bug was fixed.  Always include an external "
 "reference, preferably a CVE identifier, so that it can be cross-referenced.  "
 msgid ""
 "Make descriptive, meaningful changelog entries.  Others will rely on them to "
 "determine whether a particular bug was fixed.  Always include an external "
 "reference, preferably a CVE identifier, so that it can be cross-referenced.  "

-"Include the same information in the changelog for unstable, so that it is "
-"clear that the same bug was fixed, as this is very helpful when verifying "
-"that the bug is fixed in the next stable release.  If a CVE identifier has "
-"not yet been assigned, the security team will request one so that it can be "
-"included in the package and in the advisory."
+"Include the same information in the changelog for <literal>unstable</"
+"literal>, so that it is clear that the same bug was fixed, as this is very "
+"helpful when verifying that the bug is fixed in the next stable release.  If "
+"a CVE identifier has not yet been assigned, the security team will request "
+"one so that it can be included in the package and in the advisory."

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

-#: pkgs.dbk:1091
+#: pkgs.dbk:1107

 msgid ""
 "Make sure the version number is proper.  It must be greater than the current "
 "package, but less than package versions in later distributions.  If in "
 "doubt, test it with <literal>dpkg --compare-versions</literal>.  Be careful "
 "not to re-use a version number that you have already used for a previous "
 msgid ""
 "Make sure the version number is proper.  It must be greater than the current "
 "package, but less than package versions in later distributions.  If in "
 "doubt, test it with <literal>dpkg --compare-versions</literal>.  Be careful "
 "not to re-use a version number that you have already used for a previous "

-"upload.  For <emphasis>testing</emphasis>, there must be a higher version in "
-"<emphasis>unstable</emphasis>.  If there is none yet (for example, if "
-"<emphasis>testing</emphasis> and <emphasis>unstable</emphasis> have the same "
-"version) you must upload a new version to unstable first."
+"upload.  For <literal>testing</literal>, there must be a higher version in "
+"<literal>unstable</literal>.  If there is none yet (for example, if "
+"<literal>testing</literal> and <literal>unstable</literal> have the same "
+"version) you must upload a new version to <literal>unstable</literal> first."

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

-#: pkgs.dbk:1103
+#: pkgs.dbk:1119

 msgid ""
 "Do not make source-only uploads if your package has any binary-all packages "
 "(do not use the <literal>-S</literal> option to <command>dpkg-buildpackage</"
 msgid ""
 "Do not make source-only uploads if your package has any binary-all packages "
 "(do not use the <literal>-S</literal> option to <command>dpkg-buildpackage</"


@@ -1477,17 +1495,18 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1112
+#: pkgs.dbk:1128

 msgid ""
 msgid ""

-"Unless the upstream source has been uploaded to security.debian.org before "
-"(by a previous security update), build the upload with full upstream source "
-"(<literal>dpkg-buildpackage -sa</literal>).  If there has been a previous "
-"upload to security.debian.org with the same upstream version, you may upload "
-"without upstream source (<literal>dpkg-buildpackage -sd</literal>)."
+"Unless the upstream source has been uploaded to <literal>security.debian.org "
+"</literal> before (by a previous security update), build the upload with "
+"full upstream source (<literal>dpkg-buildpackage -sa</literal>).  If there "
+"has been a previous upload to <literal>security.debian.org</literal> with "
+"the same upstream version, you may upload without upstream source (<literal> "
+"dpkg-buildpackage -sd</literal>)."

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

-#: pkgs.dbk:1121
+#: pkgs.dbk:1138

 msgid ""
 "Be sure to use the exact same <filename>*.orig.tar.gz</filename> as used in "
 "the normal archive, otherwise it is not possible to move the security fix "
 msgid ""
 "Be sure to use the exact same <filename>*.orig.tar.gz</filename> as used in "
 "the normal archive, otherwise it is not possible to move the security fix "


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

-#: pkgs.dbk:1128
+#: pkgs.dbk:1145

 msgid ""
 "Build the package on a clean system which only has packages installed from "
 "the distribution you are building for.  If you do not have such a system "
 msgid ""
 "Build the package on a clean system which only has packages installed from "
 "the distribution you are building for.  If you do not have such a system "


@@ -1505,34 +1524,35 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1139
+#: pkgs.dbk:1156

 msgid "Uploading the fixed package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Uploading the fixed package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1141
+#: pkgs.dbk:1158

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "

-"upload queue (oldstable-security, stable-security, etc.) without prior "
-"authorization from the security team.  If the package does not exactly meet "
-"the team's requirements, it will cause many problems and delays in dealing "
-"with the unwanted upload."
+"upload queue (<literal>oldstable-security</literal>, <literal>stable-"
+"security </literal>, etc.) without prior authorization from the security "
+"team.  If the package does not exactly meet the team's requirements, it will "
+"cause many problems and delays in dealing with the unwanted upload."

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

-#: pkgs.dbk:1148
+#: pkgs.dbk:1165

 msgid ""
 msgid ""

-"Do <emphasis role=\"strong\">NOT</emphasis> upload your fix to proposed-"
-"updates without coordinating with the security team.  Packages from security."
-"debian.org will be copied into the proposed-updates directory "
-"automatically.  If a package with the same or a higher version number is "
-"already installed into the archive, the security update will be rejected by "
-"the archive system.  That way, the stable distribution will end up without a "
-"security update for this package instead."
+"Do <emphasis role=\"strong\">NOT</emphasis> upload your fix to <literal> "
+"proposed-updates</literal> without coordinating with the security team.  "
+"Packages from <literal>security.debian.org</literal> will be copied into the "
+"<literal>proposed-updates</literal> directory automatically.  If a package "
+"with the same or a higher version number is already installed into the "
+"archive, the security update will be rejected by the archive system.  That "
+"way, the stable distribution will end up without a security update for this "
+"package instead."

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

-#: pkgs.dbk:1157
+#: pkgs.dbk:1175

 msgid ""
 "Once you have created and tested the new package and it has been approved by "
 "the security team, it needs to be uploaded so that it can be installed in "
 msgid ""
 "Once you have created and tested the new package and it has been approved by "
 "the security team, it needs to be uploaded so that it can be installed in "


@@ -1542,7 +1562,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1163
+#: pkgs.dbk:1181

 msgid ""
 "Once an upload to the security queue has been accepted, the package will "
 "automatically be rebuilt for all architectures and stored for verification "
 msgid ""
 "Once an upload to the security queue has been accepted, the package will "
 "automatically be rebuilt for all architectures and stored for verification "


@@ -1550,7 +1570,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1168
+#: pkgs.dbk:1186

 msgid ""
 "Uploads which are waiting for acceptance or verification are only accessible "
 "by the security team.  This is necessary since there might be fixes for "
 msgid ""
 "Uploads which are waiting for acceptance or verification are only accessible "
 "by the security team.  This is necessary since there might be fixes for "


@@ -1558,20 +1578,21 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1173
+#: pkgs.dbk:1191

 msgid ""
 "If a member of the security team accepts a package, it will be installed on "
 msgid ""
 "If a member of the security team accepts a package, it will be installed on "

-"security.debian.org as well as proposed for the proper "
-"<replaceable>distribution</replaceable>-proposed-updates on ftp-master."
+"<literal>security.debian.org</literal> as well as proposed for the proper "
+"<replaceable>distribution</replaceable><literal>-proposed-updates</literal> "
+"on <literal>&ftp-master-host;</literal>."

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

-#: pkgs.dbk:1184
+#: pkgs.dbk:1203

 msgid "Moving, removing, renaming, adopting, and orphaning packages"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "Moving, removing, renaming, adopting, and orphaning packages"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:1186
+#: pkgs.dbk:1205

 msgid ""
 "Some archive manipulation operations are not automated in the Debian upload "
 "process.  These procedures should be manually followed by maintainers.  This "
 msgid ""
 "Some archive manipulation operations are not automated in the Debian upload "
 "process.  These procedures should be manually followed by maintainers.  This "


@@ -1579,12 +1600,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1191
+#: pkgs.dbk:1210

 msgid "Moving packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para><footnote>
 msgid "Moving packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para><footnote>

-#: pkgs.dbk:1193
+#: pkgs.dbk:1212

 msgid ""
 "Sometimes a package will change its section.  For instance, a package from "
 "the `non-free' section might be GPL'd in a later version, in which case the "
 msgid ""
 "Sometimes a package will change its section.  For instance, a package from "
 "the `non-free' section might be GPL'd in a later version, in which case the "


@@ -1592,14 +1613,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para><footnote><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para><footnote><para>

-#: pkgs.dbk:1195
+#: pkgs.dbk:1214

 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "guidelines on what section a package belongs in."
 msgstr ""
 
 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "guidelines on what section a package belongs in."
 msgstr ""
 

+# type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1216 pkgs.dbk:1648
+msgid "</footnote>"
+msgstr ""
+

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

-#: pkgs.dbk:1200
+#: pkgs.dbk:1219

 msgid ""
 "If you need to change the section for one of your packages, change the "
 "package control information to place the package in the desired section, and "
 msgid ""
 "If you need to change the section for one of your packages, change the "
 "package control information to place the package in the desired section, and "


@@ -1613,38 +1639,63 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1212
+#: pkgs.dbk:1231

 msgid ""
 msgid ""

-"If, on the other hand, you need to change the <emphasis>subsection</"
-"emphasis> of one of your packages (e.g., ``devel'', ``admin''), the "
-"procedure is slightly different.  Correct the subsection as found in the "
-"control file of the package, and re-upload that.  Also, you'll need to get "
-"the override file updated, as described in <xref linkend=\"override-file\"/"
-"> ."
+"If, on the other hand, you need to change the <literal>subsection</literal> "
+"of one of your packages (e.g., ``devel'', ``admin''), the procedure is "
+"slightly different.  Correct the subsection as found in the control file of "
+"the package, and re-upload that.  Also, you'll need to get the override file "
+"updated, as described in <xref linkend=\"override-file\"/> ."

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

-#: pkgs.dbk:1221
+#: pkgs.dbk:1240

 msgid "Removing packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Removing packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1223
+#: pkgs.dbk:1242

 msgid ""
 "If for some reason you want to completely remove a package (say, if it is an "
 "old compatibility library which is no longer required), you need to file a "
 "bug against <literal>ftp.debian.org</literal> asking that the package be "
 msgid ""
 "If for some reason you want to completely remove a package (say, if it is an "
 "old compatibility library which is no longer required), you need to file a "
 "bug against <literal>ftp.debian.org</literal> asking that the package be "

-"removed; as all bugs, this bug should normally have normal severity.  Make "
-"sure you indicate which distribution the package should be removed from.  "
-"Normally, you can only have packages removed from <emphasis>unstable</"
-"emphasis> and <emphasis>experimental</emphasis>.  Packages are not removed "
-"from <emphasis>testing</emphasis> directly.  Rather, they will be removed "
-"automatically after the package has been removed from <emphasis>unstable</"
-"emphasis> and no package in <emphasis>testing</emphasis> depends on it."
+"removed; as all bugs, this bug should normally have normal severity.  The "
+"bug title should be in the form <literal>RM: <replaceable>package </"
+"replaceable> <replaceable>[architecture list]</replaceable> -- "
+"<replaceable>reason</replaceable></literal>, where <replaceable>package</"
+"replaceable> is the package to be removed and <replaceable>reason</"
+"replaceable> is a short summary of the reason for the removal request.  "
+"<replaceable>[architecture list]</replaceable> is optional 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."

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

-#: pkgs.dbk:1236
+#: pkgs.dbk:1259
+msgid ""
+"If you want to remove a package you maintain, you should note this in the "
+"bug title by prepending <literal>ROM</literal> (Request Of Maintainer).  "
+"There are several other standard acronyms used in the reasoning for a "
+"package removal, see <ulink url=\"http://&ftp-master-host;/removals.html\"></"
+"ulink> for a complete list. That page also provides a convenient overview of "
+"pending removal requests."
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1268
+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."
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1277

 msgid ""
 "There is one exception when an explicit removal request is not necessary: If "
 "a (source or binary) package is an orphan, it will be removed semi-"
 msgid ""
 "There is one exception when an explicit removal request is not necessary: If "
 "a (source or binary) package is an orphan, it will be removed semi-"


@@ -1656,7 +1707,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1245
+#: pkgs.dbk:1286

 msgid ""
 "In your removal request, you have to detail the reasons justifying the "
 "request.  This is to avoid unwanted removals and to keep a trace of why a "
 msgid ""
 "In your removal request, you have to detail the reasons justifying the "
 "request.  This is to avoid unwanted removals and to keep a trace of why a "


@@ -1665,15 +1716,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1251
+#: pkgs.dbk:1292

 msgid ""
 "Usually you only ask for the removal of a package maintained by yourself.  "
 "If you want to remove another package, you have to get the approval of its "
 msgid ""
 "Usually you only ask for the removal of a package maintained by yourself.  "
 "If you want to remove another package, you have to get the approval of its "

-"maintainer."
+"maintainer. Should the package be orphaned and thus have no maintainer, you "
+"should first discuss the removal request on &email-debian-qa;. If there is a "
+"consensus that the package should be removed, you should reassign and "
+"retitle the <literal>O:</literal> bug filed against the <literal>wnpp</"
+"literal> package instead of filing a new bug as removal request."

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

-#: pkgs.dbk:1256
+#: pkgs.dbk:1302

 msgid ""
 "Further information relating to these and other package removal related "
 "topics may be found at <ulink url=\"http://wiki.debian.org/ftpmaster_Removals"
 msgid ""
 "Further information relating to these and other package removal related "
 "topics may be found at <ulink url=\"http://wiki.debian.org/ftpmaster_Removals"


@@ -1681,7 +1736,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1261
+#: pkgs.dbk:1307

 msgid ""
 "If in doubt concerning whether a package is disposable, email &email-debian-"
 "devel; asking for opinions.  Also of interest is the <command>apt-cache</"
 msgid ""
 "If in doubt concerning whether a package is disposable, email &email-debian-"
 "devel; asking for opinions.  Also of interest is the <command>apt-cache</"


@@ -1690,12 +1745,13 @@ msgid ""
 "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-"
 "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> and <command>grep-dctrl</command>.  Removal of orphaned "
-"packages is discussed on &email-debian-qa;."
+"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 &email-debian-qa;."

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

-#: pkgs.dbk:1272
+#: pkgs.dbk:1320

 msgid ""
 "Once the package has been removed, the package's bugs should be handled.  "
 "They should either be reassigned to another package in the case where the "
 msgid ""
 "Once the package has been removed, the package's bugs should be handled.  "
 "They should either be reassigned to another package in the case where the "


@@ -1705,44 +1761,49 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1279
+#: pkgs.dbk:1327

 msgid "Removing packages from <filename>Incoming</filename>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Removing packages from <filename>Incoming</filename>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1281
+#: pkgs.dbk:1329

 msgid ""
 "In the past, it was possible to remove packages from <filename>incoming</"
 "filename>.  However, with the introduction of the new incoming system, this "
 "is no longer possible.  Instead, you have to upload a new revision of your "
 "package with a higher version than the package you want to replace.  Both "
 "versions will be installed in the archive but only the higher version will "
 msgid ""
 "In the past, it was possible to remove packages from <filename>incoming</"
 "filename>.  However, with the introduction of the new incoming system, this "
 "is no longer possible.  Instead, you have to upload a new revision of your "
 "package with a higher version than the package you want to replace.  Both "
 "versions will be installed in the archive but only the higher version will "

-"actually be available in <emphasis>unstable</emphasis> since the previous "
+"actually be available in <literal>unstable</literal> since the previous "

 "version will immediately be replaced by the higher.  However, if you do "
 "proper testing of your packages, the need to replace a package should not "
 "occur too often anyway."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 "version will immediately be replaced by the higher.  However, if you do "
 "proper testing of your packages, the need to replace a package should not "
 "occur too often anyway."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1296
+#: pkgs.dbk:1344

 msgid "Replacing or renaming packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Replacing or renaming packages"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1298
+#: pkgs.dbk:1346

 msgid ""
 msgid ""

-"When you make a mistake naming your package, you should follow a two-step "
-"process to rename it.  First, set your <filename>debian/control</filename> "
-"file to replace and conflict with the obsolete name of the package (see the "
-"<ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
-"details).  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.  Do not forget to properly "
-"reassign the package's bugs at the same time."
+"When the upstream maintainers for one of your packages chose to rename their "
+"software (or you made a mistake naming your package), you should follow a "
+"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).  "
+"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."

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

-#: pkgs.dbk:1308
+#: pkgs.dbk:1362

 msgid ""
 "At other times, you may make a mistake in constructing your package and wish "
 "to replace it.  The only way to do this is to increase the version number "
 msgid ""
 "At other times, you may make a mistake in constructing your package and wish "
 "to replace it.  The only way to do this is to increase the version number "


@@ -1756,12 +1817,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1322
+#: pkgs.dbk:1376

 msgid "Orphaning a package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Orphaning a package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1324
+#: pkgs.dbk:1378

 msgid ""
 "If you can no longer maintain a package, you need to inform others, and see "
 "that the package is marked as orphaned.  You should set the package "
 msgid ""
 "If you can no longer maintain a package, you need to inform others, and see "
 "that the package is marked as orphaned.  You should set the package "


@@ -1770,7 +1831,7 @@ msgid ""
 "systemitem>.  The bug report should be titled <literal>O: "
 "<replaceable>package</replaceable> -- <replaceable>short description</"
 "replaceable></literal> indicating that the package is now orphaned.  The "
 "systemitem>.  The bug report should be titled <literal>O: "
 "<replaceable>package</replaceable> -- <replaceable>short description</"
 "replaceable></literal> indicating that the package is now orphaned.  The "

-"severity of the bug should be set to <emphasis>normal</emphasis>; if the "
+"severity of the bug should be set to <literal>normal</literal>; if the "

 "package has a priority of standard or higher, it should be set to "
 "important.  If you feel it's necessary, send a copy to &email-debian-devel; "
 "by putting the address in the X-Debbugs-CC: header of the message (no, don't "
 "package has a priority of standard or higher, it should be set to "
 "important.  If you feel it's necessary, send a copy to &email-debian-devel; "
 "by putting the address in the X-Debbugs-CC: header of the message (no, don't "


@@ -1779,29 +1840,29 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1339
+#: pkgs.dbk:1393

 msgid ""
 "If you just intend to give the package away, but you can keep maintainership "
 "for the moment, then you should instead submit a bug against <systemitem "
 "role=\"package\">wnpp</systemitem> and title it <literal>RFA: "
 "<replaceable>package</replaceable> -- <replaceable>short description</"
 msgid ""
 "If you just intend to give the package away, but you can keep maintainership "
 "for the moment, then you should instead submit a bug against <systemitem "
 "role=\"package\">wnpp</systemitem> and title it <literal>RFA: "
 "<replaceable>package</replaceable> -- <replaceable>short description</"

-"replaceable></literal>.  <literal>RFA</literal> stands for <emphasis>Request "
-"For Adoption</emphasis>."
+"replaceable></literal>.  <literal>RFA</literal> stands for <literal>Request "
+"For Adoption</literal>."

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

-#: pkgs.dbk:1347
+#: pkgs.dbk:1401

 msgid ""
 "More information is on the <ulink url=\"&url-wnpp;\">WNPP web pages</ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "More information is on the <ulink url=\"&url-wnpp;\">WNPP web pages</ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1353
+#: pkgs.dbk:1407

 msgid "Adopting a package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Adopting a package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1355
+#: pkgs.dbk:1409

 msgid ""
 "A list of packages in need of a new maintainer is available in the <ulink "
 "url=\"&url-wnpp;\">Work-Needing and Prospective Packages list (WNPP)</"
 msgid ""
 "A list of packages in need of a new maintainer is available in the <ulink "
 "url=\"&url-wnpp;\">Work-Needing and Prospective Packages list (WNPP)</"


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

-#: pkgs.dbk:1362
+#: pkgs.dbk:1416

 msgid ""
 "It is not OK to simply take over a package that you feel is neglected — that "
 "would be package hijacking.  You can, of course, contact the current "
 msgid ""
 "It is not OK to simply take over a package that you feel is neglected — that "
 "would be package hijacking.  You can, of course, contact the current "


@@ -1821,7 +1882,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1368
+#: pkgs.dbk:1422

 msgid ""
 "Generally, you may not take over the package without the assent of the "
 "current maintainer.  Even if they ignore you, that is still not grounds to "
 msgid ""
 "Generally, you may not take over the package without the assent of the "
 "current maintainer.  Even if they ignore you, that is still not grounds to "


@@ -1833,7 +1894,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1378
+#: pkgs.dbk:1432

 msgid ""
 "If you take over an old package, you probably want to be listed as the "
 "package's official maintainer in the bug system.  This will happen "
 msgid ""
 "If you take over an old package, you probably want to be listed as the "
 "package's official maintainer in the bug system.  This will happen "


@@ -1846,12 +1907,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: pkgs.dbk:1392
+#: pkgs.dbk:1446

 msgid "Porting and being ported"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "Porting and being ported"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:1394
+#: pkgs.dbk:1448

 msgid ""
 "Debian supports an ever-increasing number of architectures.  Even if you are "
 "not a porter, and you don't use any architecture but one, it is part of your "
 msgid ""
 "Debian supports an ever-increasing number of architectures.  Even if you are "
 "not a porter, and you don't use any architecture but one, it is part of your "


@@ -1860,23 +1921,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:1400
+#: pkgs.dbk:1454

 msgid ""
 "Porting is the act of building Debian packages for architectures that are "
 "different from the original architecture of the package maintainer's binary "
 "package.  It is a unique and essential activity.  In fact, porters do most "
 msgid ""
 "Porting is the act of building Debian packages for architectures that are "
 "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, for a single "
-"<emphasis>i386</emphasis> binary package, there must be a recompile for each "
-"architecture, which amounts to &number-of-arches; more builds."
+"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 architectures, "
+"amounting to &number-of-arches; more builds."

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

-#: pkgs.dbk:1408
+#: pkgs.dbk:1463

 msgid "Being kind to porters"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Being kind to porters"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1410
+#: pkgs.dbk:1465

 msgid ""
 "Porters have a difficult and unique task, since they are required to deal "
 "with a large volume of packages.  Ideally, every source package should build "
 msgid ""
 "Porters have a difficult and unique task, since they are required to deal "
 "with a large volume of packages.  Ideally, every source package should build "


@@ -1887,7 +1949,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1418
+#: pkgs.dbk:1473

 msgid ""
 "The first and most important thing is to respond quickly to bug or issues "
 "raised by porters.  Please treat porters with courtesy, as if they were in "
 msgid ""
 "The first and most important thing is to respond quickly to bug or issues "
 "raised by porters.  Please treat porters with courtesy, as if they were in "


@@ -1897,7 +1959,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1425
+#: pkgs.dbk:1480

 msgid ""
 "By far, most of the problems encountered by porters are caused by "
 "<emphasis>packaging bugs</emphasis> in the source packages.  Here is a "
 msgid ""
 "By far, most of the problems encountered by porters are caused by "
 "<emphasis>packaging bugs</emphasis> in the source packages.  Here is a "


@@ -1905,46 +1967,49 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1432
+#: pkgs.dbk:1487

 msgid ""
 "Make sure that your <literal>Build-Depends</literal> and <literal>Build-"
 "Depends-Indep</literal> settings in <filename>debian/control</filename> are "
 "set properly.  The best way to validate this is to use the <systemitem role="
 msgid ""
 "Make sure that your <literal>Build-Depends</literal> and <literal>Build-"
 "Depends-Indep</literal> settings in <filename>debian/control</filename> are "
 "set properly.  The best way to validate this is to use the <systemitem role="

-"\"package\">debootstrap</systemitem> package to create an unstable chroot "
-"environment (see <xref linkend=\"debootstrap\"/> ).  Within that chrooted "
-"environment, install the <systemitem role=\"package\">build-essential</"
-"systemitem> package and any package dependencies mentioned in <literal>Build-"
-"Depends</literal> and/or <literal>Build-Depends-Indep</literal>.  Finally, "
-"try building your package within that chrooted environment.  These steps can "
-"be automated by the use of the <command>pbuilder</command> program which is "
-"provided by the package of the same name (see <xref linkend=\"pbuilder\"/> )."
+"\"package\">debootstrap</systemitem> package to create an <literal>unstable</"
+"literal> chroot environment (see <xref linkend=\"debootstrap\"/> ).  Within "
+"that chrooted environment, install the <systemitem role=\"package\">build-"
+"essential</systemitem> package and any package dependencies mentioned in "
+"<literal>Build-Depends</literal> and/or <literal>Build-Depends-Indep</"
+"literal>.  Finally, try building your package within that chrooted "
+"environment.  These steps can be automated by the use of the "
+"<command>pbuilder</command> program which is provided by the package of the "
+"same name (see <xref linkend=\"pbuilder\"/> )."

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

-#: pkgs.dbk:1446
+#: pkgs.dbk:1502

 msgid ""
 "If you can't set up a proper chroot, <command>dpkg-depcheck</command> may be "
 "of assistance (see <xref linkend=\"dpkg-depcheck\"/> )."
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgid ""
 "If you can't set up a proper chroot, <command>dpkg-depcheck</command> may be "
 "of assistance (see <xref linkend=\"dpkg-depcheck\"/> )."
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1450
+#: pkgs.dbk:1506

 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "instructions on setting build dependencies."
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "instructions on setting build dependencies."
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1456
+#: pkgs.dbk:1512

 msgid ""
 msgid ""

-"Don't set architecture to a value other than ``all'' or ``any'' unless you "
-"really mean it.  In too many cases, maintainers don't follow the "
-"instructions in the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</"
-"ulink>.  Setting your architecture to ``i386'' is usually incorrect."
+"Don't set architecture to a value other than <literal>all</literal> or "
+"<literal>any</literal> unless you really mean it.  In too many cases, "
+"maintainers don't follow the instructions in the <ulink url=\"&url-debian-"
+"policy;\">Debian Policy Manual</ulink>.  Setting your architecture to only "
+"one architecture (such as <literal>i386</literal> or <literal>amd64</"
+"literal>) is usually incorrect."

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

-#: pkgs.dbk:1464
+#: pkgs.dbk:1522

 msgid ""
 "Make sure your source package is correct.  Do <literal>dpkg-source -x "
 "<replaceable>package</replaceable>.dsc</literal> to make sure your source "
 msgid ""
 "Make sure your source package is correct.  Do <literal>dpkg-source -x "
 "<replaceable>package</replaceable>.dsc</literal> to make sure your source "


@@ -1953,15 +2018,16 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1472
+#: pkgs.dbk:1530

 msgid ""
 "Make sure you don't ship your source package with the <filename>debian/"
 "files</filename> or <filename>debian/substvars</filename> files.  They "
 msgid ""
 "Make sure you don't ship your source package with the <filename>debian/"
 "files</filename> or <filename>debian/substvars</filename> files.  They "

-"should be removed by the `clean' target of <filename>debian/rules</filename>."
+"should be removed by the <literal>clean</literal> target of <filename>debian/"
+"rules</filename>."

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

-#: pkgs.dbk:1480
+#: pkgs.dbk:1538

 msgid ""
 "Make sure you don't rely on locally installed or hacked configurations or "
 "programs.  For instance, you should never be calling programs in <filename>/"
 msgid ""
 "Make sure you don't rely on locally installed or hacked configurations or "
 "programs.  For instance, you should never be calling programs in <filename>/"


@@ -1971,14 +2037,16 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1489
+#: pkgs.dbk:1547

 msgid ""
 "Don't depend on the package you're building being installed already (a sub-"
 msgid ""
 "Don't depend on the package you're building being installed already (a sub-"

-"case of the above issue)."
+"case of the above issue). There are, of course, exceptions to this rule, but "
+"be aware that any case like this needs manual bootstrapping and cannot be "
+"done by automated package builders."

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

-#: pkgs.dbk:1495
+#: pkgs.dbk:1555

 msgid ""
 "Don't rely on the compiler being a certain version, if possible.  If not, "
 "then make sure your build dependencies reflect the restrictions, although "
 msgid ""
 "Don't rely on the compiler being a certain version, if possible.  If not, "
 "then make sure your build dependencies reflect the restrictions, although "


@@ -1987,22 +2055,22 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1503
+#: pkgs.dbk:1563

 msgid ""
 msgid ""

-"Make sure your debian/rules contains separate ``binary-arch'' and ``binary-"
-"indep'' 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 <literal>dpkg-"
-"buildpackage -B</literal>."
+"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>."

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

-#: pkgs.dbk:1514
+#: pkgs.dbk:1574

 msgid "Guidelines for porter uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Guidelines for porter uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1516
+#: pkgs.dbk:1576

 msgid ""
 "If the package builds out of the box for the architecture to be ported to, "
 "you are in luck and your job is easy.  This section applies to that case; it "
 msgid ""
 "If the package builds out of the box for the architecture to be ported to, "
 "you are in luck and your job is easy.  This section applies to that case; it "


@@ -2013,7 +2081,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1524
+#: pkgs.dbk:1584

 msgid ""
 "For a porter upload, no changes are being made to the source.  You do not "
 "need to touch any of the files in the source package.  This includes "
 msgid ""
 "For a porter upload, no changes are being made to the source.  You do not "
 "need to touch any of the files in the source package.  This includes "


@@ -2021,18 +2089,18 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1529
+#: pkgs.dbk:1589

 msgid ""
 "The way to invoke <command>dpkg-buildpackage</command> is as <literal>dpkg-"
 "buildpackage -B -m<replaceable>porter-email</replaceable></literal>.  Of "
 "course, set <replaceable>porter-email</replaceable> to your email address.  "
 "This will do a binary-only build of only the architecture-dependent portions "
 msgid ""
 "The way to invoke <command>dpkg-buildpackage</command> is as <literal>dpkg-"
 "buildpackage -B -m<replaceable>porter-email</replaceable></literal>.  Of "
 "course, set <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 `binary-arch' target in <filename>debian/rules</"
-"filename>."
+"of the package, using the <literal>binary-arch</literal> target in "
+"<filename>debian/rules </filename>."

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

-#: pkgs.dbk:1537
+#: pkgs.dbk:1598

 msgid ""
 "If you are working on a Debian machine for your porting efforts and you need "
 "to sign your upload locally for its acceptance in the archive, you can run "
 msgid ""
 "If you are working on a Debian machine for your porting efforts and you need "
 "to sign your upload locally for its acceptance in the archive, you can run "


@@ -2042,33 +2110,34 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1544
+#: pkgs.dbk:1605

 msgid "Recompilation or binary-only NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Recompilation or binary-only NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1546
+#: pkgs.dbk:1607

 msgid ""
 "Sometimes the initial porter upload is problematic because the environment "
 "in which the package was built was not good enough (outdated or obsolete "
 "library, bad compiler, ...).  Then you may just need to recompile it in an "
 "updated environment.  However, you have to bump the version number in this "
 "case, so that the old bad package can be replaced in the Debian archive "
 msgid ""
 "Sometimes the initial porter upload is problematic because the environment "
 "in which the package was built was not good enough (outdated or obsolete "
 "library, bad compiler, ...).  Then you may just need to recompile it in an "
 "updated environment.  However, you have to bump the version number in this "
 "case, so that the old bad package can be replaced in the Debian archive "

-"(<command>katie</command> refuses to install new packages if they don't have "
-"a version number greater than the currently available one)."
+"(<command>dak</command> refuses to install new packages if they don't have a "
+"version number greater than the currently available one)."

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

-#: pkgs.dbk:1555
+#: pkgs.dbk:1616

 msgid ""
 "You have to make sure that your binary-only NMU doesn't render the package "
 "uninstallable.  This could happen when a source package generates arch-"
 msgid ""
 "You have to make sure that your binary-only NMU doesn't render the package "
 "uninstallable.  This could happen when a source package generates arch-"

-"dependent and arch-independent packages that depend on each other via "
-"$(Source-Version)."
+"dependent and arch-independent packages that have inter-dependencies "
+"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:1561
+#: pkgs.dbk:1623

 msgid ""
 "Despite the required modification of the changelog, these are called binary-"
 "only NMUs — there is no need in this case to trigger all other architectures "
 msgid ""
 "Despite the required modification of the changelog, these are called binary-"
 "only NMUs — there is no need in this case to trigger all other architectures "


@@ -2076,7 +2145,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1566
+#: pkgs.dbk:1628

 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 "


@@ -2086,18 +2155,20 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para><footnote>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para><footnote>

-#: pkgs.dbk:1573
+#: pkgs.dbk:1635

 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 b&lt;number&gt;.  "
-"For instance, if the latest version you are recompiling against was version "
-"``2.9-3'', your NMU should carry a version of ``2.9-3+b1''.  If the latest "
-"version was ``3.4+b1'' (i.e, a native package with a previous recompilation "
-"NMU), your NMU should have a version number of ``3.4+b2''.  <footnote>"
+"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>.  <footnote>"

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

-#: pkgs.dbk:1578
+#: pkgs.dbk:1643

 msgid ""
 "In the past, such NMUs used the third-level number on the Debian part of the "
 "revision to denote their recompilation-only status; however, this syntax was "
 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 "


@@ -2107,7 +2178,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1586
+#: pkgs.dbk:1651

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


@@ -2115,12 +2186,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1593
+#: pkgs.dbk:1658

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

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


@@ -2133,32 +2204,33 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1604
+#: pkgs.dbk:1669

 msgid ""
 msgid ""

-"If you are a porter doing an NMU for `unstable', the above guidelines for "
-"porting should be followed, with two variations.  Firstly, the acceptable "
-"waiting period — the time between when the bug is submitted to the BTS and "
-"when it is OK to do an NMU — is seven days for porters working on the "
-"unstable distribution.  This period can be 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 stable or testing, please coordinate with "
-"the appropriate release team first."
+"If you are a porter doing an NMU for <literal>unstable</literal>, the above "
+"guidelines for porting should be followed, with two variations.  Firstly, "
+"the acceptable waiting period — the time between when the bug is submitted "
+"to the BTS and when it is OK to do an NMU — is seven days for porters "
+"working on the <literal>unstable</literal> distribution.  This period can be "
+"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 "
+"with the appropriate release team first."

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

-#: pkgs.dbk:1615
+#: pkgs.dbk:1681

 msgid ""
 "Secondly, porters doing source NMUs should make sure that the bug they "
 msgid ""
 "Secondly, porters doing source NMUs should make sure that the bug they "

-"submit to the BTS should be of severity `serious' or greater.  This ensures "
-"that a single source package can be used to compile every supported Debian "
-"architecture by release time.  It is very important that we have one version "
-"of the binary and source package for all architecture in order to comply "
-"with many licenses."
+"submit to the BTS should be of severity <literal>serious</literal> or "
+"greater.  This ensures that a single source package can be used to compile "
+"every supported Debian architecture by release time.  It is very important "
+"that we have one version of the binary and source package for all "
+"architectures in order to comply with many licenses."

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

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

 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 "


@@ -2169,7 +2241,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1631
+#: pkgs.dbk:1697

 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 "


@@ -2178,12 +2250,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1641
+#: pkgs.dbk:1707

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

 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 "


@@ -2192,19 +2264,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1648
+#: pkgs.dbk:1714

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

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

 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 "


@@ -2213,56 +2285,57 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

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

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

 msgid ""
 "Descriptions of several porting tools can be found in <xref linkend=\"tools-"
 "porting\"/> ."
 msgstr ""
 
 msgid ""
 "Descriptions of several porting tools can be found in <xref linkend=\"tools-"
 "porting\"/> ."
 msgstr ""
 

+# type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1736
+msgid "<systemitem role=\"package\">wanna-build</systemitem>"
+msgstr ""
+

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

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

 msgid ""
 msgid ""

-"The <systemitem role=\"package\">buildd</systemitem> system is used as a "
-"distributed, client-server build distribution system.  It is usually used in "
-"conjunction with <emphasis>auto-builders</emphasis>, which are ``slave'' "
-"hosts which simply check out and attempt to auto-build packages which need "
-"to be ported.  There is also an email interface to the system, which allows "
-"porters to ``check out'' a source package (usually one which cannot yet be "
-"auto-built)  and work on it."
+"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 daemons</literal> are "
+"``slave'' hosts which contact the central <systemitem 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>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

 msgid ""
 msgid ""

-"<systemitem role=\"package\">buildd</systemitem> is not yet available as a "
-"package; however, most porting efforts are either using it currently or "
-"planning to use it in the near future.  The actual automated builder is "
-"packaged as <systemitem role=\"package\">sbuild</systemitem>, see its "
-"description in <xref linkend=\"sbuild\"/> .  The complete <systemitem role="
-"\"package\">buildd</systemitem> system also collects a number of as yet "
-"unpackaged components which are currently very useful and in use "
-"continually, such as <command>andrea</command> and <command>wanna-build</"
-"command>."
+"<systemitem role=\"package\">wanna-build</systemitem> is not yet available "
+"as a package; however, all Debian porting efforts are using it for automated "
+"package building.  The tool used to do the actual package builds, "
+"<systemitem role=\"package\">sbuild</systemitem> is available as a package, "
+"see its description in <xref linkend=\"sbuild\"/> .  Please note that the "
+"packaged version is not the same as the one used on build daemons, but it is "
+"close enough to reproduce problems."

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

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

 msgid ""
 msgid ""

-"Some of the data produced by <systemitem role=\"package\">buildd</"
+"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 "
 "systemitem> which is generally useful to porters is available on the web at "
 "<ulink url=\"&url-buildd;\"></ulink>.  This data includes nightly updated "

-"information from <command>andrea</command> (source dependencies) and "
-"<systemitem role=\"package\">quinn-diff</systemitem> (packages needing "
-"recompilation)."
+"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:1699
+#: pkgs.dbk:1761

 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 "


@@ -2272,36 +2345,37 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1706
+#: pkgs.dbk:1768

 msgid ""
 "The buildds admins of each arch can be contacted at the mail address "
 msgid ""
 "The buildds admins of each arch can be contacted at the mail address "

-"$arch@buildd.debian.org."
+"<literal><replaceable>arch</replaceable>@buildd.debian.org</literal>."

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

-#: pkgs.dbk:1714
+#: pkgs.dbk:1776

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

 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 "
 "within a reasonable amount of time.  An example is a package that is SVGA-"
 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 "
 "within a reasonable amount of time.  An example is a package that is SVGA-"

-"specific (only i386), or uses other hardware-specific features not supported "
-"on all architectures."
+"specific (only available for <literal>i386</literal> and <literal>amd64</"
+"literal>), or uses other hardware-specific features not supported on all "
+"architectures."

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

-#: pkgs.dbk:1723
+#: pkgs.dbk:1785

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

 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 "


@@ -2313,16 +2387,16 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

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

 msgid ""
 "Additionally, if you believe the list of supported architectures is pretty "
 msgid ""
 "Additionally, if you believe the list of supported architectures is pretty "

-"constant, you should change 'any' to a list of supported architectures in "
-"debian/control.  This way, the build will fail also, and indicate this to a "
-"human reader without actually trying."
+"constant, you should change <literal>any</literal> to a list of supported "
+"architectures in <filename>debian/control</filename>.  This way, the build "
+"will fail also, and indicate this to a human reader without actually trying."

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

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

 msgid ""
 "In order to prevent autobuilders from needlessly trying to build your "
 "package, it must be included in <filename>packages-arch-specific</filename>, "
 msgid ""
 "In order to prevent autobuilders from needlessly trying to build your "
 "package, it must be included in <filename>packages-arch-specific</filename>, "


@@ -2333,7 +2407,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 "Please note that it is insufficient to only add your package to Packages-"
 "arch-specific without making it fail to build on unsupported architectures: "
 msgid ""
 "Please note that it is insufficient to only add your package to Packages-"
 "arch-specific without making it fail to build on unsupported architectures: "


@@ -2345,12 +2419,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: pkgs.dbk:1768
+#: pkgs.dbk:1830

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

 msgid ""
 "Under certain circumstances it is necessary for someone other than the "
 "official package maintainer to make a release of a package.  This is called "
 msgid ""
 "Under certain circumstances it is necessary for someone other than the "
 "official package maintainer to make a release of a package.  This is called "


@@ -2358,17 +2432,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:1775
+#: pkgs.dbk:1837

 msgid ""
 "This section handles only source NMUs, i.e.  NMUs which upload a new version "
 "of the package.  For binary-only NMUs by porters or QA members, please see "
 "<xref linkend=\"binary-only-nmu\"/> .  If a buildd builds and uploads a "
 "package, that too is strictly speaking a binary NMU.  See <xref linkend="
 msgid ""
 "This section handles only source NMUs, i.e.  NMUs which upload a new version "
 "of the package.  For binary-only NMUs by porters or QA members, please see "
 "<xref linkend=\"binary-only-nmu\"/> .  If a buildd builds and uploads a "
 "package, that too is strictly speaking a binary NMU.  See <xref linkend="

-"\"buildd\"/> for some more information."
+"\"wanna-build\"/> for some more information."

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

-#: pkgs.dbk:1782
+#: pkgs.dbk:1844

 msgid ""
 "The main reason why NMUs are done is when a developer needs to fix another "
 "developer's package in order to address serious problems or crippling bugs "
 msgid ""
 "The main reason why NMUs are done is when a developer needs to fix another "
 "developer's package in order to address serious problems or crippling bugs "


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

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

 msgid ""
 "First and foremost, it is critical that NMU patches to source should be as "
 "non-disruptive as possible.  Do not do housekeeping tasks, do not change the "
 msgid ""
 "First and foremost, it is critical that NMU patches to source should be as "
 "non-disruptive as possible.  Do not do housekeeping tasks, do not change the "


@@ -2389,7 +2463,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:1796
+#: pkgs.dbk:1858

 msgid ""
 "And please remember the Hippocratic Oath: Above all, do no harm.  It is "
 "better to leave a package with an open grave bug than applying a non-"
 msgid ""
 "And please remember the Hippocratic Oath: Above all, do no harm.  It is "
 "better to leave a package with an open grave bug than applying a non-"


@@ -2397,12 +2471,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1801
+#: pkgs.dbk:1863

 msgid "How to do a NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "How to do a NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1803
+#: pkgs.dbk:1865

 msgid ""
 "NMUs which fix important, serious or higher severity bugs are encouraged and "
 "accepted.  You should endeavor to reach the current maintainer of the "
 msgid ""
 "NMUs which fix important, serious or higher severity bugs are encouraged and "
 "accepted.  You should endeavor to reach the current maintainer of the "


@@ -2411,7 +2485,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1809
+#: pkgs.dbk:1871

 msgid ""
 "NMUs should be made to assist a package's maintainer in resolving bugs.  "
 "Maintainers should be thankful for that help, and NMUers should respect the "
 msgid ""
 "NMUs should be made to assist a package's maintainer in resolving bugs.  "
 "Maintainers should be thankful for that help, and NMUers should respect the "


@@ -2420,14 +2494,15 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1815
+#: pkgs.dbk:1877

 msgid ""
 "A NMU should follow all conventions, written down in this section.  For an "
 msgid ""
 "A NMU should follow all conventions, written down in this section.  For an "

-"upload to testing or unstable, this order of steps is recommended:"
+"upload to <literal>testing</literal> or <literal>unstable</literal>, this "
+"order of steps is recommended:"

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

-#: pkgs.dbk:1821
+#: pkgs.dbk:1884

 msgid ""
 "Make sure that the package's bugs that the NMU is meant to address are all "
 "filed in the Debian Bug Tracking System (BTS).  If they are not, submit them "
 msgid ""
 "Make sure that the package's bugs that the NMU is meant to address are all "
 "filed in the Debian Bug Tracking System (BTS).  If they are not, submit them "


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

-#: pkgs.dbk:1828
+#: pkgs.dbk:1891

 msgid ""
 "Wait a few days for the response from the maintainer.  If you don't get any "
 "response, you may want to help them by sending the patch that fixes the "
 msgid ""
 "Wait a few days for the response from the maintainer.  If you don't get any "
 "response, you may want to help them by sending the patch that fixes the "


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

-#: pkgs.dbk:1835
+#: pkgs.dbk:1898

 msgid ""
 "Wait a few more days.  If you still haven't got an answer from the "
 "maintainer, send them a mail announcing your intent to NMU the package.  "
 msgid ""
 "Wait a few more days.  If you still haven't got an answer from the "
 "maintainer, send them a mail announcing your intent to NMU the package.  "


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

-#: pkgs.dbk:1845
+#: pkgs.dbk:1908

 msgid ""
 "Upload your package to incoming in <filename>DELAYED/7-day</filename> (cf.  "
 "<xref linkend=\"delayed-incoming\"/> ), send the final patch to the "
 msgid ""
 "Upload your package to incoming in <filename>DELAYED/7-day</filename> (cf.  "
 "<xref linkend=\"delayed-incoming\"/> ), send the final patch to the "


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

-#: pkgs.dbk:1853
+#: pkgs.dbk:1916

 msgid ""
 "Follow what happens, you're responsible for any bug that you introduced with "
 "your NMU.  You should probably use <xref linkend=\"pkg-tracking-system\"/> "
 msgid ""
 "Follow what happens, you're responsible for any bug that you introduced with "
 "your NMU.  You should probably use <xref linkend=\"pkg-tracking-system\"/> "


@@ -2471,7 +2546,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1860
+#: pkgs.dbk:1923

 msgid ""
 "At times, the release manager or an organized group of developers can "
 "announce a certain period of time in which the NMU rules are relaxed.  This "
 msgid ""
 "At times, the release manager or an organized group of developers can "
 "announce a certain period of time in which the NMU rules are relaxed.  This "


@@ -2483,15 +2558,16 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 msgid ""

-"For the testing distribution, the rules may be changed by the release "
-"managers.  Please take additional care, and acknowledge that the usual way "
-"for a package to enter testing is through unstable."
+"For the <literal>testing</literal> distribution, the rules may be changed by "
+"the release managers.  Please take additional care, and acknowledge that the "
+"usual way for a package to enter <literal>testing</literal> is through "
+"<literal>unstable</literal>."

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

-#: pkgs.dbk:1874
+#: pkgs.dbk:1938

 msgid ""
 "For the stable distribution, please take extra care.  Of course, the release "
 "managers may also change the rules here.  Please verify before you upload "
 msgid ""
 "For the stable distribution, please take extra care.  Of course, the release "
 "managers may also change the rules here.  Please verify before you upload "


@@ -2500,7 +2576,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 "When a security bug is detected, the security team may do an NMU, using "
 "their own rules.  Please refer to <xref linkend=\"bug-security\"/> for more "
 msgid ""
 "When a security bug is detected, the security team may do an NMU, using "
 "their own rules.  Please refer to <xref linkend=\"bug-security\"/> for more "


@@ -2508,14 +2584,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 "For the differences for Porters NMUs, please see <xref linkend=\"source-nmu-"
 "when-porter\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "For the differences for Porters NMUs, please see <xref linkend=\"source-nmu-"
 "when-porter\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1889
+#: pkgs.dbk:1953

 msgid ""
 "Of course, it is always possible to agree on special rules with a maintainer "
 "(like the maintainer asking please upload this fix directly for me, and no "
 msgid ""
 "Of course, it is always possible to agree on special rules with a maintainer "
 "(like the maintainer asking please upload this fix directly for me, and no "


@@ -2523,19 +2599,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1896
+#: pkgs.dbk:1960

 msgid "NMU version numbering"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "NMU version numbering"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1898
+#: pkgs.dbk:1962

 msgid ""
 "Whenever you have made a change to a package, no matter how trivial, the "
 "version number needs to change.  This enables our packing system to function."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "Whenever you have made a change to a package, no matter how trivial, the "
 "version number needs to change.  This enables our packing system to function."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1902
+#: pkgs.dbk:1966

 msgid ""
 "If you are doing a non-maintainer upload (NMU), you should add a new minor "
 "version number to the <replaceable>debian-revision</replaceable> part of the "
 msgid ""
 "If you are doing a non-maintainer upload (NMU), you should add a new minor "
 "version number to the <replaceable>debian-revision</replaceable> part of the "


@@ -2549,7 +2625,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1913
+#: pkgs.dbk:1977

 msgid ""
 "The Debian revision minor number is needed to avoid stealing one of the "
 "package maintainer's version numbers, which might disrupt their work.  It "
 msgid ""
 "The Debian revision minor number is needed to avoid stealing one of the "
 "package maintainer's version numbers, which might disrupt their work.  It "


@@ -2558,7 +2634,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1919
+#: pkgs.dbk:1983

 msgid ""
 "If there is no <replaceable>debian-revision</replaceable> component in the "
 "version number then one should be created, starting at `0.1' (but in case of "
 msgid ""
 "If there is no <replaceable>debian-revision</replaceable> component in the "
 "version number then one should be created, starting at `0.1' (but in case of "


@@ -2571,20 +2647,20 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1929
+#: pkgs.dbk:1993

 msgid ""
 msgid ""

-"If you upload a package to testing or stable, sometimes, you need to fork "
-"the version number tree.  For this, version numbers like 1.1-3sarge0.1 could "
-"be used."
+"If you upload a package to <literal>testing</literal> or <literal>stable </"
+"literal>, sometimes, you need to fork the version number tree.  For this, "
+"version numbers like 1.1-3sarge0.1 could be used."

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

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

 msgid "Source NMUs must have a new changelog entry"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Source NMUs must have a new changelog entry"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1938
+#: pkgs.dbk:2002

 msgid ""
 "Anyone who is doing a source NMU must create a changelog entry, describing "
 "which bugs are fixed by the NMU, and generally why the NMU was required and "
 msgid ""
 "Anyone who is doing a source NMU must create a changelog entry, describing "
 "which bugs are fixed by the NMU, and generally why the NMU was required and "


@@ -2593,23 +2669,25 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1944
+#: pkgs.dbk:2008

 msgid "By convention, source NMU changelog entries start with the line"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgid "By convention, source NMU changelog entries start with the line"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:1947
+#: pkgs.dbk:2010

 #, no-wrap
 #, no-wrap

-msgid "* Non-maintainer upload"
+msgid ""
+"\n"
+"  * Non-maintainer upload\n"

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

-#: pkgs.dbk:1952
+#: pkgs.dbk:2016

 msgid "Source NMUs and the Bug Tracking System"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Source NMUs and the Bug Tracking System"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1954
+#: pkgs.dbk:2018

 msgid ""
 "Maintainers other than the official package maintainer should make as few "
 "changes to the package as possible, and they should always send a patch as a "
 msgid ""
 "Maintainers other than the official package maintainer should make as few "
 "changes to the package as possible, and they should always send a patch as a "


@@ -2618,7 +2696,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1960
+#: pkgs.dbk:2024

 msgid ""
 "What if you are simply recompiling the package? If you just need to "
 "recompile it for a single architecture, then you may do a binary-only NMU as "
 msgid ""
 "What if you are simply recompiling the package? If you just need to "
 "recompile it for a single architecture, then you may do a binary-only NMU as "


@@ -2629,7 +2707,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 "Bugs fixed by source NMUs used to be tagged fixed instead of closed, but "
 "since version tracking is in place, such bugs are now also closed with the "
 msgid ""
 "Bugs fixed by source NMUs used to be tagged fixed instead of closed, but "
 "since version tracking is in place, such bugs are now also closed with the "


@@ -2637,7 +2715,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 "Also, after doing an NMU, you have to send the information to the existing "
 "bugs that are fixed by your NMU, including the unified diff.  Historically, "
 msgid ""
 "Also, after doing an NMU, you have to send the information to the existing "
 "bugs that are fixed by your NMU, including the unified diff.  Historically, "


@@ -2652,7 +2730,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 "In addition, the normal maintainer should <emphasis>always</emphasis> retain "
 "the entry in the changelog file documenting the non-maintainer upload -- and "
 msgid ""
 "In addition, the normal maintainer should <emphasis>always</emphasis> retain "
 "the entry in the changelog file documenting the non-maintainer upload -- and "


@@ -2661,12 +2739,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1991
+#: pkgs.dbk:2055

 msgid "Building source NMUs"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Building source NMUs"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1993
+#: pkgs.dbk:2057

 msgid ""
 "Source NMU packages are built normally.  Pick a distribution using the same "
 "rules as found in <xref linkend=\"distribution\"/> , follow the other "
 msgid ""
 "Source NMU packages are built normally.  Pick a distribution using the same "
 "rules as found in <xref linkend=\"distribution\"/> , follow the other "


@@ -2674,7 +2752,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1998
+#: pkgs.dbk:2062

 msgid ""
 "Make sure you do <emphasis>not</emphasis> change the value of the maintainer "
 "in the <filename>debian/control</filename> file.  Your name as given in the "
 msgid ""
 "Make sure you do <emphasis>not</emphasis> change the value of the maintainer "
 "in the <filename>debian/control</filename> file.  Your name as given in the "


@@ -2683,12 +2761,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2006
+#: pkgs.dbk:2070

 msgid "Acknowledging an NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Acknowledging an NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 "If one of your packages has been NMU'ed, you have to incorporate the changes "
 "in your copy of the sources.  This is easy, you just have to apply the patch "
 msgid ""
 "If one of your packages has been NMU'ed, you have to incorporate the changes "
 "in your copy of the sources.  This is easy, you just have to apply the patch "


@@ -2702,7 +2780,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2019
+#: pkgs.dbk:2083

 msgid ""
 "In any case, you should not be upset by the NMU.  An NMU is not a personal "
 "attack against the maintainer.  It is a proof that someone cares enough "
 msgid ""
 "In any case, you should not be upset by the NMU.  An NMU is not a personal "
 "attack against the maintainer.  It is a proof that someone cares enough "


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

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

 msgid "NMU vs QA uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "NMU vs QA uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 "Unless you know the maintainer is still active, it is wise to check the "
 "package to see if it has been orphaned.  The current list of orphaned "
 msgid ""
 "Unless you know the maintainer is still active, it is wise to check the "
 "package to see if it has been orphaned.  The current list of orphaned "


@@ -2729,12 +2807,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2041
+#: pkgs.dbk:2105

 msgid "Who can do an NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Who can do an NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2043
+#: pkgs.dbk:2107

 msgid ""
 "Only official, registered Debian Developers can do binary or source NMUs.  A "
 "Debian Developer is someone who has their key in the Debian key ring.  Non-"
 msgid ""
 "Only official, registered Debian Developers can do binary or source NMUs.  A "
 "Debian Developer is someone who has their key in the Debian key ring.  Non-"


@@ -2745,23 +2823,23 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2053
+#: pkgs.dbk:2117

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

-#: pkgs.dbk:2055
+#: pkgs.dbk:2119

 msgid ""
 "There are two new terms used throughout this section: ``binary-only NMU'' "
 "and ``source NMU''.  These terms are used with specific technical meaning "
 "throughout this document.  Both binary-only and source NMUs are similar, "
 "since they involve an upload of a package by a developer who is not the "
 msgid ""
 "There are two new terms used throughout this section: ``binary-only NMU'' "
 "and ``source NMU''.  These terms are used with specific technical meaning "
 "throughout this document.  Both binary-only and source NMUs are similar, "
 "since they involve an upload of a package by a developer who is not the "

-"official maintainer of that package.  That is why it's a <emphasis>non-"
-"maintainer</emphasis> upload."
+"official maintainer of that package.  That is why it's a <literal>non-"
+"maintainer</literal> upload."

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

-#: pkgs.dbk:2063
+#: pkgs.dbk:2127

 msgid ""
 "A source NMU is an upload of a package by a developer who is not the "
 "official maintainer, for the purposes of fixing a bug in the package.  "
 msgid ""
 "A source NMU is an upload of a package by a developer who is not the "
 "official maintainer, for the purposes of fixing a bug in the package.  "


@@ -2773,7 +2851,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 "A binary-only NMU is a recompilation and upload of a binary package for a "
 "given architecture.  As such, it is usually part of a porting effort.  A "
 msgid ""
 "A binary-only NMU is a recompilation and upload of a binary package for a "
 "given architecture.  As such, it is usually part of a porting effort.  A "


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

-#: pkgs.dbk:2082
+#: pkgs.dbk:2146

 msgid ""
 "Both classes of NMUs, source and binary-only, can be lumped under the term "
 "``NMU''.  However, this often leads to confusion, since most people think "
 msgid ""
 "Both classes of NMUs, source and binary-only, can be lumped under the term "
 "``NMU''.  However, this often leads to confusion, since most people think "


@@ -2795,12 +2873,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

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

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

-#: pkgs.dbk:2094
+#: pkgs.dbk:2158

 msgid ""
 "Collaborative maintenance is a term describing the sharing of Debian package "
 "maintenance duties by several people.  This collaboration is almost always a "
 msgid ""
 "Collaborative maintenance is a term describing the sharing of Debian package "
 "maintenance duties by several people.  This collaboration is almost always a "


@@ -2811,23 +2889,25 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

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

 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 "
 "<literal>Maintainer</literal> field of the <filename>debian/control</"
 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 "
 "<literal>Maintainer</literal> field of the <filename>debian/control</"

-"filename> file.  Co-maintainers are all the other maintainers."
+"filename> file.  Co-maintainers are all the other maintainers, usually "
+"listed in the <literal>Uploaders</literal> field of the <filename>debian/"
+"control</filename> file."

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

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

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

 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 "


@@ -2837,28 +2917,30 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

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

 msgid ""
 "Add the co-maintainer's correct maintainer name and address to the "
 msgid ""
 "Add the co-maintainer's correct maintainer name and address to the "

-"<literal>Uploaders</literal> field in the global part of the "
+"<literal>Uploaders</literal> field in the first paragraph of the "

 "<filename>debian/control</filename> file."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><screen>
 "<filename>debian/control</filename> file."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><screen>

-#: pkgs.dbk:2127
+#: pkgs.dbk:2192

 #, no-wrap
 #, no-wrap

-msgid "Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex &lt;arex@debian.org&gt;"
+msgid ""
+"\n"
+"Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex &lt;arex@debian.org&gt;\n"

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

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

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

 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 "


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

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

 msgid ""
 "Put the team member mainly responsible for the package in the Maintainer "
 "field.  In the Uploaders, put the mailing list address, and the team members "
 msgid ""
 "Put the team member mainly responsible for the package in the Maintainer "
 "field.  In the Uploaders, put the mailing list address, and the team members "


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

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

 msgid ""
 "Put the mailing list address in the Maintainer field.  In the Uploaders "
 "field, put the team members who care for the package.  In this case, you "
 msgid ""
 "Put the mailing list address in the Maintainer field.  In the Uploaders "
 "field, put the team members who care for the package.  In this case, you "


@@ -2885,7 +2967,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

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

 msgid ""
 "In any case, it is a bad idea to automatically put all team members in the "
 "Uploaders field.  It clutters the Developer's Package Overview listing (see "
 msgid ""
 "In any case, it is a bad idea to automatically put all team members in the "
 "Uploaders field.  It clutters the Developer's Package Overview listing (see "


@@ -2894,112 +2976,114 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

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

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

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

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

 msgid ""
 msgid ""

-"Packages are usually installed into the `testing' distribution after they "
-"have undergone some degree of testing in unstable."
+"Packages are usually installed into the <literal>testing</literal> "
+"distribution after they have undergone some degree of <literal>testing</"
+"literal> in <literal>unstable</literal>."

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

-#: pkgs.dbk:2178
+#: pkgs.dbk:2245

 msgid ""
 "They must be in sync on all architectures and mustn't have dependencies that "
 "make them uninstallable; they also have to have generally no known release-"
 msgid ""
 "They must be in sync on all architectures and mustn't have dependencies that "
 "make them uninstallable; they also have to have generally no known release-"

-"critical bugs at the time they're installed into testing.  This way, "
-"`testing' should always be close to being a release candidate.  Please see "
-"below for details."
+"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:2187
+#: pkgs.dbk:2254

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

 msgid ""
 msgid ""

-"The scripts that update the <emphasis>testing</emphasis> distribution are "
-"run each day after the installation of the updated packages; these scripts "
-"are called <emphasis>britney</emphasis>.  They generate the "
-"<filename>Packages</filename> files for the <emphasis>testing</emphasis> "
+"The scripts that update the <literal>testing</literal> distribution are run "
+"twice each day, right after the installation of the updated packages; these "
+"scripts are called <literal>britney</literal>.  They generate the "
+"<filename>Packages</filename> files for the <literal>testing</literal> "

 "distribution, but they do so in an intelligent manner; they try to avoid any "
 "inconsistency and to use only non-buggy packages."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 "distribution, but they do so in an intelligent manner; they try to avoid any "
 "inconsistency and to use only non-buggy packages."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 msgid ""

-"The inclusion of a package from <emphasis>unstable</emphasis> is conditional "
+"The inclusion of a package from <literal>unstable</literal> is conditional "

 "on the following:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 "on the following:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2203
+#: pkgs.dbk:2270

 msgid ""
 msgid ""

-"The package must have been available in <emphasis>unstable</emphasis> for 2, "
-"5 or 10 days, depending on the urgency (high, medium or low).  Please note "
+"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 "

 "that the urgency is sticky, meaning that the highest urgency uploaded since "
 "that the urgency is sticky, meaning that the highest urgency uploaded since "

-"the previous testing transition is taken into account.  Those delays may be "
-"doubled during a freeze, or testing transitions may be switched off "
-"altogether;"
+"the previous <literal>testing</literal> transition is taken into account.  "
+"Those delays may be doubled during a freeze, or <literal>testing</literal> "
+"transitions may be switched off altogether;"

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

-#: pkgs.dbk:2212
+#: pkgs.dbk:2280

 msgid ""
 msgid ""

-"It must have the same number or fewer release-critical bugs than the version "
-"currently available in <emphasis>testing</emphasis>;"
+"It must not have new release-critical bugs (RC bugs affecting the version "
+"available in <literal>unstable</literal>, but not affecting the version in "
+"<literal>testing</literal>);"

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

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

 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 unstable.  <xref linkend=\"madison\"/> may be of interest to check "
-"that information;"
+"built in <literal>unstable</literal>.  <xref linkend=\"dak-ls\"/> may be of "
+"interest to check that information;"

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

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

 msgid ""
 "It must not break any dependency of a package which is already available in "
 msgid ""
 "It must not break any dependency of a package which is already available in "

-"<emphasis>testing</emphasis>;"
+"<literal>testing</literal>;"

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

-#: pkgs.dbk:2231
+#: pkgs.dbk:2300

 msgid ""
 "The packages on which it depends must either be available in "
 msgid ""
 "The packages on which it depends must either be available in "

-"<emphasis>testing</emphasis> or they must be accepted into "
-"<emphasis>testing</emphasis> at the same time (and they will be if they "
-"fulfill all the necessary criteria);"
+"<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);"

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

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

 msgid ""
 msgid ""

-"To find out whether a package is progressing into testing or not, see the "
-"testing script output on the <ulink url=\"&url-testing-maint;\">web page of "
-"the testing distribution</ulink>, or use the program <command>grep-excuses</"
-"command> which is in the <systemitem role=\"package\">devscripts</"
-"systemitem> package.  This utility can easily be used in a <citerefentry> "
-"<refentrytitle>crontab</refentrytitle> <manvolnum>5</manvolnum> </"
-"citerefentry> to keep yourself informed of the progression of your packages "
-"into <emphasis>testing</emphasis>."
+"To find out whether a package is progressing into <literal>testing</literal> "
+"or not, see the <literal>testing</literal> script output on the <ulink url="
+"\"&url-testing-maint;\">web page of the testing distribution</ulink>, or use "
+"the program <command>grep-excuses</command> which is in the <systemitem role="
+"\"package\">devscripts</systemitem> package.  This utility can easily be "
+"used in a <citerefentry> <refentrytitle>crontab</refentrytitle> "
+"<manvolnum>5</manvolnum> </citerefentry> to keep yourself informed of the "
+"progression of your packages into <literal>testing</literal>."

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

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

 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 "


@@ -3009,105 +3093,109 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 msgid ""

-"Sometimes, some packages never enter <emphasis>testing</emphasis> because "
-"the set of inter-relationship is too complicated and cannot be sorted out by "
-"the scripts.  See below for details."
+"Sometimes, some packages never enter <literal>testing</literal> because the "
+"set of inter-relationship is too complicated and cannot be sorted out by the "
+"scripts.  See below for details."

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

-#: pkgs.dbk:2262
+#: pkgs.dbk:2331

 msgid ""
 msgid ""

-"Some further dependency analysis is shown on <ulink url=\"http://bjorn.haxx."
-"se/debian/\"></ulink> — but be warned, this page also shows build "
+"Some further dependency analysis is shown on <ulink url=\"http://release."
+"debian.org/migration/\"></ulink> — but be warned, this page also shows build "

 "dependencies which are not considered by britney."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 "dependencies which are not considered by britney."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2267
+#: pkgs.dbk:2336

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

-#: pkgs.dbk:2270
+#: pkgs.dbk:2339

 msgid ""
 msgid ""

-"For the testing migration script, outdated means: There are different "
-"versions in unstable for the release architectures (except for the "
-"architectures in fuckedarches; fuckedarches is a list of architectures that "
-"don't keep up (in update_out.py), but currently, it's empty).  outdated has "
-"nothing whatsoever to do with the architectures this package has in testing."
+"For the <literal>testing</literal> migration script, outdated means: There "
+"are different versions in <literal>unstable</literal> for the release "
+"architectures (except for the architectures in fuckedarches; fuckedarches is "
+"a list of architectures that don't keep up (in <filename>update_out.py</"
+"filename>), but currently, it's empty).  outdated has nothing whatsoever to "
+"do with the architectures this package has in <literal>testing</literal>."

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

-#: pkgs.dbk:2277
+#: pkgs.dbk:2347

 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:2284 pkgs.dbk:2315
+#: pkgs.dbk:2354 pkgs.dbk:2387

 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:2285 pkgs.dbk:2316
+#: pkgs.dbk:2355 pkgs.dbk:2388

 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:2290 pkgs.dbk:2322 pkgs.dbk:2382
+#: pkgs.dbk:2360 pkgs.dbk:2394 pkgs.dbk:2456

 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:2291 pkgs.dbk:2296 pkgs.dbk:2323 pkgs.dbk:2324 pkgs.dbk:2331
+#: pkgs.dbk:2361 pkgs.dbk:2366 pkgs.dbk:2395 pkgs.dbk:2396 pkgs.dbk:2403

 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:2292 pkgs.dbk:2325 pkgs.dbk:2330
+#: pkgs.dbk:2362 pkgs.dbk:2397 pkgs.dbk:2402

 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:2295 pkgs.dbk:2328 pkgs.dbk:2383
+#: pkgs.dbk:2365 pkgs.dbk:2400 pkgs.dbk:2457

 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:2297 pkgs.dbk:2329
+#: pkgs.dbk:2367 pkgs.dbk:2401

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

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

 msgid ""
 msgid ""

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

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

-#: pkgs.dbk:2308
-msgid "However, if ftp-master removes a package in unstable (here on arm):"
+#: pkgs.dbk:2379
+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>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2317
+#: pkgs.dbk:2389

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

 msgid ""
 "In this case, the package is up to date on all release architectures in "
 msgid ""
 "In this case, the package is up to date on all release architectures in "

-"unstable (and the extra hurd-i386 doesn't matter, as it's not a release "
-"architecture)."
+"<literal>unstable</literal> (and the extra <literal>hurd-i386</literal> "
+"doesn't matter, as it's not a release architecture)."

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

-#: pkgs.dbk:2342
+#: pkgs.dbk:2414

 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 "


@@ -3115,91 +3203,93 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2349
+#: pkgs.dbk:2421

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

 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 "

-"every other sense.  Suppose e.g.  that <emphasis>a</emphasis> cannot be "
-"installed with the new version of <emphasis>b</emphasis>; then <emphasis>a</"
-"emphasis> may be removed to allow <emphasis>b</emphasis> in."
+"every other sense.  Suppose e.g.  that <literal>a</literal> cannot be "
+"installed with the new version of <literal>b</literal>; then <literal>a</"
+"literal> may be removed to allow <literal>b</literal> in."

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

-#: pkgs.dbk:2358
+#: pkgs.dbk:2430

 msgid ""
 msgid ""

-"Of course, there is another reason to remove a package from testing: 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:2362
+#: pkgs.dbk:2435

 msgid ""
 msgid ""

-"Furthermore, if a package has been removed from unstable, and no package in "
-"testing depends on it any more, then it will automatically be removed."
+"Furthermore, if a package has been removed from <literal>unstable</literal>, "
+"and no package in <literal>testing</literal> depends on it any more, then it "
+"will automatically be removed."

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

-#: pkgs.dbk:2368
+#: pkgs.dbk:2442

 msgid "circular dependencies"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "circular dependencies"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

 msgid ""
 "A situation which is not handled very well by britney is if package "
 msgid ""
 "A situation which is not handled very well by britney is if package "

-"<emphasis>a</emphasis> depends on the new version of package <emphasis>b</"
-"emphasis>, and vice versa."
+"<literal>a</literal> depends on the new version of package <literal>b</"
+"literal>, and vice versa."

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

-#: pkgs.dbk:2375
+#: pkgs.dbk:2449

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

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

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

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

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

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

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

 msgid ""
 msgid ""

-"Neither package <emphasis>a</emphasis> nor package <emphasis>b</emphasis> is "
+"Neither package <literal>a</literal> nor package <literal>b</literal> is "

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

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

 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 "


@@ -3207,44 +3297,46 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

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

 msgid "influence of package in testing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "influence of package in testing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

 msgid ""
 msgid ""

-"Generally, there is nothing that the status of a package in testing means "
-"for transition of the next version from unstable to testing, 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 testing is out of sync on the different arches: Then any arch "
+"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 "
 "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 "

-"unstable at all during the testing migration."
+"<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:2424
+#: pkgs.dbk:2500

 msgid ""
 msgid ""

-"In summary this means: The only influence that a package being in testing "
-"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:2431
+#: pkgs.dbk:2507

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

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

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

 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 "


@@ -3257,48 +3349,52 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2445
+#: pkgs.dbk:2521

 msgid ""
 msgid ""

-"Now, the more complex part happens: Britney tries to update testing with the "
-"valid candidates; first, each package alone, and then larger and even larger "
-"sets of packages together.  Each try is accepted if testing is not more "
-"uninstallable after the update than before.  (Before and after this part, "
-"some hints are processed; but as only release masters can hint, this is "
-"probably not so important for you.)"
+"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:2453
+#: pkgs.dbk:2531

 msgid ""
 msgid ""

-"If you want to see more details, you can look it up on merkel:/org/&ftp-"
-"debian-org;/testing/update_out/ (or there in ~aba/testing/update_out 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>"
+"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>"

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

-#: pkgs.dbk:2460
+#: pkgs.dbk:2538

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

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

 msgid ""
 msgid ""

-"The testing distribution is fed with packages from unstable according to the "
-"rules explained above.  However, in some cases, it is necessary to upload "
-"packages built only for testing.  For that, you may want to upload to "
-"<emphasis>testing-proposed-updates</emphasis>."
+"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>."

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

-#: pkgs.dbk:2476
+#: pkgs.dbk:2555

 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 "


@@ -3308,146 +3404,147 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2483
+#: pkgs.dbk:2562

 msgid ""
 msgid ""

-"You should not upload to <emphasis>testing-proposed-updates</emphasis> when "
-"you can update your packages through <emphasis>unstable</emphasis>.  If you "
+"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 "
 "can't (for example because you have a newer development version in "

-"unstable), 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 unstable are possible, if the upload via unstable does not "
-"pull in any new dependencies."
+"<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 "
+"new dependencies."

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

-#: pkgs.dbk:2492
+#: pkgs.dbk:2571

 msgid ""
 msgid ""

-"Version numbers are usually selected by adding the codename of the testing "
-"distribution and a running number, like 1.2sarge1 for the first upload "
-"through testing-proposed-updates of package version 1.2."
+"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>testing-"
+"proposed-updates</literal> of package version <literal>1.2</literal>."

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

-#: pkgs.dbk:2497
+#: pkgs.dbk:2578

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

 msgid ""
 msgid ""

-"Make sure that your package really needs to go through <emphasis>testing-"
-"proposed-updates</emphasis>, and can't go through unstable;"
+"Make sure that your package really needs to go through <literal>testing-"
+"proposed-updates</literal>, and can't go through <literal> unstable</"
+"literal>;"

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

-#: pkgs.dbk:2508
+#: pkgs.dbk:2590

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

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

 msgid ""
 msgid ""

-"Make sure that you've written <emphasis>testing</emphasis> or "
-"<emphasis>testing-proposed-updates</emphasis> into your target distribution;"
+"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>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

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

 msgid ""
 msgid ""

-"Make sure that you've built and tested your package in <emphasis>testing</"
-"emphasis>, not in <emphasis>unstable</emphasis>;"
+"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>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

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

 msgid ""
 "Make sure that your version number is higher than the version in "
 msgid ""
 "Make sure that your version number is higher than the version in "

-"<emphasis>testing</emphasis> and <emphasis>testing-proposed-updates</"
-"emphasis>, and lower than in <emphasis>unstable</emphasis>;"
+"<literal>testing</literal> and <literal>testing-proposed-updates</literal>, "
+"and lower than in <literal>unstable</literal>;"

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

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

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

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

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

 msgid ""
 "All bugs of some higher severities are by default considered release-"
 msgid ""
 "All bugs of some higher severities are by default considered release-"

-"critical; currently, these are critical, grave, and serious bugs."
+"critical; currently, these are <literal>critical</literal>, <literal>grave</"
+"literal> and <literal>serious</literal> bugs."

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

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

 msgid ""
 "Such bugs are presumed to have an impact on the chances that the package "
 msgid ""
 "Such bugs are presumed to have an impact on the chances that the package "

-"will be released with the stable release of Debian: in general, if a package "
-"has open release-critical bugs filed on it, it won't get into testing, and "
-"consequently won't be released in stable."
+"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>."

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

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

 msgid ""
 msgid ""

-"The unstable bug count are all release-critical bugs without either any "
-"release-tag (such as potato, woody) or with release-tag sid; also, only if "
-"they are neither fixed nor set to sarge-ignore.  The testing bug count for a "
-"package is considered to be roughly the bug count of unstable count at the "
-"last point when the testing version equalled the unstable version."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2566
-msgid ""
-"This will change post-sarge, as soon as we have versions in the bug tracking "
-"system."
+"The <literal>unstable</literal> bug count are all release-critical bugs "
+"which are marked to apply to <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>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2572
+#: pkgs.dbk:2651

 msgid ""
 msgid ""

-"How could installing a package into testing possibly break other packages?"
+"How could installing a package into <literal>testing</literal> possibly "
+"break other packages?"

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

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

 msgid ""
 "The structure of the distribution archives is such that they can only "
 "contain one version of a package; a package is defined by its name.  So when "
 msgid ""
 "The structure of the distribution archives is such that they can only "
 "contain one version of a package; a package is defined by its name.  So when "

-"the source package acmefoo is installed into testing, along with its binary "
-"packages acme-foo-bin, acme-bar-bin, libacme-foo1 and libacme-foo-dev, the "
-"old version is removed."
+"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 old version is removed."

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

-#: pkgs.dbk:2581
+#: pkgs.dbk:2662

 msgid ""
 "However, the old version may have provided a binary package with an old "
 msgid ""
 "However, the old version may have provided a binary package with an old "

-"soname of a library, such as libacme-foo0.  Removing the old acmefoo will "
-"remove libacme-foo0, which will break any packages which depend on it."
+"soname of a library, such as <literal>libacme-foo0</literal>.  Removing the "
+"old <literal>acmefoo</literal> will remove <literal>libacme-foo0</literal>, "
+"which will break any packages which depend on it."

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

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

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


@@ -3456,22 +3553,22 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2592
+#: pkgs.dbk:2674

 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 "
 "updated to depend on the new binaries instead.  Because installing such a "
 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 "
 "updated to depend on the new binaries instead.  Because installing such a "

-"source package into testing breaks all the packages that depended on it in "
-"testing, some care has to be taken now: all the depending packages must be "
-"updated and ready to be installed themselves so that they won't be broken, "
-"and, once everything is ready, manual intervention by the release manager or "
-"an assistant is normally required."
+"source package into <literal>testing</literal> breaks all the packages that "
+"depended on it in <literal>testing</literal>, some care has to be taken now: "
+"all the depending packages must be updated and ready to be installed "
+"themselves so that they won't be broken, and, once everything is ready, "
+"manual intervention by the release manager or an assistant is normally "
+"required."

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

-#: pkgs.dbk:2602
+#: pkgs.dbk:2685

 msgid ""
 "If you are having problems with complicated groups of packages like this, "
 msgid ""
 "If you are having problems with complicated groups of packages like this, "

-"contact debian-devel or debian-release for help."
+"contact &email-debian-devel; or &email-debian-release; for help."

 msgstr ""
 msgstr ""

-

diff --git a/po4a/fr/resources.po b/po4a/fr/resources.po
index dcbbeb662850b59808d8b7ddbefcecadfd0b402d..2754c2d8d6ab32bf9313da709b938745a9c47d65 100644 (file)
--- a/po4a/fr/resources.po
+++ b/po4a/fr/resources.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.
 # , fuzzy
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.
 # , fuzzy

-# 
-# 
+#
+#

 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-07-01 21:16+0000\n"
+"POT-Creation-Date: 2008-08-08 11:36-0300\n"

 "PO-Revision-Date: 2007-07-01 23:16+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "PO-Revision-Date: 2007-07-01 23:16+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: "
+"Content-Transfer-Encoding: \n"

 
 # type: Content of: <chapter><title>
 #: resources.dbk:7
 
 # type: Content of: <chapter><title>
 #: resources.dbk:7


@@ -28,10 +28,11 @@ msgid ""
 "lists, the Debian machines which may be available to you as a developer, and "
 "all the other resources that are available to help you in your maintainer "
 "work."
 "lists, the Debian machines which may be available to you as a developer, and "
 "all the other resources that are available to help you in your maintainer "
 "work."

-msgstr "Dans ce chapitre, vous trouverez une brève description des listes de"
-"diffusion, des machines Debian qui seront à votre disposition en tant"
-"que responsable Debian ainsi que toutes les autres ressources à votre"
-"disposition pour vous aider dans votre travail de responsable."
+msgstr ""
+"Dans ce chapitre, vous trouverez une brève description des listes "
+"dediffusion, des machines Debian qui seront à votre disposition en tantque "
+"responsable Debian ainsi que toutes les autres ressources à votredisposition "
+"pour vous aider dans votre travail de responsable."

 
 # type: Content of: <chapter><section><title>
 #: resources.dbk:14
 
 # type: Content of: <chapter><section><title>
 #: resources.dbk:14


@@ -78,60 +79,61 @@ msgstr ""
 #: resources.dbk:40
 msgid ""
 "Please read the <ulink url=\"&url-debian-lists;#codeofconduct\">code of "
 #: resources.dbk:40
 msgid ""
 "Please read the <ulink url=\"&url-debian-lists;#codeofconduct\">code of "

-"conduct</ulink> for more information."
+"conduct</ulink> for more information. The <ulink url=\"&url-dcg;\">Debian "
+"Community Guidelines</ulink> are also worth reading."

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

-#: resources.dbk:47
+#: resources.dbk:48

 msgid "Core development mailing lists"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Core development mailing lists"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:49
+#: resources.dbk:50

 msgid "The core Debian mailing lists that developers should use are:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "The core Debian mailing lists that developers should use are:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:54
+#: resources.dbk:55

 msgid ""
 "&email-debian-devel-announce;, used to announce important things to "
 "developers.  All developers are expected to be subscribed to this list."
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "&email-debian-devel-announce;, used to announce important things to "
 "developers.  All developers are expected to be subscribed to this list."
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:61
+#: resources.dbk:62

 msgid ""
 "&email-debian-devel;, used to discuss various development related technical "
 "issues."
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "&email-debian-devel;, used to discuss various development related technical "
 "issues."
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:67
+#: resources.dbk:68

 msgid ""
 "&email-debian-policy;, where the Debian Policy is discussed and voted on."
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "&email-debian-policy;, where the Debian Policy is discussed and voted on."
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:73
+#: resources.dbk:74

 msgid ""
 "&email-debian-project;, used to discuss various non-technical issues related "
 "to the project."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "&email-debian-project;, used to discuss various non-technical issues related "
 "to the project."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:79
+#: resources.dbk:80

 msgid ""
 "There are other mailing lists available for a variety of special topics; see "
 "<ulink url=\"http://&lists-host;/\"></ulink> for a list."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "There are other mailing lists available for a variety of special topics; see "
 "<ulink url=\"http://&lists-host;/\"></ulink> for a list."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:85
+#: resources.dbk:86

 msgid "Special lists"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Special lists"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:87
+#: resources.dbk:88

 msgid ""
 "&email-debian-private; is a special mailing list for private discussions "
 "amongst Debian developers.  It is meant to be used for posts which for "
 msgid ""
 "&email-debian-private; is a special mailing list for private discussions "
 "amongst Debian developers.  It is meant to be used for posts which for "


@@ -140,12 +142,12 @@ msgid ""
 "is really necessary.  Moreover, do <emphasis>not</emphasis> forward email "
 "from that list to anyone.  Archives of this list are not available on the "
 "web for obvious reasons, but you can see them using your shell account on "
 "is really necessary.  Moreover, do <emphasis>not</emphasis> forward email "
 "from that list to anyone.  Archives of this list are not available on the "
 "web for obvious reasons, but you can see them using your shell account on "

-"<literal>&lists-host;</literal> and looking in the <filename>&file-debian-"
+"<literal>&master-host;</literal> and looking in the <filename>&file-debian-"

 "private-archive;</filename> directory."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 "private-archive;</filename> directory."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:99
+#: resources.dbk:100

 msgid ""
 "&email-debian-email; is a special mailing list used as a grab-bag for Debian "
 "related correspondence such as contacting upstream authors about licenses, "
 msgid ""
 "&email-debian-email; is a special mailing list used as a grab-bag for Debian "
 "related correspondence such as contacting upstream authors about licenses, "


@@ -154,12 +156,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:107
+#: resources.dbk:108

 msgid "Requesting new development-related lists"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Requesting new development-related lists"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:109
+#: resources.dbk:110

 msgid ""
 "Before requesting a mailing list that relates to the development of a "
 "package (or a small group of related packages), please consider if using an "
 msgid ""
 "Before requesting a mailing list that relates to the development of a "
 "package (or a small group of related packages), please consider if using an "


@@ -170,7 +172,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:117
+#: resources.dbk:118

 msgid ""
 "If you decide that a regular mailing list on &lists-host; is really what you "
 "want, go ahead and fill in a request, following <ulink url=\"&url-debian-"
 msgid ""
 "If you decide that a regular mailing list on &lists-host; is really what you "
 "want, go ahead and fill in a request, following <ulink url=\"&url-debian-"


@@ -178,12 +180,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: resources.dbk:126
+#: resources.dbk:127

 msgid "IRC channels"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "IRC channels"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:128
+#: resources.dbk:129

 msgid ""
 "Several IRC channels are dedicated to Debian's development.  They are mainly "
 "hosted on the <ulink url=\"&url-oftc;\">Open and free technology community "
 msgid ""
 "Several IRC channels are dedicated to Debian's development.  They are mainly "
 "hosted on the <ulink url=\"&url-oftc;\">Open and free technology community "


@@ -192,60 +194,59 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:134
+#: resources.dbk:135

 msgid ""
 msgid ""

-"The main channel for Debian in general is <emphasis>#debian</emphasis>.  "
-"This is a large, general-purpose channel where users can find recent news in "
-"the topic and served by bots.  <emphasis>#debian</emphasis> is for English "
-"speakers; there are also <emphasis>#debian.de</emphasis>, <emphasis>#debian-"
-"fr</emphasis>, <emphasis>#debian-br</emphasis> and other similarly named "
-"channels for speakers of other languages."
+"The main channel for Debian in general is <literal>#debian</literal>.  This "
+"is a large, general-purpose channel where users can find recent news in the "
+"topic and served by bots.  <literal>#debian</literal> is for English "
+"speakers; there are also <literal>#debian.de</literal>, <literal>#debian-fr</"
+"literal>, <literal>#debian-br</literal> and other similarly named channels "
+"for speakers of other languages."

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

-#: resources.dbk:142
+#: resources.dbk:143

 msgid ""
 msgid ""

-"The main channel for Debian development is <emphasis>#debian-devel</"
-"emphasis>.  It is a very active channel since usually over 150 people are "
+"The main channel for Debian development is <literal>#debian-devel</"
+"literal>.  It is a very active channel since usually over 150 people are "

 "always logged in.  It's a channel for people who work on Debian, it's not a "
 "always logged in.  It's a channel for people who work on Debian, it's not a "

-"support channel (there's <emphasis>#debian</emphasis> for that).  It is "
+"support channel (there's <literal>#debian</literal> for that).  It is "

 "however open to anyone who wants to lurk (and learn).  Its topic is commonly "
 "full of interesting information for developers."
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 "however open to anyone who wants to lurk (and learn).  Its topic is commonly "
 "full of interesting information for developers."
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:150
+#: resources.dbk:151

 msgid ""
 msgid ""

-"Since <emphasis>#debian-devel</emphasis> is an open channel, you should not "
+"Since <literal>#debian-devel</literal> is an open channel, you should not "

 "speak there of issues that are discussed in &email-debian-private;.  There's "
 "speak there of issues that are discussed in &email-debian-private;.  There's "

-"another channel for this purpose, it's called <emphasis>#debian-private</"
-"emphasis> and it's protected by a key.  This key is available in the "
-"archives of debian-private in <filename>master.debian.org:&file-debian-"
-"private-archive;</filename>, just <command>zgrep</command> for "
-"<emphasis>#debian-private</emphasis> in all the files."
+"another channel for this purpose, it's called <literal>#debian-private</"
+"literal> and it's protected by a key.  This key is available in the archives "
+"of debian-private in <filename>master.debian.org:&file-debian-private-"
+"archive;</filename>, just <command>zgrep</command> for <literal>#debian-"
+"private</literal> in all the files."

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

-#: resources.dbk:160
+#: resources.dbk:161

 msgid ""
 "There are other additional channels dedicated to specific subjects.  "
 msgid ""
 "There are other additional channels dedicated to specific subjects.  "

-"<emphasis>#debian-bugs</emphasis> is used for coordinating bug squashing "
-"parties.  <emphasis>#debian-boot</emphasis> is used to coordinate the work "
-"on the debian-installer.  <emphasis>#debian-doc</emphasis> is occasionally "
-"used to talk about documentation, like the document you are reading.  Other "
+"<literal>#debian-bugs</literal> is used for coordinating bug squashing "
+"parties.  <literal>#debian-boot</literal> is used to coordinate the work on "
+"the debian-installer.  <literal>#debian-doc</literal> is occasionally used "
+"to talk about documentation, like the document you are reading.  Other "

 "channels are dedicated to an architecture or a set of packages: "
 "channels are dedicated to an architecture or a set of packages: "

-"<emphasis>#debian-bsd</emphasis>, <emphasis>#debian-kde</emphasis>, "
-"<emphasis>#debian-jr</emphasis>, <emphasis>#debian-edu</emphasis>, "
-"<emphasis>#debian-sf</emphasis> (SourceForge package), <emphasis>#debian-oo</"
-"emphasis> (OpenOffice package) ..."
+"<literal>#debian-kde</literal>, <literal>#debian-dpkg</literal>, "
+"<literal>#debian-jr</literal>, <literal>#debian-edu</literal>, "
+"<literal>#debian-oo</literal> (OpenOffice package) ..."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:172
 msgid ""
 "Some non-English developers' channels exist as well, for example "
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:172
 msgid ""
 "Some non-English developers' channels exist as well, for example "

-"<emphasis>#debian-devel-fr</emphasis> for French speaking people interested "
-"in Debian's development."
+"<literal>#debian-devel-fr</literal> for French speaking people interested in "
+"Debian's development."

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


@@ -300,7 +301,7 @@ msgstr ""
 # type: Content of: <chapter><section><para>
 #: resources.dbk:212
 msgid ""
 # type: Content of: <chapter><section><para>
 #: resources.dbk:212
 msgid ""

-"Most of the machines are available for individual developers to use, as long "
+"Some of the machines are available for individual developers to use, as long "

 "as the developers follow the rules set forth in the <ulink url=\"&url-dmup;"
 "\">Debian Machine Usage Policies</ulink>."
 msgstr ""
 "as the developers follow the rules set forth in the <ulink url=\"&url-dmup;"
 "\">Debian Machine Usage Policies</ulink>."
 msgstr ""


@@ -342,13 +343,15 @@ msgstr ""
 #: resources.dbk:239
 msgid ""
 "If you have a problem with the operation of a Debian server, and you think "
 #: resources.dbk:239
 msgid ""
 "If you have a problem with the operation of a Debian server, and you think "

-"that the system operators need to be notified of this problem, the Debian "
-"system administrator team is reachable at <email>debian-admin@&lists-host;</"
-"email>."
+"that the system operators need to be notified of this problem, you can check "
+"the list of open issues in the DSA queue of our request tracker at <ulink "
+"url=\"&url-rt;\" /> (you can login with user \"guest\" and password "
+"\"readonly\").  To report a new problem, simply send a mail to &email-rt-"
+"dsa; and make sure to put the string \"Debian RT\" somewhere in the subject."

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

-#: resources.dbk:245
+#: resources.dbk:247

 msgid ""
 "If you have a problem with a certain service, not related to the system "
 "administration (such as packages to be removed from the archive, suggestions "
 msgid ""
 "If you have a problem with a certain service, not related to the system "
 "administration (such as packages to be removed from the archive, suggestions "


@@ -358,31 +361,31 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:252
+#: resources.dbk:254

 msgid ""
 "Some of the core servers are restricted, but the information from there is "
 "mirrored to another server."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "Some of the core servers are restricted, but the information from there is "
 "mirrored to another server."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:256
+#: resources.dbk:258

 msgid "The bugs server"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "The bugs server"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:258
+#: resources.dbk:260

 msgid ""
 "<literal>&bugs-host;</literal> is the canonical location for the Bug "
 "Tracking System (BTS)."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "<literal>&bugs-host;</literal> is the canonical location for the Bug "
 "Tracking System (BTS)."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:262 resources.dbk:280
+#: resources.dbk:264 resources.dbk:282

 msgid "It is restricted; a mirror is available on <literal>merkel</literal>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "It is restricted; a mirror is available on <literal>merkel</literal>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:265
+#: resources.dbk:267

 msgid ""
 "If you plan on doing some statistical analysis or processing of Debian bugs, "
 "this would be the place to do it.  Please describe your plans on &email-"
 msgid ""
 "If you plan on doing some statistical analysis or processing of Debian bugs, "
 "this would be the place to do it.  Please describe your plans on &email-"


@@ -391,20 +394,20 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:273
+#: resources.dbk:275

 msgid "The ftp-master server"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "The ftp-master server"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:275
+#: resources.dbk:277

 msgid ""
 "The <literal>&ftp-master-host;</literal> server holds the canonical copy of "
 msgid ""
 "The <literal>&ftp-master-host;</literal> server holds the canonical copy of "

-"the Debian archive (excluding the non-US packages).  Generally, package "
-"uploads go to this server; see <xref linkend=\"upload\"/> ."
+"the Debian archive.  Generally, package uploads go to this server; see <xref "
+"linkend=\"upload\"/>."

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

-#: resources.dbk:283
+#: resources.dbk:285

 msgid ""
 "Problems with the Debian FTP archive generally need to be reported as bugs "
 "against the <systemitem role=\"package\">&ftp-debian-org;</systemitem> "
 msgid ""
 "Problems with the Debian FTP archive generally need to be reported as bugs "
 "against the <systemitem role=\"package\">&ftp-debian-org;</systemitem> "


@@ -413,32 +416,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:291
-msgid "The non-US server"
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>

 #: resources.dbk:293
 #: resources.dbk:293

-msgid ""
-"The non-US server <literal>&non-us-host;</literal> was discontinued with the "
-"release of sarge.  The pseudo-package <systemitem role=\"package\">nonus."
-"debian.org</systemitem> still exists for now."
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:300

 msgid "The www-master server"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "The www-master server"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:302
+#: resources.dbk:295

 msgid ""
 "The main web server is <literal>www-master.debian.org</literal>.  It holds "
 "the official web pages, the face of Debian for most newbies."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "The main web server is <literal>www-master.debian.org</literal>.  It holds "
 "the official web pages, the face of Debian for most newbies."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:306
+#: resources.dbk:299

 msgid ""
 "If you find a problem with the Debian web server, you should generally "
 "submit a bug against the pseudo-package, <systemitem role=\"package\">www."
 msgid ""
 "If you find a problem with the Debian web server, you should generally "
 "submit a bug against the pseudo-package, <systemitem role=\"package\">www."


@@ -448,19 +438,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:315
+#: resources.dbk:308

 msgid "The people web server"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "The people web server"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:317
+#: resources.dbk:310

 msgid ""
 "<literal>people.debian.org</literal> is the server used for developers' own "
 "web pages about anything related to Debian."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "<literal>people.debian.org</literal> is the server used for developers' own "
 "web pages about anything related to Debian."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:321
+#: resources.dbk:314

 msgid ""
 "If you have some Debian-specific information which you want to serve on the "
 "web, you can do this by putting material in the <filename>public_html</"
 msgid ""
 "If you have some Debian-specific information which you want to serve on the "
 "web, you can do this by putting material in the <filename>public_html</"


@@ -470,14 +460,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:328
+#: resources.dbk:321

 msgid ""
 "You should only use this particular location because it will be backed up, "
 "whereas on other hosts it won't."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "You should only use this particular location because it will be backed up, "
 "whereas on other hosts it won't."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:332
+#: resources.dbk:325

 msgid ""
 "Usually the only reason to use a different host is when you need to publish "
 "materials subject to the U.S.  export restrictions, in which case you can "
 msgid ""
 "Usually the only reason to use a different host is when you need to publish "
 "materials subject to the U.S.  export restrictions, in which case you can "


@@ -485,67 +475,60 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:337
+#: resources.dbk:330

 msgid "Send mail to &email-debian-devel; if you have any questions."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid "Send mail to &email-debian-devel; if you have any questions."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:342
-msgid "The CVS server"
+#: resources.dbk:335
+msgid "The VCS servers"

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

-#: resources.dbk:345
-msgid "Our CVS server is located on <literal>cvs.debian.org</literal>."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:348
-msgid ""
-"If you need to use a publicly accessible CVS server, for instance, to help "
-"coordinate work on a package between many different developers, you can "
-"request a CVS area on the server."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:353
+#: resources.dbk:337

 msgid ""
 msgid ""

-"Generally, <literal>cvs.debian.org</literal> offers a combination of local "
-"CVS access, anonymous client-server read-only access, and full client-server "
-"access through <command>ssh</command>.  Also, the CVS area can be accessed "
-"read-only via the Web at <ulink url=\"&url-cvsweb;\"></ulink>."
+"If you need to use a Version Control System for any of your Debian work, you "
+"can use one the existing repositories hosted on Alioth or you can request a "
+"new project and ask for the VCS repository of your choice.  Alioth supports "
+"CVS (alioth.debian.org), Subversion (svn.debian.org), Arch (tla/baz, both on "
+"arch.debian.org), Bazaar (bzr.debian.org), Darcs (darcs.debian.org), "
+"Mercurial (hg.debian.org) and Git (git.debian.org).  Checkout <ulink url="
+"\"&url-alioth-pkg;\" /> if you plan to maintain packages in a VCS "
+"repository. See <xref linkend=\"alioth\"/> for information on the services "
+"provided by Alioth."

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

-#: resources.dbk:359
+#: resources.dbk:348

 msgid ""
 msgid ""

-"To request a CVS area, send a request via email to &email-debian-admin;.  "
-"Include the name of the requested CVS area, the Debian account that should "
-"own the CVS root area, and why you need it."
+"Historically, Debian first used <literal>cvs.debian.org</literal> to host "
+"CVS repositories. But that service is deprecated in favor of Alioth.  Only a "
+"few projects are still using it."

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

-#: resources.dbk:367
+#: resources.dbk:355

 msgid "chroots to different distributions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "chroots to different distributions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:369
+#: resources.dbk:357

 msgid ""
 "On some machines, there are chroots to different distributions available.  "
 "You can use them like this:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgid ""
 "On some machines, there are chroots to different distributions available.  "
 "You can use them like this:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

-#: resources.dbk:373
+#: resources.dbk:360

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

+"\n"

 "vore$ dchroot unstable\n"
 "vore$ dchroot unstable\n"

-"Executing shell in chroot: /org/vore.debian.org/chroots/user/unstable"
+"Executing shell in chroot: /org/vore.debian.org/chroots/user/unstable\n"

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

-#: resources.dbk:377
+#: resources.dbk:365

 msgid ""
 "In all chroots, the normal user home directories are available.  You can "
 "find out which chroots are available via <literal>&url-devel-machines;</"
 msgid ""
 "In all chroots, the normal user home directories are available.  You can "
 "find out which chroots are available via <literal>&url-devel-machines;</"


@@ -553,12 +536,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: resources.dbk:386
+#: resources.dbk:374

 msgid "The Developers Database"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "The Developers Database"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:388
+#: resources.dbk:376

 msgid ""
 "The Developers Database, at <ulink url=\"&url-debian-db;\"></ulink>, is an "
 "LDAP directory for managing Debian developer attributes.  You can use this "
 msgid ""
 "The Developers Database, at <ulink url=\"&url-debian-db;\"></ulink>, is an "
 "LDAP directory for managing Debian developer attributes.  You can use this "


@@ -568,29 +551,29 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:396
+#: resources.dbk:384

 msgid ""
 "Developers can <ulink url=\"&url-debian-db-login;\">log into the database</"
 "ulink> to change various information about themselves, such as:"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid ""
 "Developers can <ulink url=\"&url-debian-db-login;\">log into the database</"
 "ulink> to change various information about themselves, such as:"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:402
+#: resources.dbk:390

 msgid "forwarding address for your debian.org email"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "forwarding address for your debian.org email"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:407
+#: resources.dbk:395

 msgid "subscription to debian-private"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "subscription to debian-private"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:412
+#: resources.dbk:400

 msgid "whether you are on vacation"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "whether you are on vacation"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:417
+#: resources.dbk:405

 msgid ""
 "personal information such as your address, country, the latitude and "
 "longitude of the place where you live for use in <ulink url=\"&url-worldmap;"
 msgid ""
 "personal information such as your address, country, the latitude and "
 "longitude of the place where you live for use in <ulink url=\"&url-worldmap;"


@@ -599,12 +582,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:425
+#: resources.dbk:413

 msgid "password and preferred shell on Debian Project machines"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "password and preferred shell on Debian Project machines"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:430
+#: resources.dbk:418

 msgid ""
 "Most of the information is not accessible to the public, naturally.  For "
 "more information please read the online documentation that you can find at "
 msgid ""
 "Most of the information is not accessible to the public, naturally.  For "
 "more information please read the online documentation that you can find at "


@@ -612,7 +595,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:435
+#: resources.dbk:423

 msgid ""
 "Developers can also submit their SSH keys to be used for authorization on "
 "the official Debian machines, and even add new *.debian.net DNS entries.  "
 msgid ""
 "Developers can also submit their SSH keys to be used for authorization on "
 "the official Debian machines, and even add new *.debian.net DNS entries.  "


@@ -621,12 +604,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: resources.dbk:443
+#: resources.dbk:431

 msgid "The Debian archive"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "The Debian archive"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:445
+#: resources.dbk:433

 msgid ""
 "The &debian-formal; distribution consists of a lot of packages (<filename>."
 "deb</filename>'s, currently around &number-of-pkgs;) and a few additional "
 msgid ""
 "The &debian-formal; distribution consists of a lot of packages (<filename>."
 "deb</filename>'s, currently around &number-of-pkgs;) and a few additional "


@@ -634,29 +617,29 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:451
+#: resources.dbk:439

 msgid "Here is an example directory tree of a complete Debian archive:"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "Here is an example directory tree of a complete Debian archive:"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:455
+#: resources.dbk:443

 msgid ""
 "As you can see, the top-level directory contains two directories, "
 "<filename>dists/</filename> and <filename>pool/</filename>.  The latter is a "
 "“pool” in which the packages actually are, and which is handled by the "
 "archive maintenance database and the accompanying programs.  The former "
 msgid ""
 "As you can see, the top-level directory contains two directories, "
 "<filename>dists/</filename> and <filename>pool/</filename>.  The latter is a "
 "“pool” in which the packages actually are, and which is handled by the "
 "archive maintenance database and the accompanying programs.  The former "

-"contains the distributions, <emphasis>stable</emphasis>, <emphasis>testing</"
-"emphasis> and <emphasis>unstable</emphasis>.  The <filename>Packages</"
-"filename> and <filename>Sources</filename> files in the distribution "
-"subdirectories can reference files in the <filename>pool/</filename> "
-"directory.  The directory tree below each of the distributions is arranged "
-"in an identical manner.  What we describe below for <emphasis>stable</"
-"emphasis> is equally applicable to the <emphasis>unstable</emphasis> and "
-"<emphasis>testing</emphasis> distributions."
+"contains the distributions, <literal>stable</literal>, <literal>testing</"
+"literal> and <literal>unstable</literal>.  The <filename>Packages</filename> "
+"and <filename>Sources</filename> files in the distribution subdirectories "
+"can reference files in the <filename>pool/</filename> directory.  The "
+"directory tree below each of the distributions is arranged in an identical "
+"manner.  What we describe below for <literal>stable</literal> is equally "
+"applicable to the <literal>unstable</literal> and <literal>testing</literal> "
+"distributions."

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

-#: resources.dbk:469
+#: resources.dbk:457

 msgid ""
 "<filename>dists/stable</filename> contains three directories, namely "
 "<filename>main</filename>, <filename>contrib</filename>, and <filename>non-"
 msgid ""
 "<filename>dists/stable</filename> contains three directories, namely "
 "<filename>main</filename>, <filename>contrib</filename>, and <filename>non-"


@@ -664,7 +647,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:474
+#: resources.dbk:462

 msgid ""
 "In each of the areas, there is a directory for the source packages "
 "(<filename>source</filename>) and a directory for each supported "
 msgid ""
 "In each of the areas, there is a directory for the source packages "
 "(<filename>source</filename>) and a directory for each supported "


@@ -673,7 +656,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:479
+#: resources.dbk:467

 msgid ""
 "The <filename>main</filename> area contains additional directories which "
 "hold the disk images and some essential pieces of documentation required for "
 msgid ""
 "The <filename>main</filename> area contains additional directories which "
 "hold the disk images and some essential pieces of documentation required for "


@@ -682,23 +665,23 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:485
+#: resources.dbk:473

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

-#: resources.dbk:487
+#: resources.dbk:475

 msgid ""
 msgid ""

-"The <emphasis>main</emphasis> section of the Debian archive is what makes up "
+"The <literal>main</literal> section of the Debian archive is what makes up "

 "the <emphasis role=\"strong\">official &debian-formal; distribution</"
 "the <emphasis role=\"strong\">official &debian-formal; distribution</"

-"emphasis>.  The <emphasis>main</emphasis> section is official because it "
-"fully complies with all our guidelines.  The other two sections do not, to "
+"emphasis>.  The <literal>main</literal> section is official because it fully "
+"complies with all our guidelines.  The other two sections do not, to "

 "different degrees; as such, they are <emphasis role=\"strong\">not</"
 "emphasis> officially part of &debian-formal;."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 "different degrees; as such, they are <emphasis role=\"strong\">not</"
 "emphasis> officially part of &debian-formal;."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:495
+#: resources.dbk:483

 msgid ""
 "Every package in the main section must fully comply with the <ulink url="
 "\"&url-dfsg;\">Debian Free Software Guidelines</ulink> (DFSG) and with all "
 msgid ""
 "Every package in the main section must fully comply with the <ulink url="
 "\"&url-dfsg;\">Debian Free Software Guidelines</ulink> (DFSG) and with all "


@@ -708,25 +691,25 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:503
+#: resources.dbk:491

 msgid ""
 msgid ""

-"Packages in the <emphasis>contrib</emphasis> section have to comply with the "
+"Packages in the <literal>contrib</literal> section have to comply with the "

 "DFSG, but may fail other requirements.  For instance, they may depend on non-"
 "free packages."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 "DFSG, but may fail other requirements.  For instance, they may depend on non-"
 "free packages."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:508
+#: resources.dbk:496

 msgid ""
 msgid ""

-"Packages which do not conform to the DFSG are placed in the <emphasis>non-"
-"free</emphasis> section.  These packages are not considered as part of the "
+"Packages which do not conform to the DFSG are placed in the <literal>non-"
+"free</literal> section.  These packages are not considered as part of the "

 "Debian distribution, though we support their use, and we provide "
 "infrastructure (such as our bug-tracking system and mailing lists) for non-"
 "free software packages."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 "Debian distribution, though we support their use, and we provide "
 "infrastructure (such as our bug-tracking system and mailing lists) for non-"
 "free software packages."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:515
+#: resources.dbk:503

 msgid ""
 "The <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> contains "
 "a more exact definition of the three sections.  The above discussion is just "
 msgid ""
 "The <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> contains "
 "a more exact definition of the three sections.  The above discussion is just "


@@ -734,43 +717,43 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:520
+#: resources.dbk:508

 msgid ""
 "The separation of the three sections at the top-level of the archive is "
 "important for all people who want to distribute Debian, either via FTP "
 "servers on the Internet or on CD-ROMs: by distributing only the "
 msgid ""
 "The separation of the three sections at the top-level of the archive is "
 "important for all people who want to distribute Debian, either via FTP "
 "servers on the Internet or on CD-ROMs: by distributing only the "

-"<emphasis>main</emphasis> and <emphasis>contrib</emphasis> sections, one can "
-"avoid any legal risks.  Some packages in the <emphasis>non-free</emphasis> "
+"<literal>main</literal> and <literal>contrib</literal> sections, one can "
+"avoid any legal risks.  Some packages in the <literal>non-free</literal> "

 "section do not allow commercial distribution, for example."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 "section do not allow commercial distribution, for example."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:528
+#: resources.dbk:516

 msgid ""
 "On the other hand, a CD-ROM vendor could easily check the individual package "
 msgid ""
 "On the other hand, a CD-ROM vendor could easily check the individual package "

-"licenses of the packages in <emphasis>non-free</emphasis> and include as "
-"many on the CD-ROMs as it's allowed to.  (Since this varies greatly from "
-"vendor to vendor, this job can't be done by the Debian developers.)"
+"licenses of the packages in <literal>non-free</literal> and include as many "
+"on the CD-ROMs as it's allowed to.  (Since this varies greatly from vendor "
+"to vendor, this job can't be done by the Debian developers.)"

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

-#: resources.dbk:534
+#: resources.dbk:522

 msgid ""
 "Note that the term section is also used to refer to categories which "
 "simplify the organization and browsing of available packages, e.g.  "
 msgid ""
 "Note that the term section is also used to refer to categories which "
 "simplify the organization and browsing of available packages, e.g.  "

-"<emphasis>admin</emphasis>, <emphasis>net</emphasis>, <emphasis>utils</"
-"emphasis> etc.  Once upon a time, these sections (subsections, rather) "
-"existed in the form of subdirectories within the Debian archive.  Nowadays, "
-"these exist only in the Section header fields of packages."
+"<literal>admin</literal>, <literal>net</literal>, <literal>utils</literal> "
+"etc.  Once upon a time, these sections (subsections, rather) existed in the "
+"form of subdirectories within the Debian archive.  Nowadays, these exist "
+"only in the Section header fields of packages."

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

-#: resources.dbk:544
+#: resources.dbk:532

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

-#: resources.dbk:546
+#: resources.dbk:534

 msgid ""
 "In the first days, the Linux kernel was only available for Intel i386 (or "
 "greater) platforms, and so was Debian.  But as Linux became more and more "
 msgid ""
 "In the first days, the Linux kernel was only available for Intel i386 (or "
 "greater) platforms, and so was Debian.  But as Linux became more and more "


@@ -778,57 +761,56 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:551
+#: resources.dbk:539

 msgid ""
 "The Linux 2.0 kernel supports Intel x86, DEC Alpha, SPARC, Motorola 680x0 "
 "(like Atari, Amiga and Macintoshes), MIPS, and PowerPC.  The Linux 2.2 "
 "kernel supports even more architectures, including ARM and UltraSPARC.  "
 "Since Linux supports these platforms, Debian decided that it should, too.  "
 "Therefore, Debian has ports underway; in fact, we also have ports underway "
 msgid ""
 "The Linux 2.0 kernel supports Intel x86, DEC Alpha, SPARC, Motorola 680x0 "
 "(like Atari, Amiga and Macintoshes), MIPS, and PowerPC.  The Linux 2.2 "
 "kernel supports even more architectures, including ARM and UltraSPARC.  "
 "Since Linux supports these platforms, Debian decided that it should, too.  "
 "Therefore, Debian has ports underway; in fact, we also have ports underway "

-"to non-Linux kernels.  Aside from <emphasis>i386</emphasis> (our name for "
-"Intel x86), there is <emphasis>m68k</emphasis>, <emphasis>alpha</emphasis>, "
-"<emphasis>powerpc</emphasis>, <emphasis>sparc</emphasis>, <emphasis>hurd-"
-"i386</emphasis>, <emphasis>arm</emphasis>, <emphasis>ia64</emphasis>, "
-"<emphasis>hppa</emphasis>, <emphasis>s390</emphasis>, <emphasis>mips</"
-"emphasis>, <emphasis>mipsel</emphasis> and <emphasis>sh</emphasis> as of "
-"this writing."
+"to non-Linux kernels.  Aside from <literal>i386</literal> (our name for "
+"Intel x86), there is <literal>m68k</literal>, <literal>alpha</literal>, "
+"<literal>powerpc</literal>, <literal>sparc</literal>, <literal>hurd-i386</"
+"literal>, <literal>arm</literal>, <literal>ia64</literal>, <literal>hppa</"
+"literal>, <literal>s390</literal>, <literal>mips</literal>, <literal>mipsel</"
+"literal> and <literal>sh</literal> as of this writing."

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

-#: resources.dbk:565
+#: resources.dbk:553

 msgid ""
 msgid ""

-"&debian-formal; 1.3 is only available as <emphasis>i386</emphasis>.  Debian "
-"2.0 shipped for <emphasis>i386</emphasis> and <emphasis>m68k</emphasis> "
-"architectures.  Debian 2.1 ships for the <emphasis>i386</emphasis>, "
-"<emphasis>m68k</emphasis>, <emphasis>alpha</emphasis>, and <emphasis>sparc</"
-"emphasis> architectures.  Debian 2.2 added support for the "
-"<emphasis>powerpc</emphasis> and <emphasis>arm</emphasis> architectures.  "
-"Debian 3.0 added support of five new architectures: <emphasis>ia64</"
-"emphasis>, <emphasis>hppa</emphasis>, <emphasis>s390</emphasis>, "
-"<emphasis>mips</emphasis> and <emphasis>mipsel</emphasis>."
+"&debian-formal; 1.3 is only available as <literal>i386</literal>.  Debian "
+"2.0 shipped for <literal>i386</literal> and <literal>m68k</literal> "
+"architectures.  Debian 2.1 ships for the <literal>i386</literal>, "
+"<literal>m68k</literal>, <literal>alpha</literal>, and <literal>sparc</"
+"literal> architectures.  Debian 2.2 added support for the <literal>powerpc</"
+"literal> and <literal>arm</literal> architectures.  Debian 3.0 added support "
+"of five new architectures: <literal>ia64</literal>, <literal>hppa</literal>, "
+"<literal>s390</literal>, <literal>mips</literal> and <literal>mipsel</"
+"literal>."

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

-#: resources.dbk:576
+#: resources.dbk:564

 msgid ""
 "Information for developers and users about the specific ports are available "
 "at the <ulink url=\"&url-debian-ports;\">Debian Ports web pages</ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "Information for developers and users about the specific ports are available "
 "at the <ulink url=\"&url-debian-ports;\">Debian Ports web pages</ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:582
+#: resources.dbk:570

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

-#: resources.dbk:584
+#: resources.dbk:572

 msgid ""
 msgid ""

-"There are two types of Debian packages, namely <emphasis>source</emphasis> "
-"and <emphasis>binary</emphasis> packages."
+"There are two types of Debian packages, namely <literal>source</literal> and "
+"<literal>binary</literal> packages."

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

-#: resources.dbk:588
+#: resources.dbk:576

 msgid ""
 "Source packages consist of either two or three files: a <filename>.dsc</"
 "filename> file, and either a <filename>.tar.gz</filename> file or both an "
 msgid ""
 "Source packages consist of either two or three files: a <filename>.dsc</"
 "filename> file, and either a <filename>.tar.gz</filename> file or both an "


@@ -836,20 +818,20 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:594
+#: resources.dbk:582

 msgid ""
 "If a package is developed specially for Debian and is not distributed "
 "outside of Debian, there is just one <filename>.tar.gz</filename> file which "
 "contains the sources of the program.  If a package is distributed elsewhere "
 "too, the <filename>.orig.tar.gz</filename> file stores the so-called "
 msgid ""
 "If a package is developed specially for Debian and is not distributed "
 "outside of Debian, there is just one <filename>.tar.gz</filename> file which "
 "contains the sources of the program.  If a package is distributed elsewhere "
 "too, the <filename>.orig.tar.gz</filename> file stores the so-called "

-"<emphasis>upstream source code</emphasis>, that is the source code that's "
-"distributed by the <emphasis>upstream maintainer</emphasis> (often the "
-"author of the software).  In this case, the <filename>.diff.gz</filename> "
-"contains the changes made by the Debian maintainer."
+"<literal>upstream source code</literal>, that is the source code that's "
+"distributed by the <literal>upstream maintainer</literal> (often the author "
+"of the software).  In this case, the <filename>.diff.gz</filename> contains "
+"the changes made by the Debian maintainer."

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

-#: resources.dbk:604
+#: resources.dbk:592

 msgid ""
 "The <filename>.dsc</filename> file lists all the files in the source package "
 "together with checksums (<command>md5sums</command>) and some additional "
 msgid ""
 "The <filename>.dsc</filename> file lists all the files in the source package "
 "together with checksums (<command>md5sums</command>) and some additional "


@@ -857,21 +839,21 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:611
+#: resources.dbk:599

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

-#: resources.dbk:613
+#: resources.dbk:601

 msgid ""
 "The directory system described in the previous chapter is itself contained "
 msgid ""
 "The directory system described in the previous chapter is itself contained "

-"within <emphasis>distribution directories</emphasis>.  Each distribution is "
+"within <literal>distribution directories</literal>.  Each distribution is "

 "actually contained in the <filename>pool</filename> directory in the top-"
 "level of the Debian archive itself."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 "actually contained in the <filename>pool</filename> directory in the top-"
 "level of the Debian archive itself."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:619
+#: resources.dbk:607

 msgid ""
 "To summarize, the Debian archive has a root directory within an FTP server.  "
 "For instance, at the mirror site, <literal>ftp.us.debian.org</literal>, the "
 msgid ""
 "To summarize, the Debian archive has a root directory within an FTP server.  "
 "For instance, at the mirror site, <literal>ftp.us.debian.org</literal>, the "


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

-#: resources.dbk:626
+#: resources.dbk:614

 msgid ""
 "A distribution comprises Debian source and binary packages, and the "
 "respective <filename>Sources</filename> and <filename>Packages</filename> "
 msgid ""
 "A distribution comprises Debian source and binary packages, and the "
 "respective <filename>Sources</filename> and <filename>Packages</filename> "


@@ -892,26 +874,26 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: resources.dbk:634
+#: resources.dbk:622

 msgid "Stable, testing, and unstable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Stable, testing, and unstable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:636
+#: resources.dbk:624

 msgid ""
 msgid ""

-"There are always distributions called <emphasis>stable</emphasis> (residing "
-"in <filename>dists/stable</filename>), <emphasis>testing</emphasis> "
-"(residing in <filename>dists/testing</filename>), and <emphasis>unstable</"
-"emphasis> (residing in <filename>dists/unstable</filename>).  This reflects "
-"the development process of the Debian project."
+"There are always distributions called <literal>stable</literal> (residing in "
+"<filename>dists/stable</filename>), <literal>testing</literal> (residing in "
+"<filename>dists/testing</filename>), and <literal>unstable</literal> "
+"(residing in <filename>dists/unstable</filename>).  This reflects the "
+"development process of the Debian project."

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

-#: resources.dbk:643
+#: resources.dbk:631

 msgid ""
 msgid ""

-"Active development is done in the <emphasis>unstable</emphasis> distribution "
-"(that's why this distribution is sometimes called the <emphasis>development "
-"distribution</emphasis>).  Every Debian developer can update his or her "
+"Active development is done in the <literal>unstable</literal> distribution "
+"(that's why this distribution is sometimes called the <literal>development "
+"distribution</literal>).  Every Debian developer can update his or her "

 "packages in this distribution at any time.  Thus, the contents of this "
 "distribution change from day to day.  Since no special effort is made to "
 "make sure everything in this distribution is working properly, it is "
 "packages in this distribution at any time.  Thus, the contents of this "
 "distribution change from day to day.  Since no special effort is made to "
 "make sure everything in this distribution is working properly, it is "


@@ -919,240 +901,247 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:652
+#: resources.dbk:640

 msgid ""
 "The <link linkend=\"testing\">testing</link> distribution is generated "
 msgid ""
 "The <link linkend=\"testing\">testing</link> distribution is generated "

-"automatically by taking packages from unstable if they satisfy certain "
-"criteria.  Those criteria should ensure a good quality for packages within "
-"testing.  The update to testing is launched each day after the new packages "
-"have been installed.  See <xref linkend=\"testing\"/> ."
+"automatically by taking packages from <literal>unstable</literal> if they "
+"satisfy certain criteria.  Those criteria should ensure a good quality for "
+"packages within <literal>testing</literal>.  The update to <literal>testing "
+"</literal> is launched twice each day, right after the new packages have "
+"been installed.  See <xref linkend=\"testing\"/> ."

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

-#: resources.dbk:659
+#: resources.dbk:648

 msgid ""
 "After a period of development, once the release manager deems fit, the "
 msgid ""
 "After a period of development, once the release manager deems fit, the "

-"<emphasis>testing</emphasis> distribution is frozen, meaning that the "
-"policies which control how packages move from <emphasis>unstable</emphasis> "
-"to <emphasis>testing</emphasis> are tightened.  Packages which are too buggy "
-"are removed.  No changes are allowed into <emphasis>testing</emphasis> "
-"except for bug fixes.  After some time has elapsed, depending on progress, "
-"the <emphasis>testing</emphasis> distribution is frozen even further.  "
-"Details of the handling of the testing distribution are published by the "
-"Release Team on debian-devel-announce.  After the open issues are solved to "
-"the satisfaction of the Release Team, the distribution is released.  "
-"Releasing means that <emphasis>testing</emphasis> is renamed to "
-"<emphasis>stable</emphasis>, and a new copy is created for the new "
-"<emphasis>testing</emphasis>, and the previous <emphasis>stable</emphasis> "
-"is renamed to <emphasis>oldstable</emphasis> and stays there until it is "
-"finally archived.  On archiving, the contents are moved to <literal>&archive-"
-"host;</literal>)."
+"<literal>testing</literal> distribution is frozen, meaning that the policies "
+"which control how packages move from <literal>unstable</literal> to "
+"<literal>testing</literal> are tightened.  Packages which are too buggy are "
+"removed.  No changes are allowed into <literal>testing</literal> except for "
+"bug fixes.  After some time has elapsed, depending on progress, the "
+"<literal>testing</literal> distribution is frozen even further.  Details of "
+"the handling of the testing distribution are published by the Release Team "
+"on debian-devel-announce.  After the open issues are solved to the "
+"satisfaction of the Release Team, the distribution is released.  Releasing "
+"means that <literal>testing</literal> is renamed to <literal>stable</"
+"literal>, and a new copy is created for the new <literal>testing</literal>, "
+"and the previous <literal>stable</literal> is renamed to <literal>oldstable</"
+"literal> and stays there until it is finally archived.  On archiving, the "
+"contents are moved to <literal>&archive-host;</literal>)."

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

-#: resources.dbk:676
+#: resources.dbk:665

 msgid ""
 "This development cycle is based on the assumption that the "
 msgid ""
 "This development cycle is based on the assumption that the "

-"<emphasis>unstable</emphasis> distribution becomes <emphasis>stable</"
-"emphasis> after passing a period of being in <emphasis>testing</emphasis>.  "
-"Even once a distribution is considered stable, a few bugs inevitably remain "
-"— that's why the stable distribution is updated every now and then.  "
-"However, these updates are tested very carefully and have to be introduced "
-"into the archive individually to reduce the risk of introducing new bugs.  "
-"You can find proposed additions to <emphasis>stable</emphasis> in the "
-"<filename>proposed-updates</filename> directory.  Those packages in "
-"<filename>proposed-updates</filename> that pass muster are periodically "
-"moved as a batch into the stable distribution and the revision level of the "
-"stable distribution is incremented (e.g., ‘3.0’ becomes ‘3.0r1’, ‘2.2r4’ "
-"becomes ‘2.2r5’, and so forth).  Please refer to <link linkend=\"upload-"
-"stable\">uploads to the <emphasis>stable</emphasis> distribution</link> for "
-"details."
+"<literal>unstable</literal> distribution becomes <literal>stable</literal> "
+"after passing a period of being in <literal>testing</literal>.  Even once a "
+"distribution is considered stable, a few bugs inevitably remain — that's why "
+"the stable distribution is updated every now and then.  However, these "
+"updates are tested very carefully and have to be introduced into the archive "
+"individually to reduce the risk of introducing new bugs.  You can find "
+"proposed additions to <literal>stable</literal> in the <filename>proposed-"
+"updates</filename> directory.  Those packages in <filename>proposed-updates</"
+"filename> that pass muster are periodically moved as a batch into the stable "
+"distribution and the revision level of the stable distribution is "
+"incremented (e.g., ‘3.0’ becomes ‘3.0r1’, ‘2.2r4’ becomes ‘2.2r5’, and so "
+"forth).  Please refer to <link linkend=\"upload-stable\">uploads to the "
+"<literal>stable</literal> distribution</link> for details."

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

-#: resources.dbk:693
+#: resources.dbk:682

 msgid ""
 msgid ""

-"Note that development under <emphasis>unstable</emphasis> continues during "
-"the freeze period, since the <emphasis>unstable</emphasis> distribution "
-"remains in place in parallel with <emphasis>testing</emphasis>."
+"Note that development under <literal>unstable</literal> continues during the "
+"freeze period, since the <literal>unstable</literal> distribution remains in "
+"place in parallel with <literal>testing</literal>."

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

-#: resources.dbk:700
+#: resources.dbk:689

 msgid "More information about the testing distribution"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "More information about the testing distribution"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:702
+#: resources.dbk:691

 msgid ""
 msgid ""

-"Packages are usually installed into the `testing' distribution after they "
-"have undergone some degree of testing in unstable."
+"Packages are usually installed into the <literal>testing</literal> "
+"distribution after they have undergone some degree of testing in "
+"<literal>unstable</literal>."

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

-#: resources.dbk:706
+#: resources.dbk:695

 msgid ""
 "For more details, please see the <link linkend=\"testing\">information about "
 "the testing distribution</link>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgid ""
 "For more details, please see the <link linkend=\"testing\">information about "
 "the testing distribution</link>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: resources.dbk:712
+#: resources.dbk:701

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

-#: resources.dbk:714
+#: resources.dbk:703

 msgid ""
 msgid ""

-"The <emphasis>experimental</emphasis> distribution is a special "
-"distribution.  It is not a full distribution in the same sense as `stable' "
-"and `unstable' are.  Instead, it is meant to be a temporary staging area for "
-"highly experimental software where there's a good chance that the software "
-"could break your system, or software that's just too unstable even for the "
-"<emphasis>unstable</emphasis> distribution (but there is a reason to package "
-"it nevertheless).  Users who download and install packages from "
-"<emphasis>experimental</emphasis> are expected to have been duly warned.  In "
-"short, all bets are off for the <emphasis>experimental</emphasis> "
-"distribution."
+"The <literal>experimental</literal> distribution is a special distribution.  "
+"It is not a full distribution in the same sense as <literal>stable</"
+"literal>, <literal>testing</literal> and <literal>unstable</literal> are.  "
+"Instead, it is meant to be a temporary staging area for highly experimental "
+"software where there's a good chance that the software could break your "
+"system, or software that's just too unstable even for the <literal>unstable</"
+"literal> distribution (but there is a reason to package it nevertheless).  "
+"Users who download and install packages from <literal>experimental</literal> "
+"are expected to have been duly warned.  In short, all bets are off for the "
+"<literal>experimental</literal> distribution."

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

-#: resources.dbk:725
+#: resources.dbk:715

 msgid ""
 "These are the <citerefentry> <refentrytitle>sources.list</refentrytitle> "
 msgid ""
 "These are the <citerefentry> <refentrytitle>sources.list</refentrytitle> "

-"<manvolnum>5</manvolnum> </citerefentry> lines for <emphasis>experimental</"
-"emphasis>:"
+"<manvolnum>5</manvolnum> </citerefentry> lines for <literal>experimental</"
+"literal>:"

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

-#: resources.dbk:730
+#: resources.dbk:719

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

+"\n"

 "deb http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ experimental main\n"
 "deb http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ experimental main\n"

-"deb-src http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ experimental main"
+"deb-src http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ experimental main\n"

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

-#: resources.dbk:734
+#: resources.dbk:724

 msgid ""
 "If there is a chance that the software could do grave damage to a system, it "
 msgid ""
 "If there is a chance that the software could do grave damage to a system, it "

-"is likely to be better to put it into <emphasis>experimental</emphasis>.  "
-"For instance, an experimental compressed file system should probably go into "
-"<emphasis>experimental</emphasis>."
+"is likely to be better to put it into <literal>experimental</literal>.  For "
+"instance, an experimental compressed file system should probably go into "
+"<literal>experimental</literal>."

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

-#: resources.dbk:740
+#: resources.dbk:730

 msgid ""
 "Whenever there is a new upstream version of a package that introduces new "
 "features but breaks a lot of old ones, it should either not be uploaded, or "
 msgid ""
 "Whenever there is a new upstream version of a package that introduces new "
 "features but breaks a lot of old ones, it should either not be uploaded, or "

-"be uploaded to <emphasis>experimental</emphasis>.  A new, beta, version of "
+"be uploaded to <literal>experimental</literal>.  A new, beta, version of "

 "some software which uses a completely different configuration can go into "
 "some software which uses a completely different configuration can go into "

-"<emphasis>experimental</emphasis>, at the maintainer's discretion.  If you "
-"are working on an incompatible or complex upgrade situation, you can also "
-"use <emphasis>experimental</emphasis> as a staging area, so that testers can "
-"get early access."
+"<literal>experimental</literal>, at the maintainer's discretion.  If you are "
+"working on an incompatible or complex upgrade situation, you can also use "
+"<literal>experimental</literal> as a staging area, so that testers can get "
+"early access."

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

-#: resources.dbk:750
+#: resources.dbk:740

 msgid ""
 msgid ""

-"Some experimental software can still go into <emphasis>unstable</emphasis>, "
+"Some experimental software can still go into <literal>unstable</literal>, "

 "with a few warnings in the description, but that isn't recommended because "
 "with a few warnings in the description, but that isn't recommended because "

-"packages from <emphasis>unstable</emphasis> are expected to propagate to "
-"<emphasis>testing</emphasis> and thus to <emphasis>stable</emphasis>.  You "
-"should not be afraid to use <emphasis>experimental</emphasis> since it does "
+"packages from <literal>unstable</literal> are expected to propagate to "
+"<literal>testing</literal> and thus to <literal>stable</literal>.  You "
+"should not be afraid to use <literal>experimental</literal> since it does "

 "not cause any pain to the ftpmasters, the experimental packages are "
 "not cause any pain to the ftpmasters, the experimental packages are "

-"automatically removed once you upload the package in <emphasis>unstable</"
-"emphasis> with a higher version number."
+"automatically removed once you upload the package in <literal>unstable</"
+"literal> with a higher version number."

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

-#: resources.dbk:760
+#: resources.dbk:750

 msgid ""
 "New software which isn't likely to damage your system can go directly into "
 msgid ""
 "New software which isn't likely to damage your system can go directly into "

-"<emphasis>unstable</emphasis>."
+"<literal>unstable</literal>."

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

-#: resources.dbk:764
+#: resources.dbk:754

 msgid ""
 msgid ""

-"An alternative to <emphasis>experimental</emphasis> is to use your personal "
+"An alternative to <literal>experimental</literal> is to use your personal "

 "web space on <literal>people.debian.org</literal>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 "web space on <literal>people.debian.org</literal>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:768
+#: resources.dbk:758

 msgid ""
 msgid ""

-"When uploading to unstable a package which had bugs fixed in experimental, "
-"please consider using the option <literal>-v</literal> to <command>dpkg-"
-"buildpackage</command> to finally get them closed."
+"When uploading to <literal>unstable</literal> a package which had bugs fixed "
+"in <literal>experimental</literal>, please consider using the option "
+"<literal>-v</literal> to <command>dpkg-buildpackage</command> to finally get "
+"them closed."

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

-#: resources.dbk:777
+#: resources.dbk:768

 msgid "Release code names"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Release code names"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:779
+#: resources.dbk:770

 msgid ""
 msgid ""

-"Every released Debian distribution has a <emphasis>code name</emphasis>: "
-"Debian 1.1 is called `buzz'; Debian 1.2, `rex'; Debian 1.3, `bo'; Debian "
-"2.0, `hamm'; Debian 2.1, `slink'; Debian 2.2, `potato'; Debian 3.0, `woody'; "
-"Debian 3.1, sarge; Debian 4.0, etch.  There is also a ``pseudo-"
-"distribution'', called `sid', which is the current `unstable' distribution; "
-"since packages are moved from `unstable' to `testing' as they approach "
-"stability, `sid' itself is never released.  As well as the usual contents of "
-"a Debian distribution, `sid' contains packages for architectures which are "
-"not yet officially supported or released by Debian.  These architectures are "
-"planned to be integrated into the mainstream distribution at some future "
-"date."
+"Every released Debian distribution has a <literal>code name</literal>: "
+"Debian 1.1 is called <literal>buzz</literal>; Debian 1.2, <literal>rex</"
+"literal>; Debian 1.3, <literal>bo</literal>; Debian 2.0, <literal>hamm</"
+"literal>; Debian 2.1, <literal>slink</literal>; Debian 2.2, <literal>potato</"
+"literal>; Debian 3.0, <literal>woody</literal>; Debian 3.1, <literal>sarge</"
+"literal>; Debian 4.0, <literal>etch</literal> and Debian 5.0 will be called "
+"<literal> lenny</literal>.  There is also a ``pseudo-distribution'', called "
+"<literal>sid</literal>, which is the current <literal>unstable</literal> "
+"distribution; since packages are moved from <literal>unstable</literal> to "
+"<literal>testing</literal> as they approach stability, <literal>sid</"
+"literal> itself is never released.  As well as the usual contents of a "
+"Debian distribution, <literal>sid</literal> contains packages for "
+"architectures which are not yet officially supported or released by Debian.  "
+"These architectures are planned to be integrated into the mainstream "
+"distribution at some future date."

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

-#: resources.dbk:791
+#: resources.dbk:787

 msgid ""
 "Since Debian has an open development model (i.e., everyone can participate "
 msgid ""
 "Since Debian has an open development model (i.e., everyone can participate "

-"and follow the development) even the `unstable' and `testing' distributions "
-"are distributed to the Internet through the Debian FTP and HTTP server "
-"network.  Thus, if we had called the directory which contains the release "
-"candidate version `testing', then we would have to rename it to `stable' "
-"when the version is released, which would cause all FTP mirrors to re-"
-"retrieve the whole distribution (which is quite large)."
+"and follow the development) even the <literal>unstable</literal> and "
+"<literal> testing</literal> distributions are distributed to the Internet "
+"through the Debian FTP and HTTP server network. Thus, if we had called the "
+"directory which contains the release candidate version <literal>testing</"
+"literal>, then we would have to rename it to <literal>stable</literal> when "
+"the version is released, which would cause all FTP mirrors to re-retrieve "
+"the whole distribution (which is quite large)."

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

-#: resources.dbk:800
+#: resources.dbk:797

 msgid ""
 msgid ""

-"On the other hand, if we called the distribution directories "
-"<emphasis>Debian-x.y</emphasis> from the beginning, people would think that "
-"Debian release <emphasis>x.y</emphasis> is available.  (This happened in the "
-"past, where a CD-ROM vendor built a Debian 1.0 CD-ROM based on a pre-1.0 "
-"development version.  That's the reason why the first official Debian "
-"release was 1.1, and not 1.0.)"
+"On the other hand, if we called the distribution directories <literal>Debian-"
+"x.y</literal> from the beginning, people would think that Debian release "
+"<literal>x.y</literal> is available.  (This happened in the past, where a CD-"
+"ROM vendor built a Debian 1.0 CD-ROM based on a pre-1.0 development "
+"version.  That's the reason why the first official Debian release was 1.1, "
+"and not 1.0.)"

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

-#: resources.dbk:808
+#: resources.dbk:805

 msgid ""
 "Thus, the names of the distribution directories in the archive are "
 "determined by their code names and not their release status (e.g., "
 "`slink').  These names stay the same during the development period and after "
 "the release; symbolic links, which can be changed easily, indicate the "
 "currently released stable distribution.  That's why the real distribution "
 msgid ""
 "Thus, the names of the distribution directories in the archive are "
 "determined by their code names and not their release status (e.g., "
 "`slink').  These names stay the same during the development period and after "
 "the release; symbolic links, which can be changed easily, indicate the "
 "currently released stable distribution.  That's why the real distribution "

-"directories use the <emphasis>code names</emphasis>, while symbolic links "
-"for <emphasis>stable</emphasis>, <emphasis>testing</emphasis>, and "
-"<emphasis>unstable</emphasis> point to the appropriate release directories."
+"directories use the <literal>code names</literal>, while symbolic links for "
+"<literal>stable</literal>, <literal>testing</literal>, and "
+"<literal>unstable</literal> point to the appropriate release directories."

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

-#: resources.dbk:822
+#: resources.dbk:819

 msgid "Debian mirrors"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "Debian mirrors"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:824
+#: resources.dbk:821

 msgid ""
 "The various download archives and the web site have several mirrors "
 "available in order to relieve our canonical servers from heavy load.  In "
 msgid ""
 "The various download archives and the web site have several mirrors "
 "available in order to relieve our canonical servers from heavy load.  In "


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

-#: resources.dbk:835
+#: resources.dbk:832

 msgid ""
 "All the information on Debian mirrors, including a list of the available "
 "public FTP/HTTP servers, can be found at <ulink url=\"&url-debian-mirrors;"
 msgid ""
 "All the information on Debian mirrors, including a list of the available "
 "public FTP/HTTP servers, can be found at <ulink url=\"&url-debian-mirrors;"


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

-#: resources.dbk:842
+#: resources.dbk:839

 msgid ""
 "Note that mirrors are generally run by third-parties who are interested in "
 "helping Debian.  As such, developers generally do not have accounts on these "
 msgid ""
 "Note that mirrors are generally run by third-parties who are interested in "
 "helping Debian.  As such, developers generally do not have accounts on these "


@@ -1184,12 +1173,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: resources.dbk:849
+#: resources.dbk:846

 msgid "The Incoming system"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "The Incoming system"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:851
+#: resources.dbk:848

 msgid ""
 "The Incoming system is responsible for collecting updated packages and "
 "installing them in the Debian archive.  It consists of a set of directories "
 msgid ""
 "The Incoming system is responsible for collecting updated packages and "
 "installing them in the Debian archive.  It consists of a set of directories "


@@ -1197,7 +1186,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:856
+#: resources.dbk:853

 msgid ""
 "Packages are uploaded by all the maintainers into a directory called "
 "<filename>UploadQueue</filename>.  This directory is scanned every few "
 msgid ""
 "Packages are uploaded by all the maintainers into a directory called "
 "<filename>UploadQueue</filename>.  This directory is scanned every few "


@@ -1220,7 +1209,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:875
+#: resources.dbk:872

 msgid ""
 "Once the package is accepted, the system sends a confirmation mail to the "
 "maintainer and closes all the bugs marked as fixed by the upload, and the "
 msgid ""
 "Once the package is accepted, the system sends a confirmation mail to the "
 "maintainer and closes all the bugs marked as fixed by the upload, and the "


@@ -1236,36 +1225,37 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:887
+#: resources.dbk:884

 msgid ""
 "The archive maintenance software will also send the OpenPGP/GnuPG signed "
 "<filename>.changes</filename> file that you uploaded to the appropriate "
 "mailing lists.  If a package is released with the <literal>Distribution:</"
 msgid ""
 "The archive maintenance software will also send the OpenPGP/GnuPG signed "
 "<filename>.changes</filename> file that you uploaded to the appropriate "
 "mailing lists.  If a package is released with the <literal>Distribution:</"

-"literal> set to `stable', the announcement is sent to &email-debian-"
-"changes;.  If a package is released with <literal>Distribution:</literal> "
-"set to `unstable' or `experimental', the announcement will be posted to "
-"&email-debian-devel-changes; instead."
+"literal> set to <literal>stable</literal>, the announcement is sent to "
+"&email-debian-changes;.  If a package is released with <literal>Distribution:"
+"</literal> set to <literal>unstable</literal> or <literal>experimental</"
+"literal>, the announcement will be posted to &email-debian-devel-changes; "
+"instead."

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

-#: resources.dbk:897
+#: resources.dbk:894

 msgid ""
 "Though ftp-master is restricted, a copy of the installation is available to "
 "all developers on <literal>&ftp-master-mirror;</literal>."
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgid ""
 "Though ftp-master is restricted, a copy of the installation is available to "
 "all developers on <literal>&ftp-master-mirror;</literal>."
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: resources.dbk:960
+#: resources.dbk:957

 msgid "Package information"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid "Package information"
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:962
+#: resources.dbk:959

 msgid "On the web"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "On the web"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:964
+#: resources.dbk:961

 msgid ""
 "Each package has several dedicated web pages.  <literal>http://&packages-"
 "host;/<replaceable>package-name</replaceable></literal> displays each "
 msgid ""
 "Each package has several dedicated web pages.  <literal>http://&packages-"
 "host;/<replaceable>package-name</replaceable></literal> displays each "


@@ -1275,7 +1265,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:971
+#: resources.dbk:968

 msgid ""
 "The bug tracking system tracks bugs for each package.  You can view the bugs "
 "of a given package at the URL <literal>http://&bugs-host;/"
 msgid ""
 "The bug tracking system tracks bugs for each package.  You can view the bugs "
 "of a given package at the URL <literal>http://&bugs-host;/"


@@ -1283,48 +1273,51 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:978
-msgid "The <command>madison</command> utility"
+#: resources.dbk:975
+msgid "The <command>dak ls</command> utility"

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

-#: resources.dbk:980
+#: resources.dbk:977

 msgid ""
 msgid ""

-"<command>madison</command> is a command-line utility that is available on "
-"<literal>&ftp-master-host;</literal>, and on the mirror on <literal>&ftp-"
-"master-mirror;</literal>.  It uses a single argument corresponding to a "
-"package name.  In result it displays which version of the package is "
-"available for each architecture and distribution combination.  An example "
-"will explain it better."
+"<command>dak ls</command> is part of the dak suite of tools, listing "
+"available package versions for all known distributions and architectures.  "
+"The <command>dak</command> tool is available on <literal>&ftp-master-host; </"
+"literal>, and on the mirror on <literal>&ftp-master-mirror;</literal>.  It "
+"uses a single argument corresponding to a package name. An example will "
+"explain it better:"

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

-#: resources.dbk:988
+#: resources.dbk:984

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

-"$ madison libdbd-mysql-perl\n"
-"libdbd-mysql-perl |   1.2202-4 |        stable | source, alpha, arm, i386, m68k, powerpc, sparc\n"
-"libdbd-mysql-perl |   1.2216-2 |       testing | source, arm, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"
-"libdbd-mysql-perl | 1.2216-2.0.1 |       testing | alpha\n"
-"libdbd-mysql-perl |   1.2219-1 |      unstable | source, alpha, arm, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc"
+"\n"
+"$ dak ls evince\n"
+"evince | 0.1.5-2sarge1 |     oldstable | source, alpha, arm, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"
+"evince |    0.4.0-5 |     etch-m68k | source, m68k\n"
+"evince |    0.4.0-5 |        stable | source, alpha, amd64, arm, hppa, i386, ia64, mips, mipsel, powerpc, s390, sparc\n"
+"evince |   2.20.2-1 |       testing | source\n"
+"evince | 2.20.2-1+b1 |       testing | alpha, amd64, arm, armel, hppa, i386, ia64, mips, mipsel, powerpc, s390, sparc\n"
+"evince |   2.22.2-1 |      unstable | source, alpha, amd64, arm, armel, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"

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

-#: resources.dbk:995
+#: resources.dbk:994

 msgid ""
 msgid ""

-"In this example, you can see that the version in <emphasis>unstable</"
-"emphasis> differs from the version in <emphasis>testing</emphasis> and that "
-"there has been a binary-only NMU of the package for the alpha architecture.  "
-"Each version of the package has been recompiled on most of the architectures."
+"In this example, you can see that the version in <literal>unstable</literal> "
+"differs from the version in <literal>testing</literal> and that there has "
+"been a binary-only NMU of the package for all architectures.  Each version "
+"of the package has been recompiled on all architectures."

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

-#: resources.dbk:1005
+#: resources.dbk:1004

 msgid "The Package Tracking System"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "The Package Tracking System"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:1007
+#: resources.dbk:1006

 msgid ""
 "The Package Tracking System (PTS) is an email-based tool to track the "
 "activity of a source package.  This really means that you can get the same "
 msgid ""
 "The Package Tracking System (PTS) is an email-based tool to track the "
 "activity of a source package.  This really means that you can get the same "


@@ -1333,45 +1326,70 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:1012
+#: resources.dbk:1011

 msgid ""
 "Each email sent through the PTS is classified under one of the keywords "
 "listed below.  This will let you select the mails that you want to receive."
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid ""
 "Each email sent through the PTS is classified under one of the keywords "
 "listed below.  This will let you select the mails that you want to receive."
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:1016
+#: resources.dbk:1015

 msgid "By default you will get:"
 msgstr ""
 
 msgid "By default you will get:"
 msgstr ""
 

+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1019
+msgid "<literal>bts</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1023
+#: resources.dbk:1022

 msgid "All the bug reports and following discussions."
 msgstr ""
 
 msgid "All the bug reports and following discussions."
 msgstr ""
 

+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1027
+msgid "<literal>bts-control</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1031
+#: resources.dbk:1030

 msgid ""
 "The email notifications from <email>control@&bugs-host;</email> about bug "
 "report status changes."
 msgstr ""
 
 msgid ""
 "The email notifications from <email>control@&bugs-host;</email> about bug "
 "report status changes."
 msgstr ""
 

+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1036
+msgid "<literal>upload-source</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1040
+#: resources.dbk:1039

 msgid ""
 "The email notification from <command>katie</command> when an uploaded source "
 "package is accepted."
 msgstr ""
 
 msgid ""
 "The email notification from <command>katie</command> when an uploaded source "
 "package is accepted."
 msgstr ""
 

+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1045
+msgid "<literal>katie-other</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1049
+#: resources.dbk:1048

 msgid ""
 "Other warning and error emails from <command>katie</command> (such as an "
 "override disparity for the section and/or the priority field)."
 msgstr ""
 
 msgid ""
 "Other warning and error emails from <command>katie</command> (such as an "
 "override disparity for the section and/or the priority field)."
 msgstr ""
 

+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1054
+msgid "<literal>default</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1058
+#: resources.dbk:1057

 msgid ""
 "Any non-automatic email sent to the PTS by people who wanted to contact the "
 "subscribers of the package.  This can be done by sending mail to "
 msgid ""
 "Any non-automatic email sent to the PTS by people who wanted to contact the "
 "subscribers of the package.  This can be done by sending mail to "


@@ -1380,20 +1398,41 @@ msgid ""
 "<literal>X-PTS-Approved</literal> header with a non-empty value."
 msgstr ""
 
 "<literal>X-PTS-Approved</literal> header with a non-empty value."
 msgstr ""
 

+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1066
+msgid "<literal>contact</literal>"
+msgstr ""
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1069
+msgid ""
+"Mails sent to the maintainer through the *@packages.debian.org email aliases."
+msgstr ""
+
+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1075
+msgid "<literal>summary</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1070
+#: resources.dbk:1078

 msgid ""
 "Regular summary emails about the package's status.  Currently, only "
 msgid ""
 "Regular summary emails about the package's status.  Currently, only "

-"progression in <emphasis>testing</emphasis> is sent."
+"progression in <literal>testing</literal> is sent."

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

-#: resources.dbk:1077
+#: resources.dbk:1085

 msgid "You can also decide to receive additional information:"
 msgstr ""
 
 msgid "You can also decide to receive additional information:"
 msgstr ""
 

+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1089
+msgid "<literal>upload-binary</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1084
+#: resources.dbk:1092

 msgid ""
 "The email notification from <command>katie</command> when an uploaded binary "
 "package is accepted.  In other words, whenever a build daemon or a porter "
 msgid ""
 "The email notification from <command>katie</command> when an uploaded binary "
 "package is accepted.  In other words, whenever a build daemon or a porter "


@@ -1401,41 +1440,63 @@ msgid ""
 "how your package gets recompiled for all architectures."
 msgstr ""
 
 "how your package gets recompiled for all architectures."
 msgstr ""
 

+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1100
+msgid "<literal>cvs</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1095
+#: resources.dbk:1103

 msgid ""
 msgid ""

-"CVS commit notifications, if the package has a CVS repository and the "
-"maintainer has set up forwarding commit notifications to the PTS."
+"VCS commit notifications, if the package has a VCS repository and the "
+"maintainer has set up forwarding of commit notifications to the PTS. The "
+"\"cvs\" name is historic, in most cases commit notifications will come from "
+"some other VCS like subversion or git."
+msgstr ""
+
+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1111
+msgid "<literal>ddtp</literal>"

 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1104
+#: resources.dbk:1114

 msgid ""
 "Translations of descriptions or debconf templates submitted to the Debian "
 "Description Translation Project."
 msgstr ""
 
 msgid ""
 "Translations of descriptions or debconf templates submitted to the Debian "
 "Description Translation Project."
 msgstr ""
 

+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1120
+msgid "<literal>derivatives</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1113
+#: resources.dbk:1123

 msgid ""
 "Information about changes made to the package in derivative distributions "
 "(for example Ubuntu)."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "Information about changes made to the package in derivative distributions "
 "(for example Ubuntu)."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:1120
+#: resources.dbk:1130

 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:1122
+#: resources.dbk:1132

 msgid ""
 "You can control your subscription(s) to the PTS by sending various commands "
 "to <email>pts@qa.debian.org</email>."
 msgstr ""
 
 msgid ""
 "You can control your subscription(s) to the PTS by sending various commands "
 "to <email>pts@qa.debian.org</email>."
 msgstr ""
 

+# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1137
+msgid "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1130
+#: resources.dbk:1140

 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 "


@@ -1445,30 +1506,50 @@ msgid ""
 "corresponding source package."
 msgstr ""
 
 "corresponding source package."
 msgstr ""
 

+# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1150
+msgid "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1143
+#: resources.dbk:1153

 msgid ""
 "Removes a previous subscription to the source package "
 "<replaceable>sourcepackage</replaceable> using the specified email address "
 "or the sender address if the second argument is left out."
 msgstr ""
 
 msgid ""
 "Removes a previous subscription to the source package "
 "<replaceable>sourcepackage</replaceable> using the specified email address "
 "or the sender address if the second argument is left out."
 msgstr ""
 

+# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1160
+msgid "<literal>unsubscribeall [&lt;email&gt;]</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1153
+#: resources.dbk:1163

 msgid ""
 "Removes all subscriptions of the specified email address or the sender "
 "address if the second argument is left out."
 msgstr ""
 
 msgid ""
 "Removes all subscriptions of the specified email address or the sender "
 "address if the second argument is left out."
 msgstr ""
 

+# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1169
+msgid "<literal>which [&lt;email&gt;]</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "Lists all subscriptions for the sender or the email address optionally "
 "specified."
 msgstr ""
 
 msgid ""
 "Lists all subscriptions for the sender or the email address optionally "
 "specified."
 msgstr ""
 

+# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1178
+msgid "<literal>keyword [&lt;email&gt;]</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1171
+#: resources.dbk:1181

 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 "


@@ -1476,107 +1557,144 @@ 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:1178
+#: resources.dbk:1188

 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:1183
+#: resources.dbk:1193

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

 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:1195
-msgid "<literal>cvs</literal>: notification of CVS commits"
+#: resources.dbk:1205
+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>
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1200
+#: resources.dbk:1211
+msgid "<literal>cvs</literal>: notification of VCS commits"
+msgstr ""
+
+# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1216

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

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

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

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

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

 msgid ""
 "<literal>default</literal>: all the other mails (those which aren't "
 "automatic)"
 msgstr ""
 
 msgid ""
 "<literal>default</literal>: all the other mails (those which aren't "
 "automatic)"
 msgstr ""
 

+# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1252
+msgid "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1239
+#: resources.dbk:1255

 msgid ""
 "Same as the previous item but for the given source package, since you may "
 "select a different set of keywords for each source package."
 msgstr ""
 
 msgid ""
 "Same as the previous item but for the given source package, since you may "
 "select a different set of keywords for each source package."
 msgstr ""
 

+# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1261
+msgid ""
+"<literal>keyword [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1248
+#: resources.dbk:1264

 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the default set of "
 "keywords accepted by a user."
 msgstr ""
 
 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the default set of "
 "keywords accepted by a user."
 msgstr ""
 

+# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1271
+msgid ""
+"<literal>keywordall [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</"
+"literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1258
+#: resources.dbk:1274

 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the set of accepted "
 "keywords of all the currently active subscriptions of a user."
 msgstr ""
 
 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the set of accepted "
 "keywords of all the currently active subscriptions of a user."
 msgstr ""
 

+# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1281
+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>
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1268
+#: resources.dbk:1284

 msgid ""
 "Same as previous item but overrides the keywords list for the indicated "
 "source package."
 msgstr ""
 
 msgid ""
 "Same as previous item but overrides the keywords list for the indicated "
 "source package."
 msgstr ""
 

+# type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1290
+msgid "<literal>quit | thanks | --</literal>"
+msgstr ""
+

 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1277
+#: resources.dbk:1293

 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:1283
+#: resources.dbk:1299

 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 "


@@ -1585,12 +1703,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:1291
+#: resources.dbk:1307

 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:1293
+#: resources.dbk:1309

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


@@ -1601,53 +1719,63 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1301
+#: resources.dbk:1317

 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:1305
+#: resources.dbk:1320

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

+"\n"

 "X-Loop: dpkg@&pts-host;\n"
 "X-PTS-Package: dpkg\n"
 "X-PTS-Keyword: upload-source\n"
 "X-Loop: dpkg@&pts-host;\n"
 "X-PTS-Package: dpkg\n"
 "X-PTS-Keyword: upload-source\n"

-"X-Unsubscribe: echo 'unsubscribe dpkg' | mail pts@qa.debian.org"
+"List-Unsubscribe: &lt;mailto:pts@qa.debian.org?body=unsubscribe+dpkg&gt;\n"

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

-#: resources.dbk:1313
-msgid "Forwarding CVS commits in the PTS"
+#: resources.dbk:1329
+msgid "Forwarding VCS commits in the PTS"

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

-#: resources.dbk:1315
+#: resources.dbk:1331

 msgid ""
 msgid ""

-"If you use a publicly accessible CVS repository for maintaining your Debian "
+"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 "
 "the subscribers (and possible co-maintainers) can closely follow the "
 "package's evolution."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 "package, you may want to forward the commit notification to the PTS so that "
 "the subscribers (and possible co-maintainers) can closely follow the "
 "package's evolution."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1321
+#: resources.dbk:1337

 msgid ""
 msgid ""

-"Once you set up the CVS repository to generate commit notifications, you "
+"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 "
 "<literal><replaceable>sourcepackage</replaceable>_cvs@&pts-host;</literal>.  "
 "just have to make sure it sends a copy of those mails to "
 "<literal><replaceable>sourcepackage</replaceable>_cvs@&pts-host;</literal>.  "

-"Only the people who accept the <emphasis>cvs</emphasis> keyword will receive "
-"these notifications."
+"Only the people who accept the <literal>cvs</literal> keyword will receive "
+"these notifications. Note that the mail need to be sent from a "
+"<literal>debian.org</literal> machine, otherwise you'll have to add the "
+"<literal>X-PTS-Approved: 1</literal> header."
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#: resources.dbk:1346
+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>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

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

 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:1332
+#: resources.dbk:1354

 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 "


@@ -1660,7 +1788,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1342
+#: resources.dbk:1364

 msgid ""
 "You can jump directly to the web page concerning a specific source package "
 "with a URL like <literal>http://&pts-host;/<replaceable>sourcepackage</"
 msgid ""
 "You can jump directly to the web page concerning a specific source package "
 "with a URL like <literal>http://&pts-host;/<replaceable>sourcepackage</"


@@ -1668,7 +1796,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1347
+#: resources.dbk:1369

 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 "


@@ -1677,82 +1805,82 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1353
+#: resources.dbk:1375

 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:1358
+#: resources.dbk:1380

 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:1364
+#: resources.dbk:1386

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

 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:1374
+#: resources.dbk:1396

 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:1379
+#: resources.dbk:1401

 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:1385
+#: resources.dbk:1407

 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:1390
+#: resources.dbk:1412

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

 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:1400
+#: resources.dbk:1422

 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:1405
+#: resources.dbk:1427

 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:1410
+#: resources.dbk:1432

 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:1415
+#: resources.dbk:1437

 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:1420
+#: resources.dbk:1442

 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:1425
+#: resources.dbk:1447

 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 "


@@ -1766,7 +1894,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1436
+#: resources.dbk:1458

 msgid ""
 "Here are a few examples of valid mails used to generate news items in the "
 "PTS.  The first one adds a link to the cvsweb interface of debian-cd in the "
 msgid ""
 "Here are a few examples of valid mails used to generate news items in the "
 "PTS.  The first one adds a link to the cvsweb interface of debian-cd in the "


@@ -1774,19 +1902,20 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

-#: resources.dbk:1441
+#: resources.dbk:1462

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

+"\n"

 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
 "To: pts-static-news@qa.debian.org\n"
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
 "To: pts-static-news@qa.debian.org\n"

-"Subject: Browse debian-cd CVS repository with cvsweb\n"
+"Subject: Browse debian-cd SVN repository\n"

 "\n"
 "Package: debian-cd\n"
 "\n"
 "Package: debian-cd\n"

-"Url: &url-cvsweb;debian-cd/"
+"Url: http://svn.debian.org/viewsvn/debian-cd/trunk/\n"

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

-#: resources.dbk:1449
+#: resources.dbk:1471

 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 "


@@ -1794,10 +1923,11 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

-#: resources.dbk:1454
+#: resources.dbk:1475

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

-": Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
+"\n"
+"From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"

 "To: debian-gtk-gnome@&lists-host;\n"
 "Bcc: pts-news@qa.debian.org\n"
 "Subject: Galeon 2.0 backported for woody\n"
 "To: debian-gtk-gnome@&lists-host;\n"
 "Bcc: pts-news@qa.debian.org\n"
 "Subject: Galeon 2.0 backported for woody\n"


@@ -1807,11 +1937,11 @@ msgid ""
 "\n"
 "I'm glad to announce that galeon has been backported for woody. You'll find\n"
 "everything here:\n"
 "\n"
 "I'm glad to announce that galeon has been backported for woody. You'll find\n"
 "everything here:\n"

-"..."
+"...\n"

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

-#: resources.dbk:1467
+#: resources.dbk:1489

 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 "


@@ -1820,12 +1950,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: resources.dbk:1477
+#: resources.dbk:1499

 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:1479
+#: resources.dbk:1501

 msgid ""
 "A QA (quality assurance) web portal is available at <ulink url=\"&url-ddpo;"
 "\"></ulink> which displays a table listing all the packages of a single "
 msgid ""
 "A QA (quality assurance) web portal is available at <ulink url=\"&url-ddpo;"
 "\"></ulink> which displays a table listing all the packages of a single "


@@ -1836,7 +1966,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:1488
+#: resources.dbk:1510

 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 "


@@ -1844,31 +1974,32 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: resources.dbk:1495
-msgid "Debian *Forge: Alioth"
+#: resources.dbk:1517
+msgid "Debian's GForge installation: Alioth"

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

-#: resources.dbk:1497
+#: resources.dbk:1519

 msgid ""
 msgid ""

-"Alioth is a fairly new Debian service, based on a slightly modified version "
-"of the GForge software (which evolved from SourceForge).  This software "
-"offers developers access to easy-to-use tools such as bug trackers, patch "
-"manager, project/task managers, file hosting services, mailing lists, CVS "
+"Alioth is a Debian service based on a slightly modified version of the "
+"GForge software (which evolved from SourceForge). This software offers "
+"developers access to easy-to-use tools such as bug trackers, patch manager, "
+"project/task managers, file hosting services, mailing lists, CVS "

 "repositories etc.  All these tools are managed via a web interface."
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 "repositories etc.  All these tools are managed via a web interface."
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:1504
+#: resources.dbk:1526

 msgid ""
 "It is intended to provide facilities to free software projects backed or led "
 "by Debian, facilitate contributions from external developers to projects "
 "started by Debian, and help projects whose goals are the promotion of Debian "
 msgid ""
 "It is intended to provide facilities to free software projects backed or led "
 "by Debian, facilitate contributions from external developers to projects "
 "started by Debian, and help projects whose goals are the promotion of Debian "

-"or its derivatives."
+"or its derivatives. It's heavily used by many Debian teams and provides "
+"hosting for all sorts of VCS repositories."

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

-#: resources.dbk:1510
+#: resources.dbk:1533

 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 "


@@ -1876,26 +2007,45 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:1515
-msgid "For more information please visit <ulink url=\"&url-alioth;\"></ulink>."
+#: resources.dbk:1538
+msgid "For more information please visit the following links:"
+msgstr ""
+
+# type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:1541
+msgid "<ulink url=\"&url-alioth-wiki;\" />"
+msgstr ""
+
+# type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:1542
+msgid "<ulink url=\"&url-alioth-faq;\" />"
+msgstr ""
+
+# type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:1543
+msgid "<ulink url=\"&url-alioth-pkg;\" />"
+msgstr ""
+
+# type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:1544
+msgid "<ulink url=\"&url-alioth;\" />"

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

-#: resources.dbk:1521
+#: resources.dbk:1549

 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:1523
+#: resources.dbk:1551

 msgid "LWN Subscriptions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "LWN Subscriptions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1525
+#: resources.dbk:1553

 msgid ""
 "Since October of 2002, HP has sponsored a subscription to LWN for all "
 "interested Debian developers.  Details on how to get access to this benefit "
 "are in <ulink url=\"http://&lists-host;/debian-devel-announce/2002/10/"
 "msg00018.html\"></ulink>."
 msgstr ""
 msgid ""
 "Since October of 2002, HP has sponsored a subscription to LWN for all "
 "interested Debian developers.  Details on how to get access to this benefit "
 "are in <ulink url=\"http://&lists-host;/debian-devel-announce/2002/10/"
 "msg00018.html\"></ulink>."
 msgstr ""

-

diff --git a/po4a/fr/scope.po b/po4a/fr/scope.po
index 35bf6ac1c303ab0634b672fa726b82f316f9f023..b1546aedd84e827a66885df3607be8aaba49dd1b 100644 (file)
--- a/po4a/fr/scope.po
+++ b/po4a/fr/scope.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.
 # , fuzzy
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.
 # , fuzzy

-# 
-# 
+#
+#

 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-07-01 21:16+0000\n"
+"POT-Creation-Date: 2008-08-08 11:37-0300\n"

 "PO-Revision-Date: 2007-07-01 22:30+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "PO-Revision-Date: 2007-07-01 22:30+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: "
+"Content-Transfer-Encoding: \n"

 
 # type: Content of: <chapter><title>
 #: scope.dbk:7
 
 # type: Content of: <chapter><title>
 #: scope.dbk:7


@@ -26,7 +26,8 @@ msgstr "Portée de ce document"
 msgid ""
 "The purpose of this document is to provide an overview of the recommended "
 "procedures and the available resources for Debian developers."
 msgid ""
 "The purpose of this document is to provide an overview of the recommended "
 "procedures and the available resources for Debian developers."

-msgstr "Le but de ce document est de donner une vue d'ensemble des procédures à "
+msgstr ""
+"Le but de ce document est de donner une vue d'ensemble des procédures à "

 "suivre et des ressources mises à la disposition des développeurs Debian."
 
 # type: Content of: <chapter><para>
 "suivre et des ressources mises à la disposition des développeurs Debian."
 
 # type: Content of: <chapter><para>


@@ -39,11 +40,15 @@ msgid ""
 "remove, or orphan packages (<xref linkend=\"archive-manip\"/> ); how to port "
 "packages (<xref linkend=\"porting\"/> ); and how and when to do interim "
 "releases of other maintainers' packages (<xref linkend=\"nmu\"/> )."
 "remove, or orphan packages (<xref linkend=\"archive-manip\"/> ); how to port "
 "packages (<xref linkend=\"porting\"/> ); and how and when to do interim "
 "releases of other maintainers' packages (<xref linkend=\"nmu\"/> )."

-msgstr "Les procédures décrites ci-après expliquent comment devenir responsable"
-"Debian (<xref linkend=\"new-maintainer\"/>), comment créer de nouveaux paquets"
-"(<xref linkend=\"newpackage\"/>) et comment les installer dans l'archive (<xref linkend=\"upload\"/>), comment gérer les rapports de bogues (<xref linkend=\"bug-handling\"/>), comment déplacer, effacer ou abandonner un paquet"
-"(<xref linkend=\"archive-manip\"/>), comment faire le portage d'un paquet (<xref linkend=\"porting\"/>), quand et comment faire la mise à jour du paquet d'un"
-"autre responsable (<xref linkend=\"nmu\"/>)."
+msgstr ""
+"Les procédures décrites ci-après expliquent comment devenir "
+"responsableDebian (<xref linkend=\"new-maintainer\"/>), comment créer de "
+"nouveaux paquets(<xref linkend=\"newpackage\"/>) et comment les installer "
+"dans l'archive (<xref linkend=\"upload\"/>), comment gérer les rapports de "
+"bogues (<xref linkend=\"bug-handling\"/>), comment déplacer, effacer ou "
+"abandonner un paquet(<xref linkend=\"archive-manip\"/>), comment faire le "
+"portage d'un paquet (<xref linkend=\"porting\"/>), quand et comment faire la "
+"mise à jour du paquet d'unautre responsable (<xref linkend=\"nmu\"/>)."

 
 # type: Content of: <chapter><para>
 #: scope.dbk:23
 
 # type: Content of: <chapter><para>
 #: scope.dbk:23


@@ -55,12 +60,14 @@ msgid ""
 "uploads (<xref linkend=\"upload-ftp-master\"/> ); and a discussion of "
 "resources which can help maintainers with the quality of their packages "
 "(<xref linkend=\"tools\"/> )."
 "uploads (<xref linkend=\"upload-ftp-master\"/> ); and a discussion of "
 "resources which can help maintainers with the quality of their packages "
 "(<xref linkend=\"tools\"/> )."

-msgstr "Les ressources présentées dans ce manuel incluent les listes de"
-"diffusion (<xref linkend=\"mailing-lists\"/>) et les serveurs (<xref linkend=\"server-machines\"/>), une présentation de la structure de l'archive"
-"Debian (<xref linkend=\"archive\"/>), des explications sur les serveurs qui"
-"acceptent les mises à jour de paquets (<xref linkend=\"upload-ftp-master\"/>) et"
-"une présentation des outils qui peuvent aider un responsable à améliorer"
-"la qualité de ses paquets (<xref linkend=\"tools\"/>)."
+msgstr ""
+"Les ressources présentées dans ce manuel incluent les listes dediffusion "
+"(<xref linkend=\"mailing-lists\"/>) et les serveurs (<xref linkend=\"server-"
+"machines\"/>), une présentation de la structure de l'archiveDebian (<xref "
+"linkend=\"archive\"/>), des explications sur les serveurs quiacceptent les "
+"mises à jour de paquets (<xref linkend=\"upload-ftp-master\"/>) etune "
+"présentation des outils qui peuvent aider un responsable à améliorerla "
+"qualité de ses paquets (<xref linkend=\"tools\"/>)."

 
 # type: Content of: <chapter><para>
 #: scope.dbk:31
 
 # type: Content of: <chapter><para>
 #: scope.dbk:31


@@ -70,10 +77,11 @@ msgid ""
 "reference detail the standards to which Debian software must comply.  All of "
 "such information can be found in the <ulink url=\"&url-debian-policy;"
 "\">Debian Policy Manual</ulink>."
 "reference detail the standards to which Debian software must comply.  All of "
 "such information can be found in the <ulink url=\"&url-debian-policy;"
 "\">Debian Policy Manual</ulink>."

-msgstr "Ce manuel de référence ne présente pas les aspects techniques liés aux"
-"paquets Debian, ni comment les créer. Il ne décrit pas non plus les"
-"règles que doivent respecter les paquets Debian. Cette information est"
-"disponible dans la <ulink url=\"&url-debian-policy;\">charte Debian</ulink>."
+msgstr ""
+"Ce manuel de référence ne présente pas les aspects techniques liés "
+"auxpaquets Debian, ni comment les créer. Il ne décrit pas non plus lesrègles "
+"que doivent respecter les paquets Debian. Cette information estdisponible "
+"dans la <ulink url=\"&url-debian-policy;\">charte Debian</ulink>."

 
 # type: Content of: <chapter><para>
 #: scope.dbk:38
 
 # type: Content of: <chapter><para>
 #: scope.dbk:38


@@ -82,8 +90,8 @@ msgid ""
 "emphasis>.  It contains documentation for the Debian system and generally "
 "agreed-upon best practices.  Thus, it is not what is called a ``normative'' "
 "document."
 "emphasis>.  It contains documentation for the Debian system and generally "
 "agreed-upon best practices.  Thus, it is not what is called a ``normative'' "
 "document."

-msgstr "De plus ce document <emphasis>n'est pas l'expression d'une politique"
-"officielle</emphasis>. Il contient de la documentation sur le système Debian"
-"et des conseils pratiques largement suivis. Ce n'est donc pas une sorte"
-"de guide de normes."
-
+msgstr ""
+"De plus ce document <emphasis>n'est pas l'expression d'une "
+"politiqueofficielle</emphasis>. Il contient de la documentation sur le "
+"système Debianet des conseils pratiques largement suivis. Ce n'est donc pas "
+"une sortede guide de normes."

diff --git a/po4a/fr/tools.po b/po4a/fr/tools.po
index f9f4802b2ada63dfdcd715807a577db8c7c185e4..5fc77db7f729ed4930b8a784e0285cffb446b848 100644 (file)
--- a/po4a/fr/tools.po
+++ b/po4a/fr/tools.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.
 # , fuzzy
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # <>, 2007.
 # , fuzzy

-# 
-# 
+#
+#

 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-07-01 21:16+0000\n"
+"POT-Creation-Date: 2008-08-08 11:37-0300\n"

 "PO-Revision-Date: 2007-07-01 23:19+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "PO-Revision-Date: 2007-07-01 23:19+0000\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: "
+"Content-Transfer-Encoding: \n"

 
 # type: Content of: <appendix><title>
 #: tools.dbk:7
 
 # type: Content of: <appendix><title>
 #: tools.dbk:7


@@ -27,18 +27,20 @@ msgid ""
 "This section contains a rough overview of the tools available to "
 "maintainers.  The following is by no means complete or definitive, but just "
 "a guide to some of the more popular tools."
 "This section contains a rough overview of the tools available to "
 "maintainers.  The following is by no means complete or definitive, but just "
 "a guide to some of the more popular tools."

-msgstr "Cette section contient un aperçu rapide des outils dont dispose le"
-"responsable. Cette liste n'est ni complète, ni définitive, il s'agit"
-"juste d'un guide des outils les plus utilisés."
+msgstr ""
+"Cette section contient un aperçu rapide des outils dont dispose "
+"leresponsable. Cette liste n'est ni complète, ni définitive, il s'agitjuste "
+"d'un guide des outils les plus utilisés."

 
 # type: Content of: <appendix><para>
 #: tools.dbk:14
 msgid ""
 "Debian maintainer tools are meant to aid developers and free their time for "
 "critical tasks.  As Larry Wall says, there's more than one way to do it."
 
 # type: Content of: <appendix><para>
 #: tools.dbk:14
 msgid ""
 "Debian maintainer tools are meant to aid developers and free their time for "
 "critical tasks.  As Larry Wall says, there's more than one way to do it."

-msgstr "Les outils du responsable Debian sont destinés à aider les responsables"
-"et libérer leur temps pour des tâches plus cruciales. Comme le dit Larry"
-"Wall, il y a plus d'une manière de le faire."
+msgstr ""
+"Les outils du responsable Debian sont destinés à aider les responsableset "
+"libérer leur temps pour des tâches plus cruciales. Comme le dit LarryWall, "
+"il y a plus d'une manière de le faire."

 
 # type: Content of: <appendix><para>
 #: tools.dbk:18
 
 # type: Content of: <appendix><para>
 #: tools.dbk:18


@@ -49,13 +51,13 @@ msgid ""
 "anyone which tools they should use or how they should go about their duties "
 "of maintainership.  Nor is it meant to endorse any particular tool to the "
 "exclusion of a competing tool."
 "anyone which tools they should use or how they should go about their duties "
 "of maintainership.  Nor is it meant to endorse any particular tool to the "
 "exclusion of a competing tool."

-msgstr "Certaines personnes préfèrent utiliser des outils de haut niveau,"
-"d'autres pas. Debian n'a pas de position officielle sur la"
-"question&nbsp;; tout outil conviendra du moment qu'il fait le"
-"boulot. C'est pourquoi cette section n'a pas été conçue pour indiquer à"
-"chacun quel outil il doit utiliser ou comment il devrait faire pour"
-"gérer sa charge de responsable Debian. Elle n'est pas non plus destinée"
-"à favoriser l'utilisation d'un outil aux dépens d'un autre."
+msgstr ""
+"Certaines personnes préfèrent utiliser des outils de haut niveau,d'autres "
+"pas. Debian n'a pas de position officielle sur laquestion&nbsp;; tout outil "
+"conviendra du moment qu'il fait leboulot. C'est pourquoi cette section n'a "
+"pas été conçue pour indiquer àchacun quel outil il doit utiliser ou comment "
+"il devrait faire pourgérer sa charge de responsable Debian. Elle n'est pas "
+"non plus destinéeà favoriser l'utilisation d'un outil aux dépens d'un autre."

 
 # type: Content of: <appendix><para>
 #: tools.dbk:26
 
 # type: Content of: <appendix><para>
 #: tools.dbk:26


@@ -64,11 +66,11 @@ msgid ""
 "descriptions themselves.  Further information can be found in the package "
 "documentation itself.  You can also see more info with the command "
 "<command>apt-cache show &lt;package-name&gt;</command>."
 "descriptions themselves.  Further information can be found in the package "
 "documentation itself.  You can also see more info with the command "
 "<command>apt-cache show &lt;package-name&gt;</command>."

-msgstr "La plupart des descriptions de ces outils proviennent des descriptions"
-"de leurs paquets. Vous trouverez plus d'informations dans les"
-"documentations de ces paquets. Vous pouvez aussi obtenir plus"
-"d'informations avec la commande <literal>apt-cache show"
-"&lt;nom_paquet&gt;</literal>."
+msgstr ""
+"La plupart des descriptions de ces outils proviennent des descriptionsde "
+"leurs paquets. Vous trouverez plus d'informations dans lesdocumentations de "
+"ces paquets. Vous pouvez aussi obtenir plusd'informations avec la commande "
+"<literal>apt-cache show&lt;nom_paquet&gt;</literal>."

 
 # type: Content of: <appendix><section><title>
 #: tools.dbk:32
 
 # type: Content of: <appendix><section><title>
 #: tools.dbk:32


@@ -80,6 +82,11 @@ msgstr "Outils de base"
 msgid "The following tools are pretty much required for any maintainer."
 msgstr "Les outils suivants sont pratiquement nécessaires à tout responsable."
 
 msgid "The following tools are pretty much required for any maintainer."
 msgstr "Les outils suivants sont pratiquement nécessaires à tout responsable."
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:37
+msgid "<systemitem role=\"package\">dpkg-dev</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 #: tools.dbk:39
 msgid ""
 # type: Content of: <appendix><section><section><para>
 #: tools.dbk:39
 msgid ""


@@ -90,6 +97,11 @@ msgid ""
 "they are essential for any Debian maintainer."
 msgstr ""
 
 "they are essential for any Debian maintainer."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:48
+msgid "<systemitem role=\"package\">debconf</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 #: tools.dbk:50
 msgid ""
 # type: Content of: <appendix><section><section><para>
 #: tools.dbk:50
 msgid ""


@@ -116,6 +128,11 @@ msgid ""
 "by Debian Policy, but that may change in the future."
 msgstr ""
 
 "by Debian Policy, but that may change in the future."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:68
+msgid "<systemitem role=\"package\">fakeroot</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 #: tools.dbk:70
 msgid ""
 # type: Content of: <appendix><section><section><para>
 #: tools.dbk:70
 msgid ""


@@ -141,6 +158,11 @@ msgid ""
 "packages."
 msgstr ""
 
 "packages."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:89
+msgid "<systemitem role=\"package\">lintian</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 #: tools.dbk:91
 msgid ""
 # type: Content of: <appendix><section><section><para>
 #: tools.dbk:91
 msgid ""


@@ -154,10 +176,10 @@ msgstr ""
 #: tools.dbk:97
 msgid ""
 "You should periodically get the newest <systemitem role=\"package\">lintian</"
 #: tools.dbk:97
 msgid ""
 "You should periodically get the newest <systemitem role=\"package\">lintian</"

-"systemitem> from `unstable' and check over all your packages.  Notice that "
-"the <literal>-i</literal> option provides detailed explanations of what each "
-"error or warning means, what its basis in Policy is, and commonly how you "
-"can fix the problem."
+"systemitem> from <literal>unstable</literal> and check over all your "
+"packages.  Notice that the <literal>-i</literal> option provides detailed "
+"explanations of what each error or warning means, what its basis in Policy "
+"is, and commonly how you can fix the problem."

 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>


@@ -173,19 +195,16 @@ msgid ""
 "You can also see a summary of all problems reported by Lintian on your "
 "packages at <ulink url=\"&url-lintian;\"></ulink>.  These reports contain "
 "the latest <command>lintian</command> output for the whole development "
 "You can also see a summary of all problems reported by Lintian on your "
 "packages at <ulink url=\"&url-lintian;\"></ulink>.  These reports contain "
 "the latest <command>lintian</command> output for the whole development "

-"distribution (unstable)."
+"distribution (<literal>unstable</literal>)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:118
-msgid ""
-"<systemitem role=\"package\">linda</systemitem> is another package linter.  "
-"It is similar to <systemitem role=\"package\">lintian</systemitem> but has a "
-"different set of checks.  Its written in Python rather than Perl."
+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:116
+msgid "<systemitem role=\"package\">debdiff</systemitem>"

 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:127
+#: tools.dbk:118

 msgid ""
 "<command>debdiff</command> (from the <systemitem role=\"package"
 "\">devscripts</systemitem> package, <xref linkend=\"devscripts\"/> )  "
 msgid ""
 "<command>debdiff</command> (from the <systemitem role=\"package"
 "\">devscripts</systemitem> package, <xref linkend=\"devscripts\"/> )  "


@@ -197,49 +216,58 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:136
+#: tools.dbk:127

 msgid "You can run it over a pair of binary packages:"
 msgstr ""
 
 # type: Content of: <appendix><section><section><screen>
 msgid "You can run it over a pair of binary packages:"
 msgstr ""
 
 # type: Content of: <appendix><section><section><screen>

-#: tools.dbk:139
+#: tools.dbk:129

 #, no-wrap
 #, no-wrap

-msgid "debdiff package_1-1_arch.deb package_2-1_arch.deb"
+msgid ""
+"\n"
+"debdiff package_1-1_arch.deb package_2-1_arch.deb\n"

 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:142
+#: tools.dbk:133

 msgid "Or even a pair of changes files:"
 msgstr ""
 
 # type: Content of: <appendix><section><section><screen>
 msgid "Or even a pair of changes files:"
 msgstr ""
 
 # type: Content of: <appendix><section><section><screen>

-#: tools.dbk:145
+#: tools.dbk:135

 #, no-wrap
 #, no-wrap

-msgid "debdiff package_1-1_arch.changes package_2-1_arch.changes"
+msgid ""
+"\n"
+"debdiff package_1-1_arch.changes package_2-1_arch.changes\n"

 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:148
+#: tools.dbk:139

 msgid ""
 "For more information please see <citerefentry> <refentrytitle>debdiff</"
 "refentrytitle> <manvolnum>1</manvolnum> </citerefentry>."
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgid ""
 "For more information please see <citerefentry> <refentrytitle>debdiff</"
 "refentrytitle> <manvolnum>1</manvolnum> </citerefentry>."
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:157
+#: tools.dbk:148

 msgid "Helpers for <filename>debian/rules</filename>"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Helpers for <filename>debian/rules</filename>"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:159
+#: tools.dbk:150

 msgid ""
 "Package building tools make the process of writing <filename>debian/rules</"
 "filename> files easier.  See <xref linkend=\"helper-scripts\"/> for more "
 "information about why these might or might not be desired."
 msgstr ""
 
 msgid ""
 "Package building tools make the process of writing <filename>debian/rules</"
 "filename> files easier.  See <xref linkend=\"helper-scripts\"/> for more "
 "information about why these might or might not be desired."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:156
+msgid "<systemitem role=\"package\">debhelper</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:167
+#: tools.dbk:158

 msgid ""
 "<systemitem role=\"package\">debhelper</systemitem> is a collection of "
 "programs which can be used in <filename>debian/rules</filename> to automate "
 msgid ""
 "<systemitem role=\"package\">debhelper</systemitem> is a collection of "
 "programs which can be used in <filename>debian/rules</filename> to automate "


@@ -250,7 +278,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:175
+#: tools.dbk:166

 msgid ""
 "Unlike some approaches, <systemitem role=\"package\">debhelper</systemitem> "
 "is broken into several small, simple commands which act in a consistent "
 msgid ""
 "Unlike some approaches, <systemitem role=\"package\">debhelper</systemitem> "
 "is broken into several small, simple commands which act in a consistent "


@@ -259,15 +287,20 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:181
+#: tools.dbk:172

 msgid ""
 "There are a number of little <systemitem role=\"package\">debhelper</"
 "systemitem> add-on packages, too transient to document.  You can see the "
 "list of most of them by doing <literal>apt-cache search ^dh-</literal>."
 msgstr ""
 
 msgid ""
 "There are a number of little <systemitem role=\"package\">debhelper</"
 "systemitem> add-on packages, too transient to document.  You can see the "
 "list of most of them by doing <literal>apt-cache search ^dh-</literal>."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:179
+msgid "<systemitem role=\"package\">debmake</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:190
+#: tools.dbk:181

 msgid ""
 "<systemitem role=\"package\">debmake</systemitem>, a precursor to "
 "<systemitem role=\"package\">debhelper</systemitem>, is a more coarse-"
 msgid ""
 "<systemitem role=\"package\">debmake</systemitem>, a precursor to "
 "<systemitem role=\"package\">debhelper</systemitem>, is a more coarse-"


@@ -280,7 +313,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:200
+#: tools.dbk:191

 msgid ""
 "The consensus is that <systemitem role=\"package\">debmake</systemitem> is "
 "now deprecated in favor of <systemitem role=\"package\">debhelper</"
 msgid ""
 "The consensus is that <systemitem role=\"package\">debmake</systemitem> is "
 "now deprecated in favor of <systemitem role=\"package\">debhelper</"


@@ -289,8 +322,13 @@ msgid ""
 "\">debmake</systemitem> will be rejected from the archive."
 msgstr ""
 
 "\">debmake</systemitem> will be rejected from the archive."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:200
+msgid "<systemitem role=\"package\">dh-make</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:211
+#: tools.dbk:202

 msgid ""
 "The <systemitem role=\"package\">dh-make</systemitem> package contains "
 "<command>dh_make</command>, a program that creates a skeleton of files "
 msgid ""
 "The <systemitem role=\"package\">dh-make</systemitem> package contains "
 "<command>dh_make</command>, a program that creates a skeleton of files "


@@ -301,7 +339,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:219
+#: tools.dbk:210

 msgid ""
 "While the rules files generated by <command>dh_make</command> are in general "
 "a sufficient basis for a working package, they are still just the "
 msgid ""
 "While the rules files generated by <command>dh_make</command> are in general "
 "a sufficient basis for a working package, they are still just the "


@@ -310,8 +348,13 @@ msgid ""
 "compliant."
 msgstr ""
 
 "compliant."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:218
+msgid "<systemitem role=\"package\">yada</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:229
+#: tools.dbk:220

 msgid ""
 "<systemitem role=\"package\">yada</systemitem> is another packaging helper "
 "tool.  It uses a <filename>debian/packages</filename> file to auto-generate "
 msgid ""
 "<systemitem role=\"package\">yada</systemitem> is another packaging helper "
 "tool.  It uses a <filename>debian/packages</filename> file to auto-generate "


@@ -324,14 +367,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:239
+#: tools.dbk:230

 msgid ""
 "For more informations see <literal><ulink url=\"http://yada.alioth.debian."
 "org/\">YADA site</ulink></literal>."
 msgstr ""
 
 msgid ""
 "For more informations see <literal><ulink url=\"http://yada.alioth.debian."
 "org/\">YADA site</ulink></literal>."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:236
+msgid "<systemitem role=\"package\">equivs</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:247
+#: tools.dbk:238

 msgid ""
 "<systemitem role=\"package\">equivs</systemitem> is another package for "
 "making packages.  It is often suggested for local use if you need to make a "
 msgid ""
 "<systemitem role=\"package\">equivs</systemitem> is another package for "
 "making packages.  It is often suggested for local use if you need to make a "


@@ -341,20 +389,25 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:258
+#: tools.dbk:249

 msgid "Package builders"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Package builders"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:260
+#: tools.dbk:251

 msgid ""
 "The following packages help with the package building process, general "
 "driving <command>dpkg-buildpackage</command> as well as handling supporting "
 "tasks."
 msgstr ""
 
 msgid ""
 "The following packages help with the package building process, general "
 "driving <command>dpkg-buildpackage</command> as well as handling supporting "
 "tasks."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:255
+msgid "<systemitem role=\"package\">cvs-buildpackage</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:266
+#: tools.dbk:257

 msgid ""
 "<systemitem role=\"package\">cvs-buildpackage</systemitem> provides the "
 "capability to inject or import Debian source packages into a CVS repository, "
 msgid ""
 "<systemitem role=\"package\">cvs-buildpackage</systemitem> provides the "
 "capability to inject or import Debian source packages into a CVS repository, "


@@ -363,17 +416,22 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:272
+#: tools.dbk:263

 msgid ""
 "These utilities provide an infrastructure to facilitate the use of CVS by "
 "Debian maintainers.  This allows one to keep separate CVS branches of a "
 msgid ""
 "These utilities provide an infrastructure to facilitate the use of CVS by "
 "Debian maintainers.  This allows one to keep separate CVS branches of a "

-"package for <emphasis>stable</emphasis>, <emphasis>unstable</emphasis> and "
-"possibly <emphasis>experimental</emphasis> distributions, along with the "
-"other benefits of a version control system."
+"package for <literal>stable</literal>, <literal>unstable</literal> and "
+"possibly <literal>experimental</literal> distributions, along with the other "
+"benefits of a version control system."
+msgstr ""
+
+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:272
+msgid "<systemitem role=\"package\">debootstrap</systemitem>"

 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:283
+#: tools.dbk:274

 msgid ""
 "The <systemitem role=\"package\">debootstrap</systemitem> package and script "
 "allows you to bootstrap a Debian base system into any part of your "
 msgid ""
 "The <systemitem role=\"package\">debootstrap</systemitem> package and script "
 "allows you to bootstrap a Debian base system into any part of your "


@@ -382,7 +440,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:289
+#: tools.dbk:280

 msgid ""
 "Having a system like this can be useful in many ways.  For instance, you can "
 "<command>chroot</command> into it if you want to test your build "
 msgid ""
 "Having a system like this can be useful in many ways.  For instance, you can "
 "<command>chroot</command> into it if you want to test your build "


@@ -390,8 +448,13 @@ msgid ""
 "a bare base system.  Chroot builders use this package; see below."
 msgstr ""
 
 "a bare base system.  Chroot builders use this package; see below."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:288
+msgid "<systemitem role=\"package\">pbuilder</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:299
+#: tools.dbk:290

 msgid ""
 "<systemitem role=\"package\">pbuilder</systemitem> constructs a chrooted "
 "system, and builds a package inside the chroot.  It is very useful to check "
 msgid ""
 "<systemitem role=\"package\">pbuilder</systemitem> constructs a chrooted "
 "system, and builds a package inside the chroot.  It is very useful to check "


@@ -401,39 +464,49 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:305
+#: tools.dbk:296

 msgid ""
 "A related package is <systemitem role=\"package\">pbuilder-uml</systemitem>, "
 "which goes even further by doing the build within a User Mode Linux "
 "environment."
 msgstr ""
 
 msgid ""
 "A related package is <systemitem role=\"package\">pbuilder-uml</systemitem>, "
 "which goes even further by doing the build within a User Mode Linux "
 "environment."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:303
+msgid "<systemitem role=\"package\">sbuild</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:314
+#: tools.dbk:305

 msgid ""
 "<systemitem role=\"package\">sbuild</systemitem> is another automated "
 "builder.  It can use chrooted environments as well.  It can be used stand-"
 "alone, or as part of a networked, distributed build environment.  As the "
 "latter, it is part of the system used by porters to build binary packages "
 msgid ""
 "<systemitem role=\"package\">sbuild</systemitem> is another automated "
 "builder.  It can use chrooted environments as well.  It can be used stand-"
 "alone, or as part of a networked, distributed build environment.  As the "
 "latter, it is part of the system used by porters to build binary packages "

-"for all the available architectures.  See <xref linkend=\"buildd\"/> for "
-"more information, and <ulink url=\"&url-buildd;\"></ulink> to see the system "
-"in action."
+"for all the available architectures.  See <xref linkend=\"wanna-build\"/> "
+"for more information, and <ulink url=\"&url-buildd;\"></ulink> to see the "
+"system in action."

 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:326
+#: tools.dbk:317

 msgid "Package uploaders"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Package uploaders"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:328
+#: tools.dbk:319

 msgid ""
 "The following packages help automate or simplify the process of uploading "
 "packages into the official archive."
 msgstr ""
 
 msgid ""
 "The following packages help automate or simplify the process of uploading "
 "packages into the official archive."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:323
+msgid "<systemitem role=\"package\">dupload</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:334
+#: tools.dbk:325

 msgid ""
 "<systemitem role=\"package\">dupload</systemitem> is a package and a script "
 "to automatically upload Debian packages to the Debian archive, to log the "
 msgid ""
 "<systemitem role=\"package\">dupload</systemitem> is a package and a script "
 "to automatically upload Debian packages to the Debian archive, to log the "


@@ -441,8 +514,13 @@ msgid ""
 "it for new upload locations or methods."
 msgstr ""
 
 "it for new upload locations or methods."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:333
+msgid "<systemitem role=\"package\">dput</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:344
+#: tools.dbk:335

 msgid ""
 "The <systemitem role=\"package\">dput</systemitem> package and script does "
 "much the same thing as <systemitem role=\"package\">dupload</systemitem>, "
 msgid ""
 "The <systemitem role=\"package\">dput</systemitem> package and script does "
 "much the same thing as <systemitem role=\"package\">dupload</systemitem>, "


@@ -452,8 +530,13 @@ msgid ""
 "<command>dinstall</command> in dry-run mode after the upload."
 msgstr ""
 
 "<command>dinstall</command> in dry-run mode after the upload."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:345
+msgid "<systemitem role=\"package\">dcut</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:356
+#: tools.dbk:347

 msgid ""
 "The <systemitem role=\"package\">dcut</systemitem> script (part of the "
 "package <xref linkend=\"dput\"/> ) helps in removing files from the ftp "
 msgid ""
 "The <systemitem role=\"package\">dcut</systemitem> script (part of the "
 "package <xref linkend=\"dput\"/> ) helps in removing files from the ftp "


@@ -461,20 +544,25 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:364
+#: tools.dbk:355

 msgid "Maintenance automation"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Maintenance automation"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:366
+#: tools.dbk:357

 msgid ""
 "The following tools help automate different maintenance tasks, from adding "
 "changelog entries or signature lines and looking up bugs in Emacs to making "
 "use of the newest and official <filename>config.sub</filename>."
 msgstr ""
 
 msgid ""
 "The following tools help automate different maintenance tasks, from adding "
 "changelog entries or signature lines and looking up bugs in Emacs to making "
 "use of the newest and official <filename>config.sub</filename>."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:362
+msgid "<systemitem role=\"package\">devscripts</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:373
+#: tools.dbk:364

 msgid ""
 "<systemitem role=\"package\">devscripts</systemitem> is a package containing "
 "wrappers and tools which are very helpful for maintaining your Debian "
 msgid ""
 "<systemitem role=\"package\">devscripts</systemitem> is a package containing "
 "wrappers and tools which are very helpful for maintaining your Debian "


@@ -490,15 +578,20 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:387
+#: tools.dbk:378

 msgid ""
 "See the <citerefentry> <refentrytitle>devscripts</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> manual page for a complete list of "
 "available scripts."
 msgstr ""
 
 msgid ""
 "See the <citerefentry> <refentrytitle>devscripts</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> manual page for a complete list of "
 "available scripts."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:385
+msgid "<systemitem role=\"package\">autotools-dev</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:396
+#: tools.dbk:387

 msgid ""
 "<systemitem role=\"package\">autotools-dev</systemitem> contains best "
 "practices for people who maintain packages which use <command>autoconf</"
 msgid ""
 "<systemitem role=\"package\">autotools-dev</systemitem> contains best "
 "practices for people who maintain packages which use <command>autoconf</"


@@ -507,8 +600,13 @@ msgid ""
 "which are known to work on all Debian ports."
 msgstr ""
 
 "which are known to work on all Debian ports."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:396
+msgid "<systemitem role=\"package\">dpkg-repack</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:407
+#: tools.dbk:398

 msgid ""
 "<command>dpkg-repack</command> creates Debian package file out of a package "
 "that has already been installed.  If any changes have been made to the "
 msgid ""
 "<command>dpkg-repack</command> creates Debian package file out of a package "
 "that has already been installed.  If any changes have been made to the "


@@ -517,7 +615,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:413
+#: tools.dbk:404

 msgid ""
 "This utility can make it easy to copy packages from one computer to another, "
 "or to recreate packages which are installed on your system but no longer "
 msgid ""
 "This utility can make it easy to copy packages from one computer to another, "
 "or to recreate packages which are installed on your system but no longer "


@@ -525,24 +623,39 @@ msgid ""
 "upgrade it."
 msgstr ""
 
 "upgrade it."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:411
+msgid "<systemitem role=\"package\">alien</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:422
+#: tools.dbk:413

 msgid ""
 "<command>alien</command> converts binary packages between various packaging "
 "formats, including Debian, RPM (RedHat), LSB (Linux Standard Base), Solaris, "
 "and Slackware packages."
 msgstr ""
 
 msgid ""
 "<command>alien</command> converts binary packages between various packaging "
 "formats, including Debian, RPM (RedHat), LSB (Linux Standard Base), Solaris, "
 "and Slackware packages."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:420
+msgid "<systemitem role=\"package\">debsums</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:431
+#: tools.dbk:422

 msgid ""
 "<command>debsums</command> checks installed packages against their MD5 "
 "sums.  Note that not all packages have MD5 sums, since they aren't required "
 "by Policy."
 msgstr ""
 
 msgid ""
 "<command>debsums</command> checks installed packages against their MD5 "
 "sums.  Note that not all packages have MD5 sums, since they aren't required "
 "by Policy."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:428
+msgid "<systemitem role=\"package\">dpkg-dev-el</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:439
+#: tools.dbk:430

 msgid ""
 "<systemitem role=\"package\">dpkg-dev-el</systemitem> is an Emacs lisp "
 "package which provides assistance when editing some of the files in the "
 msgid ""
 "<systemitem role=\"package\">dpkg-dev-el</systemitem> is an Emacs lisp "
 "package which provides assistance when editing some of the files in the "


@@ -551,8 +664,13 @@ msgid ""
 "the latest entry in a <filename>debian/changelog</filename> file."
 msgstr ""
 
 "the latest entry in a <filename>debian/changelog</filename> file."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:439
+msgid "<systemitem role=\"package\">dpkg-depcheck</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:450
+#: tools.dbk:441

 msgid ""
 "<command>dpkg-depcheck</command> (from the <systemitem role=\"package"
 "\">devscripts</systemitem> package, <xref linkend=\"devscripts\"/> )  runs a "
 msgid ""
 "<command>dpkg-depcheck</command> (from the <systemitem role=\"package"
 "\">devscripts</systemitem> package, <xref linkend=\"devscripts\"/> )  runs a "


@@ -561,7 +679,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:456
+#: tools.dbk:447

 msgid ""
 "For Debian packages, this is useful when you have to compose a "
 "<literal>Build-Depends</literal> line for your new package: running the "
 msgid ""
 "For Debian packages, this is useful when you have to compose a "
 "<literal>Build-Depends</literal> line for your new package: running the "


@@ -570,37 +688,44 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><screen>
 msgstr ""
 
 # type: Content of: <appendix><section><section><screen>

-#: tools.dbk:462
+#: tools.dbk:452

 #, no-wrap
 #, no-wrap

-msgid "dpkg-depcheck -b debian/rules build"
+msgid ""
+"\n"
+"dpkg-depcheck -b debian/rules build\n"

 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:465
+#: tools.dbk:456

 msgid ""
 "<command>dpkg-depcheck</command> can also be used to check for run-time "
 "dependencies, especially if your package uses exec(2) to run other programs."
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid ""
 "<command>dpkg-depcheck</command> can also be used to check for run-time "
 "dependencies, especially if your package uses exec(2) to run other programs."
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:469
+#: tools.dbk:460

 msgid ""
 "For more information please see <citerefentry> <refentrytitle>dpkg-depcheck</"
 "refentrytitle> <manvolnum>1</manvolnum> </citerefentry>."
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgid ""
 "For more information please see <citerefentry> <refentrytitle>dpkg-depcheck</"
 "refentrytitle> <manvolnum>1</manvolnum> </citerefentry>."
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:478
+#: tools.dbk:469

 msgid "Porting tools"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Porting tools"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:480
+#: tools.dbk:471

 msgid "The following tools are helpful for porters and for cross-compilation."
 msgstr ""
 
 msgid "The following tools are helpful for porters and for cross-compilation."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:474
+msgid "<systemitem role=\"package\">quinn-diff</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:485
+#: tools.dbk:476

 msgid ""
 "<systemitem role=\"package\">quinn-diff</systemitem> is used to locate the "
 "differences from one architecture to another.  For instance, it could tell "
 msgid ""
 "<systemitem role=\"package\">quinn-diff</systemitem> is used to locate the "
 "differences from one architecture to another.  For instance, it could tell "


@@ -608,8 +733,13 @@ msgid ""
 "replaceable>, based on architecture <replaceable>X</replaceable>."
 msgstr ""
 
 "replaceable>, based on architecture <replaceable>X</replaceable>."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:484
+msgid "<systemitem role=\"package\">dpkg-cross</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:495
+#: tools.dbk:486

 msgid ""
 "<systemitem role=\"package\">dpkg-cross</systemitem> is a tool for "
 "installing libraries and headers for cross-compiling in a way similar to "
 msgid ""
 "<systemitem role=\"package\">dpkg-cross</systemitem> is a tool for "
 "installing libraries and headers for cross-compiling in a way similar to "


@@ -619,19 +749,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:506
+#: tools.dbk:497

 msgid "Documentation and information"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Documentation and information"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:508
+#: tools.dbk:499

 msgid ""
 "The following packages provide information for maintainers or help with "
 "building documentation."
 msgstr ""
 
 msgid ""
 "The following packages provide information for maintainers or help with "
 "building documentation."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:503
+msgid "<systemitem role=\"package\">debiandoc-sgml</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:514
+#: tools.dbk:505

 msgid ""
 "<systemitem role=\"package\">debiandoc-sgml</systemitem> provides the "
 "DebianDoc SGML DTD, which is commonly used for Debian documentation.  This "
 msgid ""
 "<systemitem role=\"package\">debiandoc-sgml</systemitem> provides the "
 "DebianDoc SGML DTD, which is commonly used for Debian documentation.  This "


@@ -640,24 +775,45 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:520
+#: tools.dbk:511

 msgid ""
 "Documentation for the DTD can be found in the <systemitem role=\"package"
 "\">debiandoc-sgml-doc</systemitem> package."
 msgstr ""
 
 msgid ""
 "Documentation for the DTD can be found in the <systemitem role=\"package"
 "\">debiandoc-sgml-doc</systemitem> package."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:533
+msgid "<systemitem role=\"package\">debian-keyring</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:544
+#: tools.dbk:535

 msgid ""
 "Contains the public GPG and PGP keys of Debian developers.  See <xref "
 "linkend=\"key-maint\"/> and the package documentation for more information."
 msgstr ""
 
 msgid ""
 "Contains the public GPG and PGP keys of Debian developers.  See <xref "
 "linkend=\"key-maint\"/> and the package documentation for more information."
 msgstr ""
 

+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:541
+msgid "<systemitem role=\"package\">debian-maintainers</systemitem>"
+msgstr ""
+

 # type: Content of: <appendix><section><section><para>
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:552
+#: tools.dbk:543
+msgid ""
+"Contains the public GPG keys of Debian Maintainers.  See <ulink url=\"&url-"
+"wiki-dm;\"></ulink> for more information."
+msgstr ""
+
+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:549
+msgid "<systemitem role=\"package\">debview</systemitem>"
+msgstr ""
+
+# type: Content of: <appendix><section><section><para>
+#: tools.dbk:551

 msgid ""
 "<systemitem role=\"package\">debview</systemitem> provides an Emacs mode for "
 "viewing Debian binary packages.  This lets you examine a package without "
 "unpacking it."
 msgstr ""
 msgid ""
 "<systemitem role=\"package\">debview</systemitem> provides an Emacs mode for "
 "viewing Debian binary packages.  This lets you examine a package without "
 "unpacking it."
 msgstr ""

-