update PO and POT files (no content change)

[developers-reference.git] / po4a / po / resources.pot

diff --git a/po4a/po/resources.pot b/po4a/po/resources.pot
index ecc2c5478a8fdf29c90bbb8ce8403f0be60ab3a5..da40b5800cfe0538170872f87c65bfdfcb1d8c33 100644 (file)
--- a/po4a/po/resources.pot
+++ b/po4a/po/resources.pot
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Free Software Foundation, Inc.

+# This file is distributed under the same license as the PACKAGE package.

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

-# 
+#

 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"POT-Creation-Date: 2007-07-01 21:01+0000\n"
+"POT-Creation-Date: 2011-03-03 11:18-0400\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

+"Language: \n"

 "MIME-Version: 1.0\n"
 "MIME-Version: 1.0\n"

-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"

 
 

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

 #: resources.dbk:7
 msgid "Resources for Debian Developers"
 msgstr ""
 
 #: resources.dbk:7
 msgid "Resources for Debian Developers"
 msgstr ""
 

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

 #: resources.dbk:9
 msgid ""
 "In this chapter you will find a very brief road map of the Debian mailing "
 #: resources.dbk:9
 msgid ""
 "In this chapter you will find a very brief road map of the Debian mailing "


@@ -28,12 +30,12 @@ msgid ""
 "work."
 msgstr ""
 
 "work."
 msgstr ""
 

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

 #: resources.dbk:14
 msgid "Mailing lists"
 msgstr ""
 
 #: resources.dbk:14
 msgid "Mailing lists"
 msgstr ""
 

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

 #: resources.dbk:16
 msgid ""
 "Much of the conversation between Debian developers (and users) is managed "
 #: resources.dbk:16
 msgid ""
 "Much of the conversation between Debian developers (and users) is managed "


@@ -47,12 +49,12 @@ msgid ""
 "developers."
 msgstr ""
 
 "developers."
 msgstr ""
 

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

 #: resources.dbk:27
 msgid "Basic rules for use"
 msgstr ""
 
 #: resources.dbk:27
 msgid "Basic rules for use"
 msgstr ""
 

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

 #: resources.dbk:29
 msgid ""
 "When replying to messages on the mailing list, please do not send a carbon "
 #: resources.dbk:29
 msgid ""
 "When replying to messages on the mailing list, please do not send a carbon "


@@ -61,7 +63,7 @@ msgid ""
 "see the responses."
 msgstr ""
 
 "see the responses."
 msgstr ""
 

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

 #: resources.dbk:35
 msgid ""
 "Cross-posting (sending the same message to multiple lists) is discouraged.  "
 #: resources.dbk:35
 msgid ""
 "Cross-posting (sending the same message to multiple lists) is discouraged.  "


@@ -70,63 +72,64 @@ msgid ""
 "messages."
 msgstr ""
 
 "messages."
 msgstr ""
 

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

 #: resources.dbk:40
 msgid ""
 "Please read the <ulink url=\"&url-debian-lists;#codeofconduct\">code of "
 #: resources.dbk:40
 msgid ""
 "Please read the <ulink url=\"&url-debian-lists;#codeofconduct\">code of "

-"conduct</ulink> for more information."
+"conduct</ulink> for more information. The <ulink url=\"&url-dcg;\">Debian "
+"Community Guidelines</ulink> are also worth reading."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:47
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:48

 msgid "Core development mailing lists"
 msgstr ""
 
 msgid "Core development mailing lists"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:49
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:50

 msgid "The core Debian mailing lists that developers should use are:"
 msgstr ""
 
 msgid "The core Debian mailing lists that developers should use are:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:54
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:55

 msgid ""
 "&email-debian-devel-announce;, used to announce important things to "
 "developers.  All developers are expected to be subscribed to this list."
 msgstr ""
 
 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
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:62

 msgid ""
 "&email-debian-devel;, used to discuss various development related technical "
 "issues."
 msgstr ""
 
 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
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:68

 msgid "&email-debian-policy;, where the Debian Policy is discussed and voted on."
 msgstr ""
 
 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
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:74

 msgid ""
 "&email-debian-project;, used to discuss various non-technical issues related "
 "to the project."
 msgstr ""
 
 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
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:80

 msgid ""
 "There are other mailing lists available for a variety of special topics; see "
 "<ulink url=\"http://&lists-host;/\"></ulink> for a list."
 msgstr ""
 
 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
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:86

 msgid "Special lists"
 msgstr ""
 
 msgid "Special lists"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:87
+#. type: Content of: <chapter><section><section><para>
+#: 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 "


@@ -135,12 +138,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 "
+"<literal>&master-host;</literal> and looking in the "

 "<filename>&file-debian-private-archive;</filename> directory."
 msgstr ""
 
 "<filename>&file-debian-private-archive;</filename> directory."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:99
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:100

 msgid ""
 "&email-debian-email; is a special mailing list used as a grab-bag for Debian "
 "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, "


@@ -148,13 +151,13 @@ msgid ""
 "to have the discussion archived somewhere."
 msgstr ""
 
 "to have the discussion archived somewhere."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:107
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:108

 msgid "Requesting new development-related lists"
 msgstr ""
 
 msgid "Requesting new development-related lists"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:109
+#. type: Content of: <chapter><section><section><para>
+#: 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 "


@@ -164,21 +167,21 @@ msgid ""
 "linkend=\"alioth\">Alioth</link> is more appropriate."
 msgstr ""
 
 "linkend=\"alioth\">Alioth</link> is more appropriate."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:117
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:118

 msgid ""
 "If you decide that a regular mailing list on &lists-host; is really what you "
 "want, go ahead and fill in a request, following <ulink "
 "url=\"&url-debian-lists-new;\">the HOWTO</ulink>."
 msgstr ""
 
 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-lists-new;\">the HOWTO</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:126
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:127

 msgid "IRC channels"
 msgstr ""
 
 msgid "IRC channels"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:128
+#. type: Content of: <chapter><section><para>
+#: 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 "


@@ -186,67 +189,64 @@ msgid ""
 "an alias to <literal>irc.oftc.net</literal>."
 msgstr ""
 
 "an alias to <literal>irc.oftc.net</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:134
+#. type: Content of: <chapter><section><para>
+#: 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 "
+"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 ""
 
 "similarly named channels for speakers of other languages."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:142
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:143

 msgid ""
 "The main channel for Debian development is "
 msgid ""
 "The main channel for Debian development is "

-"<emphasis>#debian-devel</emphasis>.  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 support channel (there's "
-"<emphasis>#debian</emphasis> for that).  It is however open to anyone who "
+"<literal>#debian-devel</literal>.  It is a very active channel; it will "
+"typically have a minimum of 150 people at any time of day.  It's a channel "
+"for people who work on Debian, it's not a 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 ""
 
 "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
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:152

 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 "
 "another channel for this purpose, it's called "
 "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."
+"<literal>#debian-private</literal> and it's protected by a key.  This key is "
+"available at "
+"<filename>master.debian.org:&file-debian-private-key;</filename>."

 msgstr ""
 
 msgstr ""
 

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

 #: resources.dbk:160
 msgid ""
 "There are other additional channels dedicated to specific subjects.  "
 #: resources.dbk:160
 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.org package)..."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:172
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:171

 msgid ""
 "Some non-English developers' channels exist as well, for example "
 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 ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:177
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:176

 msgid ""
 "Channels dedicated to Debian also exist on other IRC networks, notably on "
 "the <ulink url=\"&url-openprojects;\">freenode</ulink> IRC network, which "
 msgid ""
 "Channels dedicated to Debian also exist on other IRC networks, notably on "
 "the <ulink url=\"&url-openprojects;\">freenode</ulink> IRC network, which "


@@ -254,8 +254,8 @@ msgid ""
 "2006."
 msgstr ""
 
 "2006."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:183
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:182

 msgid ""
 "To get a cloak on freenode, you send Jörg Jaspert &lt;joerg@debian.org&gt; a "
 "signed mail where you tell what your nick is.  Put cloak somewhere in the "
 msgid ""
 "To get a cloak on freenode, you send Jörg Jaspert &lt;joerg@debian.org&gt; a "
 "signed mail where you tell what your nick is.  Put cloak somewhere in the "


@@ -266,13 +266,13 @@ msgid ""
 "documentation</ulink> for more information about cloaks."
 msgstr ""
 
 "documentation</ulink> for more information about cloaks."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:194
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:193

 msgid "Documentation"
 msgstr ""
 
 msgid "Documentation"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:196
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:195

 msgid ""
 "This document contains a lot of information which is useful to Debian "
 "developers, but it cannot contain everything.  Most of the other interesting "
 msgid ""
 "This document contains a lot of information which is useful to Debian "
 "developers, but it cannot contain everything.  Most of the other interesting "


@@ -281,13 +281,13 @@ msgid ""
 "more things."
 msgstr ""
 
 "more things."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:205
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:204

 msgid "Debian machines"
 msgstr ""
 
 msgid "Debian machines"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:207
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:206

 msgid ""
 "Debian has several computers working as servers, most of which serve "
 "critical functions in the Debian project.  Most of the machines are used for "
 msgid ""
 "Debian has several computers working as servers, most of which serve "
 "critical functions in the Debian project.  Most of the machines are used for "


@@ -295,16 +295,16 @@ msgid ""
 "Internet."
 msgstr ""
 
 "Internet."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:212
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:211

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

-# type: Content of: <chapter><section><para>
-#: resources.dbk:217
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:216

 msgid ""
 "Generally speaking, you can use these machines for Debian-related purposes "
 "as you see fit.  Please be kind to system administrators, and do not use up "
 msgid ""
 "Generally speaking, you can use these machines for Debian-related purposes "
 "as you see fit.  Please be kind to system administrators, and do not use up "


@@ -313,40 +313,43 @@ msgid ""
 "by volunteers."
 msgstr ""
 
 "by volunteers."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:224
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:223

 msgid ""
 "Please take care to protect your Debian passwords and SSH keys installed on "
 "Debian machines.  Avoid login or upload methods which send passwords over "
 msgid ""
 "Please take care to protect your Debian passwords and SSH keys installed on "
 "Debian machines.  Avoid login or upload methods which send passwords over "

-"the Internet in the clear, such as telnet, FTP, POP etc."
+"the Internet in the clear, such as Telnet, FTP, POP etc."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:229
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:228

 msgid ""
 "Please do not put any material that doesn't relate to Debian on the Debian "
 "servers, unless you have prior permission."
 msgstr ""
 
 msgid ""
 "Please do not put any material that doesn't relate to Debian on the Debian "
 "servers, unless you have prior permission."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:233
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:232

 msgid ""
 "The current list of Debian machines is available at <ulink "
 "url=\"&url-devel-machines;\"></ulink>.  That web page contains machine "
 "names, contact information, information about who can log in, SSH keys etc."
 msgstr ""
 
 msgid ""
 "The current list of Debian machines is available at <ulink "
 "url=\"&url-devel-machines;\"></ulink>.  That web page contains machine "
 "names, contact information, information about who can log in, SSH keys etc."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:239
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:238

 msgid ""
 "If you have a problem with the operation of a Debian server, and you think "
 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 ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:245
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:246

 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 "


@@ -355,32 +358,32 @@ msgid ""
 "how to submit bugs."
 msgstr ""
 
 "how to submit bugs."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:252
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:253

 msgid ""
 "Some of the core servers are restricted, but the information from there is "
 "mirrored to another server."
 msgstr ""
 
 msgid ""
 "Some of the core servers are restricted, but the information from there is "
 "mirrored to another server."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:256
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:257

 msgid "The bugs server"
 msgstr ""
 
 msgid "The bugs server"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:258
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:259

 msgid ""
 "<literal>&bugs-host;</literal> is the canonical location for the Bug "
 "Tracking System (BTS)."
 msgstr ""
 
 msgid ""
 "<literal>&bugs-host;</literal> is the canonical location for the Bug "
 "Tracking System (BTS)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:262 resources.dbk:280
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:263 resources.dbk:281

 msgid "It is restricted; a mirror is available on <literal>merkel</literal>."
 msgstr ""
 
 msgid "It is restricted; a mirror is available on <literal>merkel</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:265
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:266

 msgid ""
 "If you plan on doing some statistical analysis or processing of Debian bugs, "
 "this would be the place to do it.  Please describe your plans on "
 msgid ""
 "If you plan on doing some statistical analysis or processing of Debian bugs, "
 "this would be the place to do it.  Please describe your plans on "


@@ -388,55 +391,42 @@ msgid ""
 "unnecessary duplication of effort or wasted processing time."
 msgstr ""
 
 "unnecessary duplication of effort or wasted processing time."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:273
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:274

 msgid "The ftp-master server"
 msgstr ""
 
 msgid "The ftp-master server"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:275
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:276

 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 uploaded to &ftp-upload-host; end up "
+"on this server, see <xref linkend=\"upload\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:283
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:284

 msgid ""
 "Problems with the Debian FTP archive generally need to be reported as bugs "
 "against the <systemitem role=\"package\">&ftp-debian-org;</systemitem> "
 "pseudo-package or an email to &email-ftpmaster;, but also see the procedures "
 msgid ""
 "Problems with the Debian FTP archive generally need to be reported as bugs "
 "against the <systemitem role=\"package\">&ftp-debian-org;</systemitem> "
 "pseudo-package or an email to &email-ftpmaster;, but also see the procedures "

-"in <xref linkend=\"archive-manip\"/> ."
+"in <xref linkend=\"archive-manip\"/>."

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

 msgid "The www-master server"
 msgstr ""
 
 msgid "The www-master server"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:302
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:294

 msgid ""
 "The main web server is <literal>www-master.debian.org</literal>.  It holds "
 "the official web pages, the face of Debian for most newbies."
 msgstr ""
 
 msgid ""
 "The main web server is <literal>www-master.debian.org</literal>.  It holds "
 "the official web pages, the face of Debian for most newbies."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:306
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:298

 msgid ""
 "If you find a problem with the Debian web server, you should generally "
 "submit a bug against the pseudo-package, <systemitem "
 msgid ""
 "If you find a problem with the Debian web server, you should generally "
 "submit a bug against the pseudo-package, <systemitem "


@@ -445,20 +435,20 @@ msgid ""
 "url=\"http://&bugs-host;/&www-debian-org;\">Bug Tracking System</ulink>."
 msgstr ""
 
 "url=\"http://&bugs-host;/&www-debian-org;\">Bug Tracking System</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:315
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:307

 msgid "The people web server"
 msgstr ""
 
 msgid "The people web server"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:317
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:309

 msgid ""
 "<literal>people.debian.org</literal> is the server used for developers' own "
 "web pages about anything related to Debian."
 msgstr ""
 
 msgid ""
 "<literal>people.debian.org</literal> is the server used for developers' own "
 "web pages about anything related to Debian."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:321
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:313

 msgid ""
 "If you have some Debian-specific information which you want to serve on the "
 "web, you can do this by putting material in the "
 msgid ""
 "If you have some Debian-specific information which you want to serve on the "
 "web, you can do this by putting material in the "


@@ -467,96 +457,80 @@ msgid ""
 "<literal>http://people.debian.org/~<replaceable>your-user-id</replaceable>/</literal>."
 msgstr ""
 
 "<literal>http://people.debian.org/~<replaceable>your-user-id</replaceable>/</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:328
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:320

 msgid ""
 "You should only use this particular location because it will be backed up, "
 "whereas on other hosts it won't."
 msgstr ""
 
 msgid ""
 "You should only use this particular location because it will be backed up, "
 "whereas on other hosts it won't."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:332
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:324

 msgid ""
 "Usually the only reason to use a different host is when you need to publish "
 "materials subject to the U.S.  export restrictions, in which case you can "
 "use one of the other servers located outside the United States."
 msgstr ""
 
 msgid ""
 "Usually the only reason to use a different host is when you need to publish "
 "materials subject to the U.S.  export restrictions, in which case you can "
 "use one of the other servers located outside the United States."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:337
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:329

 msgid "Send mail to &email-debian-devel; if you have any questions."
 msgstr ""
 
 msgid "Send mail to &email-debian-devel; if you have any questions."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:342
-msgid "The CVS server"
-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
-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>."
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:334
+msgid "The VCS servers"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:359
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:336

 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."
+"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 (cvs.alioth.debian.org/cvs.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 ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:367
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:349

 msgid "chroots to different distributions"
 msgstr ""
 
 msgid "chroots to different distributions"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:369
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:351

 msgid ""
 "On some machines, there are chroots to different distributions available.  "
 "You can use them like this:"
 msgstr ""
 
 msgid ""
 "On some machines, there are chroots to different distributions available.  "
 "You can use them like this:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: resources.dbk:373
+#. type: Content of: <chapter><section><section><screen>
+#: resources.dbk:355

 #, no-wrap
 msgid ""
 "vore$ dchroot unstable\n"
 #, no-wrap
 msgid ""
 "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 ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:377
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:359

 msgid ""
 "In all chroots, the normal user home directories are available.  You can "
 msgid ""
 "In all chroots, the normal user home directories are available.  You can "

-"find out which chroots are available via "
-"<literal>&url-devel-machines;</literal>."
+"find out which chroots are available via <ulink "
+"url=\"&url-devel-machines;\"></ulink>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:386
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:368

 msgid "The Developers Database"
 msgstr ""
 
 msgid "The Developers Database"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:388
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:370

 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 "


@@ -565,30 +539,30 @@ msgid ""
 "<command>finger yourlogin@db.debian.org</command> to see what it reports."
 msgstr ""
 
 "<command>finger yourlogin@db.debian.org</command> to see what it reports."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:396
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:378

 msgid ""
 "Developers can <ulink url=\"&url-debian-db-login;\">log into the "
 "database</ulink> to change various information about themselves, such as:"
 msgstr ""
 
 msgid ""
 "Developers can <ulink url=\"&url-debian-db-login;\">log into the "
 "database</ulink> to change various information about themselves, such as:"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:402
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:384

 msgid "forwarding address for your debian.org email"
 msgstr ""
 
 msgid "forwarding address for your debian.org email"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:407
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:389

 msgid "subscription to debian-private"
 msgstr ""
 
 msgid "subscription to debian-private"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:412
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:394

 msgid "whether you are on vacation"
 msgstr ""
 
 msgid "whether you are on vacation"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:417
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:399

 msgid ""
 "personal information such as your address, country, the latitude and "
 "longitude of the place where you live for use in <ulink "
 msgid ""
 "personal information such as your address, country, the latitude and "
 "longitude of the place where you live for use in <ulink "


@@ -596,21 +570,21 @@ msgid ""
 "fax numbers, IRC nickname and web page"
 msgstr ""
 
 "fax numbers, IRC nickname and web page"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:425
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:407

 msgid "password and preferred shell on Debian Project machines"
 msgstr ""
 
 msgid "password and preferred shell on Debian Project machines"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:430
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:412

 msgid ""
 "Most of the information is not accessible to the public, naturally.  For "
 "more information please read the online documentation that you can find at "
 "<ulink url=\"&url-debian-db-doc;\"></ulink>."
 msgstr ""
 
 msgid ""
 "Most of the information is not accessible to the public, naturally.  For "
 "more information please read the online documentation that you can find at "
 "<ulink url=\"&url-debian-db-doc;\"></ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:435
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:417

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


@@ -618,86 +592,85 @@ msgid ""
 "url=\"&url-debian-db-mail-gw;\"></ulink>."
 msgstr ""
 
 "url=\"&url-debian-db-mail-gw;\"></ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:443
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:425

 msgid "The Debian archive"
 msgstr ""
 
 msgid "The Debian archive"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:445
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:427

 msgid ""
 msgid ""

-"The &debian-formal; distribution consists of a lot of packages "
-"(<filename>.deb</filename>'s, currently around &number-of-pkgs;) and a few "
-"additional files (such as documentation and installation disk images)."
+"The &debian-formal; distribution consists of a lot of packages (currently "
+"around &number-of-pkgs; source packages) and a few additional files (such as "
+"documentation and installation disk images)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:451
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:432

 msgid "Here is an example directory tree of a complete Debian archive:"
 msgstr ""
 
 msgid "Here is an example directory tree of a complete Debian archive:"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:455
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:436

 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 "
+"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 "
 "<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."
+"for <literal>stable</literal> is equally applicable to the "
+"<literal>unstable</literal> and <literal>testing</literal> distributions."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:469
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:450

 msgid ""
 "<filename>dists/stable</filename> contains three directories, namely "
 "<filename>main</filename>, <filename>contrib</filename>, and "
 "<filename>non-free</filename>."
 msgstr ""
 
 msgid ""
 "<filename>dists/stable</filename> contains three directories, namely "
 "<filename>main</filename>, <filename>contrib</filename>, and "
 "<filename>non-free</filename>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:474
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:455

 msgid ""
 "In each of the areas, there is a directory for the source packages "
 "(<filename>source</filename>) and a directory for each supported "
 "architecture (<filename>binary-i386</filename>, "
 msgid ""
 "In each of the areas, there is a directory for the source packages "
 "(<filename>source</filename>) and a directory for each supported "
 "architecture (<filename>binary-i386</filename>, "

-"<filename>binary-m68k</filename>, etc.)."
+"<filename>binary-amd64</filename>, etc.)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:479
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:460

 msgid ""
 "The <filename>main</filename> area contains additional directories which "
 "hold the disk images and some essential pieces of documentation required for "
 "installing the Debian distribution on a specific architecture "
 msgid ""
 "The <filename>main</filename> area contains additional directories which "
 "hold the disk images and some essential pieces of documentation required for "
 "installing the Debian distribution on a specific architecture "

-"(<filename>disks-i386</filename>, <filename>disks-m68k</filename>, etc.)."
+"(<filename>disks-i386</filename>, <filename>disks-amd64</filename>, etc.)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:485
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:466

 msgid "Sections"
 msgstr ""
 
 msgid "Sections"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:487
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:468

 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; "
 "the <emphasis role=\"strong\">official &debian-formal; "

-"distribution</emphasis>.  The <emphasis>main</emphasis> section is official "
+"distribution</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 ""
 
 "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>
-#: resources.dbk:495
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:476

 msgid ""
 "Every package in the main section must fully comply with the <ulink "
 "url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink> (DFSG) and with "
 msgid ""
 "Every package in the main section must fully comply with the <ulink "
 "url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink> (DFSG) and with "


@@ -707,174 +680,186 @@ msgid ""
 "details."
 msgstr ""
 
 "details."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:503
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:484

 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 ""
 
 "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
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:489

 msgid ""
 "Packages which do not conform to the DFSG are placed in the "
 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 Debian distribution, though we support their use, and we provide "
+"<literal>non-free</literal> section.  These packages are not considered as "
+"part of the Debian distribution, though we enable their use, and we provide "

 "infrastructure (such as our bug-tracking system and mailing lists) for "
 "non-free software packages."
 msgstr ""
 
 "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
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:496

 msgid ""
 "The <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> contains "
 "a more exact definition of the three sections.  The above discussion is just "
 "an introduction."
 msgstr ""
 
 msgid ""
 "The <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> contains "
 "a more exact definition of the three sections.  The above discussion is just "
 "an introduction."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:520
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:501

 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 ""
 
 "section do not allow commercial distribution, for example."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:528
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:509

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

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:534
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:515

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

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:544
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:525

 msgid "Architectures"
 msgstr ""
 
 msgid "Architectures"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:546
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:527

 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 "

-"popular, the kernel was ported to other architectures, too."
+"popular, the kernel was ported to other architectures and Debian started to "
+"support them. And as if supporting so much hardware was not enough, Debian "
+"decided to build some ports based on other Unix kernels, like "
+"<literal>hurd</literal> and <literal>kfreebsd</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:551
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:535

 msgid ""
 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."
+"&debian-formal; 1.3 was only available as <literal>i386</literal>.  Debian "
+"2.0 shipped for <literal>i386</literal> and <literal>m68k</literal> "
+"architectures.  Debian 2.1 shipped for the <literal>i386</literal>, "
+"<literal>m68k</literal>, <literal>alpha</literal>, and "
+"<literal>sparc</literal> architectures.  Since then Debian has grown "
+"hugely.  Debian 5 supports a total of twelve architectures: "
+"<literal>alpha</literal>, <literal>amd64</literal>, <literal>arm</literal>, "
+"<literal>armel</literal>, <literal>hppa</literal>, <literal>i386</literal>, "
+"<literal>ia64</literal>, <literal>mips</literal>, <literal>mipsel</literal>, "
+"<literal>powerpc</literal>, <literal>s390</literal>, "
+"<literal>sparc</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:565
-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>."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:576
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:548

 msgid ""
 "Information for developers and users about the specific ports are available "
 "at the <ulink url=\"&url-debian-ports;\">Debian Ports web pages</ulink>."
 msgstr ""
 
 msgid ""
 "Information for developers and users about the specific ports are available "
 "at the <ulink url=\"&url-debian-ports;\">Debian Ports web pages</ulink>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:582
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:554

 msgid "Packages"
 msgstr ""
 
 msgid "Packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:584
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:556
+msgid ""
+"There are two types of Debian packages, namely <literal>source</literal> and "
+"<literal>binary</literal> packages."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:560

 msgid ""
 msgid ""

-"There are two types of Debian packages, namely <emphasis>source</emphasis> "
-"and <emphasis>binary</emphasis> packages."
+"Depending on the format of the source package, it will consist of one or "
+"more files in addition to the mandatory <filename>.dsc</filename> file:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:588
+#. type: Content of: <chapter><section><section><para><itemizedlist><listitem><para>
+#: resources.dbk:564

 msgid ""
 msgid ""

-"Source packages consist of either two or three files: a "
-"<filename>.dsc</filename> file, and either a <filename>.tar.gz</filename> "
-"file or both an <filename>.orig.tar.gz</filename> and a "
-"<filename>.diff.gz</filename> file."
+"with format “1.0”, it has either a <filename>.tar.gz</filename> file or both "
+"an <filename>.orig.tar.gz</filename> and a <filename>.diff.gz</filename> "
+"file;"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:594
+#. type: Content of: <chapter><section><section><para><itemizedlist><listitem><para>
+#: resources.dbk:567
+msgid ""
+"with format “3.0 (quilt)”, it has a mandatory "
+"<filename>.orig.tar.{gz,bz2,lzma}</filename> upstream tarball, multiple "
+"optional "
+"<filename>.orig-<replaceable>component</replaceable>.tar.{gz,bz2,lzma}</filename> "
+"additional upstream tarballs and a mandatory "
+"<filename>debian.tar.{gz,bz2,lzma}</filename> debian tarball;"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para><itemizedlist><listitem><para>
+#: resources.dbk:573
+msgid ""
+"with format “3.0 (native)”, it has only a single "
+"<filename>.tar.{gz,bz2,lzma}</filename> tarball."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:578

 msgid ""
 "If a package is developed specially for Debian and is not distributed "
 msgid ""
 "If a package is developed specially for Debian and is not distributed "

-"outside of Debian, there is just one <filename>.tar.gz</filename> file which "
-"contains the sources of the program.  If a package is distributed elsewhere "
-"too, the <filename>.orig.tar.gz</filename> file stores the so-called "
-"<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."
+"outside of Debian, there is just one <filename>.tar.{gz,bz2,lzma}</filename> "
+"file which contains the sources of the program, it's called a “native” "
+"source package.  If a package is distributed elsewhere too, the "
+"<filename>.orig.tar.{gz,bz2,lzma}</filename> file stores the so-called "
+"<literal>upstream source code</literal>, that is the source code that's "
+"distributed by the <literal>upstream maintainer</literal> (often the author "
+"of the software). In this case, the <filename>.diff.gz</filename> or the "
+"<filename>debian.tar.{gz,bz2,lzma}</filename> contains the changes made by "
+"the Debian maintainer."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:604
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:591

 msgid ""
 "The <filename>.dsc</filename> file lists all the files in the source package "
 "together with checksums (<command>md5sums</command>) and some additional "
 "info about the package (maintainer, version, etc.)."
 msgstr ""
 
 msgid ""
 "The <filename>.dsc</filename> file lists all the files in the source package "
 "together with checksums (<command>md5sums</command>) and some additional "
 "info about the package (maintainer, version, etc.)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:611
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:598

 msgid "Distributions"
 msgstr ""
 
 msgid "Distributions"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:613
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:600

 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 ""
 
 "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
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:606

 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 "


@@ -883,8 +868,8 @@ msgid ""
 "location (another is <filename>/pub/debian</filename>)."
 msgstr ""
 
 "location (another is <filename>/pub/debian</filename>)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:626
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:613

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


@@ -894,271 +879,272 @@ msgid ""
 "(for backwards compatibility)."
 msgstr ""
 
 "(for backwards compatibility)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: resources.dbk:634
+#. type: Content of: <chapter><section><section><section><title>
+#: resources.dbk:621

 msgid "Stable, testing, and unstable"
 msgstr ""
 
 msgid "Stable, testing, and unstable"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:636
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:623

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

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:643
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:630

 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 "
 "sometimes literally unstable."
 msgstr ""
 
 "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 "
 "sometimes literally unstable."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:652
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:639

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

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:659
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:647

 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>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 ""
 
 "<literal>&archive-host;</literal>)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:676
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:664

 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."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:693
-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>."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><title>
-#: resources.dbk:700
+"<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>
+#: resources.dbk:681
+msgid ""
+"Note that development under <literal>unstable</literal> continues during the "
+"freeze period, since the <literal>unstable</literal> distribution remains in "
+"place in parallel with <literal>testing</literal>."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><title>
+#: resources.dbk:688

 msgid "More information about the testing distribution"
 msgstr ""
 
 msgid "More information about the testing distribution"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:702
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:690

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

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:706
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:694

 msgid ""
 "For more details, please see the <link linkend=\"testing\">information about "
 "the testing distribution</link>."
 msgstr ""
 
 msgid ""
 "For more details, please see the <link linkend=\"testing\">information about "
 "the testing distribution</link>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: resources.dbk:712
+#. type: Content of: <chapter><section><section><section><title>
+#: resources.dbk:700

 msgid "Experimental"
 msgstr ""
 
 msgid "Experimental"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:714
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:702

 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> "
+"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 ""
 
 "distribution."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:725
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:714

 msgid ""
 "These are the <citerefentry> <refentrytitle>sources.list</refentrytitle> "
 "<manvolnum>5</manvolnum> </citerefentry> lines for "
 msgid ""
 "These are the <citerefentry> <refentrytitle>sources.list</refentrytitle> "
 "<manvolnum>5</manvolnum> </citerefentry> lines for "

-"<emphasis>experimental</emphasis>:"
+"<literal>experimental</literal>:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><programlisting>
-#: resources.dbk:730
+#. type: Content of: <chapter><section><section><section><programlisting>
+#: resources.dbk:719

 #, no-wrap
 msgid ""
 "deb http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ experimental "
 "main\n"
 "deb-src http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ "
 #, no-wrap
 msgid ""
 "deb http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ experimental "
 "main\n"
 "deb-src http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ "

-"experimental main"
+"experimental main\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:734
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:723

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

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:740
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:729

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

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:750
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:739

 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 "
 "automatically removed once you upload the package in "
 "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."
+"<literal>unstable</literal> with a higher version number."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:760
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:749

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

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:764
+#. type: Content of: <chapter><section><section><section><para>
+#: resources.dbk:753

 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 ""
 
 "web space on <literal>people.debian.org</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:768
-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."
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:777
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:761

 msgid "Release code names"
 msgstr ""
 
 msgid "Release code names"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:779
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:763

 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>; Debian 5.0, "
+"<literal>lenny</literal> and the next release will be called "
+"<literal>squeeze</literal>.  There is also a ``pseudo-distribution'', called "
+"<literal>sid</literal>, which is the current <literal>unstable</literal> "
+"distribution; since packages are moved from <literal>unstable</literal> to "
+"<literal>testing</literal> as they approach stability, "
+"<literal>sid</literal> itself is never released.  As well as the usual "
+"contents of a Debian distribution, <literal>sid</literal> contains packages "
+"for architectures which are not yet officially supported or released by "
+"Debian.  These architectures are planned to be integrated into the "
+"mainstream distribution at some future date."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:791
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:781

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

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:800
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:791

 msgid ""
 "On the other hand, if we called the distribution directories "
 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 "
+"<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 ""
 
 "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>
-#: resources.dbk:808
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:799

 msgid ""
 "Thus, the names of the distribution directories in the archive are "
 "determined by their code names and not their release status (e.g., "
 msgid ""
 "Thus, the names of the distribution directories in the archive are "
 "determined by their code names and not their release status (e.g., "

-"`slink').  These names stay the same during the development period and after "
-"the release; symbolic links, which can be changed easily, indicate the "
+"`squeeze'). 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 "
 "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 ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:822
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:813

 msgid "Debian mirrors"
 msgstr ""
 
 msgid "Debian mirrors"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:824
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:815

 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 "


@@ -1171,8 +1157,8 @@ msgid ""
 "the internal sites (we call this push mirroring)."
 msgstr ""
 
 "the internal sites (we call this push mirroring)."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:835
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:826

 msgid ""
 "All the information on Debian mirrors, including a list of the available "
 "public FTP/HTTP servers, can be found at <ulink "
 msgid ""
 "All the information on Debian mirrors, including a list of the available "
 "public FTP/HTTP servers, can be found at <ulink "


@@ -1181,29 +1167,29 @@ msgid ""
 "up your own mirror, either for internal or public access."
 msgstr ""
 
 "up your own mirror, either for internal or public access."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:842
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:833

 msgid ""
 "Note that mirrors are generally run by third-parties who are interested in "
 "helping Debian.  As such, developers generally do not have accounts on these "
 "machines."
 msgstr ""
 
 msgid ""
 "Note that mirrors are generally run by third-parties who are interested in "
 "helping Debian.  As such, developers generally do not have accounts on these "
 "machines."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:849
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:840

 msgid "The Incoming system"
 msgstr ""
 
 msgid "The Incoming system"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:851
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:842

 msgid ""
 "The Incoming system is responsible for collecting updated packages and "
 "installing them in the Debian archive.  It consists of a set of directories "
 "and scripts that are installed on <literal>&ftp-master-host;</literal>."
 msgstr ""
 
 msgid ""
 "The Incoming system is responsible for collecting updated packages and "
 "installing them in the Debian archive.  It consists of a set of directories "
 "and scripts that are installed on <literal>&ftp-master-host;</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:856
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:847

 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 "


@@ -1226,14 +1212,14 @@ msgid ""
 "<filename>reject</filename> directory."
 msgstr ""
 
 "<filename>reject</filename> directory."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:875
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:866

 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 "
 "auto-builders may start recompiling it.  The package is now publicly "
 "accessible at <ulink url=\"&url-incoming;\"></ulink> until it is really "
 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 "
 "auto-builders may start recompiling it.  The package is now publicly "
 "accessible at <ulink url=\"&url-incoming;\"></ulink> until it is really "

-"installed in the Debian archive.  This happens only once a day (and is also "
+"installed in the Debian archive.  This happens four times a day (and is also "

 "called the `dinstall run' for historical reasons); the package is then "
 "removed from incoming and installed in the pool along with all the other "
 "packages.  Once all the other updates (generating new "
 "called the `dinstall run' for historical reasons); the package is then "
 "removed from incoming and installed in the pool along with all the other "
 "packages.  Once all the other updates (generating new "


@@ -1242,37 +1228,38 @@ msgid ""
 "primary mirrors to update themselves."
 msgstr ""
 
 "primary mirrors to update themselves."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:887
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:878

 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 "
 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>Distribution</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 ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:897
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:888

 msgid ""
 "Though ftp-master is restricted, a copy of the installation is available to "
 "all developers on <literal>&ftp-master-mirror;</literal>."
 msgstr ""
 
 msgid ""
 "Though ftp-master is restricted, a copy of the installation is available to "
 "all developers on <literal>&ftp-master-mirror;</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:960
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:951

 msgid "Package information"
 msgstr ""
 
 msgid "Package information"
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:962
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:953

 msgid "On the web"
 msgstr ""
 
 msgid "On the web"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:964
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:955

 msgid ""
 "Each package has several dedicated web pages.  "
 "<literal>http://&packages-host;/<replaceable>package-name</replaceable></literal> "
 msgid ""
 "Each package has several dedicated web pages.  "
 "<literal>http://&packages-host;/<replaceable>package-name</replaceable></literal> "


@@ -1282,61 +1269,63 @@ msgid ""
 "links."
 msgstr ""
 
 "links."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:971
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:962

 msgid ""
 "The bug tracking system tracks bugs for each package.  You can view the bugs "
 "of a given package at the URL "
 "<literal>http://&bugs-host;/<replaceable>package-name</replaceable></literal>."
 msgstr ""
 
 msgid ""
 "The bug tracking system tracks bugs for each package.  You can view the bugs "
 "of a given package at the URL "
 "<literal>http://&bugs-host;/<replaceable>package-name</replaceable></literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:978
-msgid "The <command>madison</command> utility"
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:969
+msgid "The <command>dak ls</command> utility"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:980
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:971

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

-# type: Content of: <chapter><section><section><screen>
-#: resources.dbk:988
+#. type: Content of: <chapter><section><section><screen>
+#: resources.dbk:979

 #, 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, "
+"$ dak ls evince\n"
+"evince | 0.1.5-2sarge1 |     oldstable | source, alpha, arm, hppa, i386, "

 "ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"
 "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"
+"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 ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:995
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:988

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

-# type: Content of: <chapter><section><title>
-#: resources.dbk:1005
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:998

 msgid "The Package Tracking System"
 msgstr ""
 
 msgid "The Package Tracking System"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1007
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1000

 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 "


@@ -1344,46 +1333,83 @@ msgid ""
 "package in the PTS."
 msgstr ""
 
 "package in the PTS."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1012
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1005

 msgid ""
 "Each email sent through the PTS is classified under one of the keywords "
 "listed below.  This will let you select the mails that you want to receive."
 msgstr ""
 
 msgid ""
 "Each email sent through the PTS is classified under one of the keywords "
 "listed below.  This will let you select the mails that you want to receive."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1016
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1009

 msgid "By default you will get:"
 msgstr ""
 
 msgid "By default you will get:"
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1023
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1013
+msgid "<literal>bts</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1016

 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><listitem><para>
-#: resources.dbk:1031
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1021
+msgid "<literal>bts-control</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1024

 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><listitem><para>
-#: resources.dbk:1040
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1030
+msgid "<literal>upload-source</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1033

 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><listitem><para>
-#: resources.dbk:1049
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1039
+msgid "<literal>katie-other</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1042

 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><listitem><para>
-#: resources.dbk:1058
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1048
+msgid "<literal>buildd</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1051
+msgid ""
+"Build failures notifications sent by the network of build daemons, they "
+"contain a pointer to the build logs for analysis."
+msgstr ""
+
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1057
+msgid "<literal>default</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1060

 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 "


@@ -1392,20 +1418,44 @@ msgid ""
 "<literal>X-PTS-Approved</literal> header with a non-empty value."
 msgstr ""
 
 "<literal>X-PTS-Approved</literal> header with a non-empty value."
 msgstr ""
 

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1070
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1069
+msgid "<literal>contact</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1072
+msgid ""
+"Mails sent to the maintainer through the *@packages.debian.org email "
+"aliases."
+msgstr ""
+
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1078
+msgid "<literal>summary</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1081

 msgid ""
 msgid ""

-"Regular summary emails about the package's status.  Currently, only "
-"progression in <emphasis>testing</emphasis> is sent."
+"Regular summary emails about the package's status, including progression "
+"into <literal>testing</literal>, <ulink url=\"&url-dehs;\">DEHS</ulink> "
+"notifications of new upstream versions, and a notification if the package is "
+"removed or orphaned."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1077
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1091

 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><listitem><para>
-#: resources.dbk:1084
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1095
+msgid "<literal>upload-binary</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1098

 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 "


@@ -1413,41 +1463,75 @@ 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><listitem><para>
-#: resources.dbk:1095
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1106
+msgid "<literal>cvs</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1109

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

-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1104
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1117
+msgid "<literal>ddtp</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1120

 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><listitem><para>
-#: resources.dbk:1113
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1126
+msgid "<literal>derivatives</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1129

 msgid ""
 "Information about changes made to the package in derivative distributions "
 "(for example Ubuntu)."
 msgstr ""
 
 msgid ""
 "Information about changes made to the package in derivative distributions "
 "(for example Ubuntu)."
 msgstr ""
 

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

 msgid "The PTS email interface"
 msgstr ""
 
 msgid "The PTS email interface"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1122
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1146

 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><listitem><para>
-#: resources.dbk:1130
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1151
+msgid "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1154

 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 "


@@ -1457,135 +1541,203 @@ msgid ""
 "subscribe you to the corresponding source package."
 msgstr ""
 
 "subscribe you to the corresponding source package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1143
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1164
+msgid "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1167

 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><listitem><para>
-#: resources.dbk:1153
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1174
+msgid "<literal>unsubscribeall [&lt;email&gt;]</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1177

 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><listitem><para>
-#: resources.dbk:1162
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1183
+msgid "<literal>which [&lt;email&gt;]</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1186

 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><listitem><para>
-#: resources.dbk:1171
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1192
+msgid "<literal>keyword [&lt;email&gt;]</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1195

 msgid ""
 "Tells you the keywords that you are accepting.  For an explanation of "
 "keywords, <link linkend=\"pkg-tracking-system\">see above</link>.  Here's a "
 "quick summary:"
 msgstr ""
 
 msgid ""
 "Tells you the keywords that you are accepting.  For an explanation of "
 "keywords, <link linkend=\"pkg-tracking-system\">see above</link>.  Here's a "
 "quick summary:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1178
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1202

 msgid "<literal>bts</literal>: mails coming from the Debian Bug Tracking System"
 msgstr ""
 
 msgid "<literal>bts</literal>: mails coming from the Debian Bug Tracking System"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1183
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1207

 msgid "<literal>bts-control</literal>: reply to mails sent to &email-bts-control;"
 msgstr ""
 
 msgid "<literal>bts-control</literal>: reply to mails sent to &email-bts-control;"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1189
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1213

 msgid ""
 "<literal>summary</literal>: automatic summary mails about the state of a "
 "package"
 msgstr ""
 
 msgid ""
 "<literal>summary</literal>: automatic summary mails about the state of a "
 "package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1195
-msgid "<literal>cvs</literal>: notification of CVS commits"
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1219
+msgid ""
+"<literal>contact</literal>: mails sent to the maintainer through the "
+"*@packages.debian.org aliases"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1200
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1225
+msgid "<literal>cvs</literal>: notification of VCS commits"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1230

 msgid "<literal>ddtp</literal>: translations of descriptions and debconf templates"
 msgstr ""
 
 msgid "<literal>ddtp</literal>: translations of descriptions and debconf templates"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1205
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1235

 msgid ""
 "<literal>derivatives</literal>: changes made on the package by derivative "
 "distributions"
 msgstr ""
 
 msgid ""
 "<literal>derivatives</literal>: changes made on the package by derivative "
 "distributions"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1211
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1241
+msgid ""
+"<literal>derivatives-bugs</literal>: bugs reports and comments from "
+"derivative distributions"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1247

 msgid ""
 "<literal>upload-source</literal>: announce of a new source upload that has "
 "been accepted"
 msgstr ""
 
 msgid ""
 "<literal>upload-source</literal>: announce of a new source upload that has "
 "been accepted"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1217
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1253

 msgid ""
 "<literal>upload-binary</literal>: announce of a new binary-only upload "
 "(porting)"
 msgstr ""
 
 msgid ""
 "<literal>upload-binary</literal>: announce of a new binary-only upload "
 "(porting)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1223
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1259

 msgid ""
 "<literal>katie-other</literal>: other mails from ftpmasters (override "
 "disparity, etc.)"
 msgstr ""
 
 msgid ""
 "<literal>katie-other</literal>: other mails from ftpmasters (override "
 "disparity, etc.)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1229
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1265
+msgid "<literal>buildd</literal>: build failures notifications from build daemons"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1270

 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><listitem><para>
-#: resources.dbk:1239
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1277
+msgid "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1280

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

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

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

 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><listitem><para>
-#: resources.dbk:1277
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
+#: resources.dbk:1315
+msgid "<literal>quit | thanks | --</literal>"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1318

 msgid "Stops processing commands.  All following lines are ignored by the bot."
 msgstr ""
 
 msgid "Stops processing commands.  All following lines are ignored by the bot."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1283
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1324

 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 "


@@ -1593,13 +1745,13 @@ msgid ""
 "non-maintainer upload."
 msgstr ""
 
 "non-maintainer upload."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:1291
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:1332

 msgid "Filtering PTS mails"
 msgstr ""
 
 msgid "Filtering PTS mails"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1293
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1334

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


@@ -1609,75 +1761,84 @@ msgid ""
 "<literal>X-PTS-Keyword</literal> and <literal>X-Unsubscribe</literal>."
 msgstr ""
 
 "<literal>X-PTS-Keyword</literal> and <literal>X-Unsubscribe</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1301
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1342

 msgid ""
 "Here is an example of added headers for a source upload notification on the "
 "<systemitem role=\"package\">dpkg</systemitem> package:"
 msgstr ""
 
 msgid ""
 "Here is an example of added headers for a source upload notification on the "
 "<systemitem role=\"package\">dpkg</systemitem> package:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: resources.dbk:1305
+#. type: Content of: <chapter><section><section><screen>
+#: resources.dbk:1346

 #, no-wrap
 msgid ""
 "X-Loop: dpkg@&pts-host;\n"
 "X-PTS-Package: dpkg\n"
 "X-PTS-Keyword: upload-source\n"
 #, no-wrap
 msgid ""
 "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 ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:1313
-msgid "Forwarding CVS commits in the PTS"
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:1354
+msgid "Forwarding VCS commits in the PTS"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1315
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1356

 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 ""
 
 "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
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1362

 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 needs 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:1371
+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 ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:1330
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:1377

 msgid "The PTS web interface"
 msgstr ""
 
 msgid "The PTS web interface"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1332
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1379

 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 "
 "features many useful links (BTS, QA stats, contact information, DDTP "
 "translation status, buildd logs) and gathers much more information from "
 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 "
 "features many useful links (BTS, QA stats, contact information, DDTP "
 "translation status, buildd logs) and gathers much more information from "

-"various places (30 latest changelog entries, testing status, ...).  It's a "
+"various places (30 latest changelog entries, testing status, etc.).  It's a "

 "very useful tool if you want to know what's going on with a specific source "
 "package.  Furthermore there's a form that allows easy subscription to the "
 "PTS via email."
 msgstr ""
 
 "very useful tool if you want to know what's going on with a specific source "
 "package.  Furthermore there's a form that allows easy subscription to the "
 "PTS via email."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1342
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1389

 msgid ""
 "You can jump directly to the web page concerning a specific source package "
 "with a URL like "
 "<literal>http://&pts-host;/<replaceable>sourcepackage</replaceable></literal>."
 msgstr ""
 
 msgid ""
 "You can jump directly to the web page concerning a specific source package "
 "with a URL like "
 "<literal>http://&pts-host;/<replaceable>sourcepackage</replaceable></literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1347
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1394

 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 "


@@ -1685,82 +1846,82 @@ msgid ""
 "indefinitely)  and news items in the latest news section."
 msgstr ""
 
 "indefinitely)  and news items in the latest news section."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1353
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1400

 msgid "Static news items can be used to indicate:"
 msgstr ""
 
 msgid "Static news items can be used to indicate:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1358
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1405

 msgid ""
 "the availability of a project hosted on <link "
 "linkend=\"alioth\">Alioth</link> for co-maintaining the package"
 msgstr ""
 
 msgid ""
 "the availability of a project hosted on <link "
 "linkend=\"alioth\">Alioth</link> for co-maintaining the package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1364
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1411

 msgid "a link to the upstream web site"
 msgstr ""
 
 msgid "a link to the upstream web site"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1369
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1416

 msgid "a link to the upstream bug tracker"
 msgstr ""
 
 msgid "a link to the upstream bug tracker"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1374
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1421

 msgid "the existence of an IRC channel dedicated to the software"
 msgstr ""
 
 msgid "the existence of an IRC channel dedicated to the software"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1379
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1426

 msgid ""
 "any other available resource that could be useful in the maintenance of the "
 "package"
 msgstr ""
 
 msgid ""
 "any other available resource that could be useful in the maintenance of the "
 "package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1385
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1432

 msgid "Usual news items may be used to announce that:"
 msgstr ""
 
 msgid "Usual news items may be used to announce that:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1390
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1437

 msgid "beta packages are available for testing"
 msgstr ""
 
 msgid "beta packages are available for testing"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1395
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1442

 msgid "final packages are expected for next week"
 msgstr ""
 
 msgid "final packages are expected for next week"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1400
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1447

 msgid "the packaging is about to be redone from scratch"
 msgstr ""
 
 msgid "the packaging is about to be redone from scratch"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1405
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1452

 msgid "backports are available"
 msgstr ""
 
 msgid "backports are available"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1410
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1457

 msgid "the maintainer is on vacation (if they wish to publish this information)"
 msgstr ""
 
 msgid "the maintainer is on vacation (if they wish to publish this information)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1415
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1462

 msgid "a NMU is being worked on"
 msgstr ""
 
 msgid "a NMU is being worked on"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1420
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: resources.dbk:1467

 msgid "something important will affect the package"
 msgstr ""
 
 msgid "something important will affect the package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1425
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1472

 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 "


@@ -1773,39 +1934,39 @@ msgid ""
 "instead of a complete news item."
 msgstr ""
 
 "instead of a complete news item."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1436
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1483

 msgid ""
 "Here are a few examples of valid mails used to generate news items in the "
 msgid ""
 "Here are a few examples of valid mails used to generate news items in the "

-"PTS.  The first one adds a link to the cvsweb interface of debian-cd in the "
+"PTS.  The first one adds a link to the viewsvn interface of debian-cd in the "

 "Static information section:"
 msgstr ""
 
 "Static information section:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: resources.dbk:1441
+#. type: Content of: <chapter><section><section><screen>
+#: resources.dbk:1488

 #, no-wrap
 msgid ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
 "To: pts-static-news@qa.debian.org\n"
 #, no-wrap
 msgid ""
 "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 ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1449
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1496

 msgid ""
 "The second one is an announcement sent to a mailing list which is also sent "
 "to the PTS so that it is published on the PTS web page of the package.  Note "
 "the use of the BCC field to avoid answers sent to the PTS by mistake."
 msgstr ""
 
 msgid ""
 "The second one is an announcement sent to a mailing list which is also sent "
 "to the PTS so that it is published on the PTS web page of the package.  Note "
 "the use of the BCC field to avoid answers sent to the PTS by mistake."
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: resources.dbk:1454
+#. type: Content of: <chapter><section><section><screen>
+#: resources.dbk:1501

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

-": Raphael Hertzog &lt;hertzog@debian.org&gt;\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"


@@ -1816,11 +1977,11 @@ msgid ""
 "I'm glad to announce that galeon has been backported for woody. You'll "
 "find\n"
 "everything here:\n"
 "I'm glad to announce that galeon has been backported for woody. You'll "
 "find\n"
 "everything here:\n"

-"..."
+"...\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1467
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1514

 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 "


@@ -1828,13 +1989,13 @@ msgid ""
 "information contained in the previous one."
 msgstr ""
 
 "information contained in the previous one."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:1477
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:1524

 msgid "Developer's packages overview"
 msgstr ""
 
 msgid "Developer's packages overview"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1479
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1526

 msgid ""
 "A QA (quality assurance) web portal is available at <ulink "
 "url=\"&url-ddpo;\"></ulink> which displays a table listing all the packages "
 msgid ""
 "A QA (quality assurance) web portal is available at <ulink "
 "url=\"&url-ddpo;\"></ulink> which displays a table listing all the packages "


@@ -1845,66 +2006,100 @@ msgid ""
 "useful information."
 msgstr ""
 
 "useful information."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1488
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1535

 msgid ""
 "It is a good idea to look up your own data regularly so that you don't "
 "forget any open bugs, and so that you don't forget which packages are your "
 "responsibility."
 msgstr ""
 
 msgid ""
 "It is a good idea to look up your own data regularly so that you don't "
 "forget any open bugs, and so that you don't forget which packages are your "
 "responsibility."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:1495
-msgid "Debian *Forge: Alioth"
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:1542
+msgid "Debian's FusionForge installation: Alioth"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1497
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1544

 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 "
-"repositories etc.  All these tools are managed via a web interface."
+"Alioth is a Debian service based on a slightly modified version of the "
+"FusionForge software (which evolved from SourceForge and GForge). This "
+"software offers developers access to easy-to-use tools such as bug trackers, "
+"patch manager, project/task managers, file hosting services, mailing lists, "
+"VCS repositories etc.  All these tools are managed via a web interface."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1504
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1551

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

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1510
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1558

 msgid ""
 "All Debian developers automatically have an account on Alioth.  They can "
 "activate it by using the recover password facility.  External developers can "
 "request guest accounts on Alioth."
 msgstr ""
 
 msgid ""
 "All Debian developers automatically have an account on Alioth.  They can "
 "activate it by using the recover password facility.  External developers can "
 "request guest accounts on Alioth."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: resources.dbk:1515
-msgid "For more information please visit <ulink url=\"&url-alioth;\"></ulink>."
+#. type: Content of: <chapter><section><para>
+#: resources.dbk:1563
+msgid "For more information please visit the following links:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: resources.dbk:1521
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:1566
+msgid "<ulink url=\"&url-alioth-wiki;\" />"
+msgstr ""
+
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:1567
+msgid "<ulink url=\"&url-alioth-faq;\" />"
+msgstr ""
+
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:1568
+msgid "<ulink url=\"&url-alioth-pkg;\" />"
+msgstr ""
+
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: resources.dbk:1569
+msgid "<ulink url=\"&url-alioth;\" />"
+msgstr ""
+
+#. type: Content of: <chapter><section><title>
+#: resources.dbk:1574

 msgid "Goodies for Developers"
 msgstr ""
 
 msgid "Goodies for Developers"
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: resources.dbk:1523
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:1576

 msgid "LWN Subscriptions"
 msgstr ""
 
 msgid "LWN Subscriptions"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:1525
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1578

 msgid ""
 "Since October of 2002, HP has sponsored a subscription to LWN for all "
 "interested Debian developers.  Details on how to get access to this benefit "
 "are in <ulink "
 "url=\"http://&lists-host;/debian-devel-announce/2002/10/msg00018.html\"></ulink>."
 msgstr ""
 msgid ""
 "Since October of 2002, HP has sponsored a subscription to LWN for all "
 "interested Debian developers.  Details on how to get access to this benefit "
 "are in <ulink "
 "url=\"http://&lists-host;/debian-devel-announce/2002/10/msg00018.html\"></ulink>."
 msgstr ""

+
+#. type: Content of: <chapter><section><section><title>
+#: resources.dbk:1585
+msgid "Gandi.net Hosting Discount"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:1587
+msgid ""
+"As of November 2008, Gandi.net offers a discount rate on their VPS hosting "
+"for Debian Developers.  See <ulink "
+"url=\"http://&lists-host;/debian-devel-announce/2008/11/msg00004.html\"></ulink>."
+msgstr ""