update PO and POT files (no content change)

[developers-reference.git] / po4a / po / new-maintainer.pot

diff --git a/po4a/po/new-maintainer.pot b/po4a/po/new-maintainer.pot
index a48fcef2bb2eaf55915a35300cae9845f3061949..a383ca806f39bdf0bd2fd010661eddcf8175a80e 100644 (file)
--- a/po4a/po/new-maintainer.pot
+++ b/po4a/po/new-maintainer.pot
@@ -1,124 +1,126 @@
 # 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-06-26 16:13+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>
-#: new-maintainer.dbk:5
+#. type: Content of: <chapter><title>
+#: new-maintainer.dbk:7

 msgid "Applying to Become a Maintainer"
 msgstr ""
 
 msgid "Applying to Become a Maintainer"
 msgstr ""
 

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

 msgid "Getting started"
 msgstr ""
 
 msgid "Getting started"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: new-maintainer.dbk:9
+#. type: Content of: <chapter><section><para>
+#: new-maintainer.dbk:11

 msgid ""
 "So, you've read all the documentation, you've gone through the <ulink "
 msgid ""
 "So, you've read all the documentation, you've gone through the <ulink "

-"url=\"http://www.debian.org/doc/maint-guide/\">Debian New Maintainers' "
-"Guide</ulink>, understand what everything in the <systemitem "
+"url=\"&url-newmaint-guide;\">Debian New Maintainers' Guide</ulink>, "
+"understand what everything in the <systemitem "

 "role=\"package\">hello</systemitem> example package is for, and you're about "
 "to Debianize your favorite piece of software.  How do you actually become a "
 "Debian developer so that your work can be incorporated into the Project?"
 msgstr ""
 
 "role=\"package\">hello</systemitem> example package is for, and you're about "
 "to Debianize your favorite piece of software.  How do you actually become a "
 "Debian developer so that your work can be incorporated into the Project?"
 msgstr ""
 

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

 msgid ""
 msgid ""

-"Firstly, subscribe to <email>debian-devel@lists.debian.org</email> if you "
-"haven't already.  Send the word <literal>subscribe</literal> in the "
-"<emphasis>Subject</emphasis> of an email to "
-"<email>debian-devel-REQUEST@lists.debian.org</email>.  In case of problems, "
-"contact the list administrator at "
-"<email>listmaster@lists.debian.org</email>.  More information on available "
-"mailing lists can be found in <xref linkend=\"mailing-lists\"/> .  "
-"<email>debian-devel-announce@lists.debian.org</email> is another list which "
-"is mandatory for anyone who wishes to follow Debian's development."
+"Firstly, subscribe to &email-debian-devel; if you haven't already.  Send the "
+"word <literal>subscribe</literal> in the <literal>Subject</literal> of an "
+"email to &email-debian-devel-req;.  In case of problems, contact the list "
+"administrator at &email-listmaster;.  More information on available mailing "
+"lists can be found in <xref linkend=\"mailing-lists\"/>.  "
+"&email-debian-devel-announce; is another list which is mandatory for anyone "
+"who wishes to follow Debian's development."

 msgstr ""
 
 msgstr ""
 

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

 msgid ""
 "You should subscribe and lurk (that is, read without posting) for a bit "
 "before doing any coding, and you should post about your intentions to work "
 "on something to avoid duplicated effort."
 msgstr ""
 
 msgid ""
 "You should subscribe and lurk (that is, read without posting) for a bit "
 "before doing any coding, and you should post about your intentions to work "
 "on something to avoid duplicated effort."
 msgstr ""
 

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

 msgid ""
 msgid ""

-"Another good list to subscribe to is "
-"<email>debian-mentors@lists.debian.org</email>.  See <xref "
+"Another good list to subscribe to is &email-debian-mentors;.  See <xref "

 "linkend=\"mentors\"/> for details.  The IRC channel "
 "<literal>#debian</literal> can also be helpful; see <xref "
 "linkend=\"mentors\"/> for details.  The IRC channel "
 "<literal>#debian</literal> can also be helpful; see <xref "

-"linkend=\"irc-channels\"/> ."
+"linkend=\"irc-channels\"/>."

 msgstr ""
 
 msgstr ""
 

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

 msgid ""
 msgid ""

-"When you know how you want to contribute to Debian GNU/Linux, you should get "
+"When you know how you want to contribute to &debian-formal;, you should get "

 "in contact with existing Debian maintainers who are working on similar "
 "tasks.  That way, you can learn from experienced developers.  For example, "
 "if you are interested in packaging existing software for Debian, you should "
 "try to get a sponsor.  A sponsor will work together with you on your package "
 "and upload it to the Debian archive once they are happy with the packaging "
 "work you have done.  You can find a sponsor by mailing the "
 "in contact with existing Debian maintainers who are working on similar "
 "tasks.  That way, you can learn from experienced developers.  For example, "
 "if you are interested in packaging existing software for Debian, you should "
 "try to get a sponsor.  A sponsor will work together with you on your package "
 "and upload it to the Debian archive once they are happy with the packaging "
 "work you have done.  You can find a sponsor by mailing the "

-"<email>debian-mentors@lists.debian.org</email> mailing list, describing your "
-"package and yourself and asking for a sponsor (see <xref "
-"linkend=\"sponsoring\"/> and <ulink "
-"url=\"http://people.debian.org/~mpalmer/debian-mentors_FAQ.html\"></ulink> "
-"for more information on sponsoring).  On the other hand, if you are "
-"interested in porting Debian to alternative architectures or kernels you can "
-"subscribe to port specific mailing lists and ask there how to get started.  "
-"Finally, if you are interested in documentation or Quality Assurance (QA) "
-"work you can join maintainers already working on these tasks and submit "
-"patches and improvements."
+"&email-debian-mentors; mailing list, describing your package and yourself "
+"and asking for a sponsor (see <xref linkend=\"sponsoring\"/> and <ulink "
+"url=\"&url-mentors;\"></ulink> for more information on sponsoring).  On the "
+"other hand, if you are interested in porting Debian to alternative "
+"architectures or kernels you can subscribe to port specific mailing lists "
+"and ask there how to get started.  Finally, if you are interested in "
+"documentation or Quality Assurance (QA) work you can join maintainers "
+"already working on these tasks and submit patches and improvements."

 msgstr ""
 
 msgstr ""
 

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

 #: new-maintainer.dbk:57
 msgid ""
 "One pitfall could be a too-generic local part in your mailadress: Terms like "
 "mail, admin, root, master should be avoided, please see <ulink "
 #: new-maintainer.dbk:57
 msgid ""
 "One pitfall could be a too-generic local part in your mailadress: Terms like "
 "mail, admin, root, master should be avoided, please see <ulink "

-"url=\"http://www.debian.org/MailingLists/\"></ulink> for details."
+"url=\"&url-debian-lists;\"></ulink> for details."

 msgstr ""
 
 msgstr ""
 

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

 #: new-maintainer.dbk:64
 msgid "Debian mentors and sponsors"
 msgstr ""
 
 #: new-maintainer.dbk:64
 msgid "Debian mentors and sponsors"
 msgstr ""
 

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

 #: new-maintainer.dbk:66
 msgid ""
 #: new-maintainer.dbk:66
 msgid ""

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

 msgstr ""
 
 msgstr ""
 

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

 #: new-maintainer.dbk:72
 msgid ""
 "Those who prefer one-on-one help (e.g., via private email) should also post "
 "to that list and an experienced developer will volunteer to help."
 msgstr ""
 
 #: new-maintainer.dbk:72
 msgid ""
 "Those who prefer one-on-one help (e.g., via private email) should also post "
 "to that list and an experienced developer will volunteer to help."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
+#.  FIXME - out of order
+#. Those who are seeking a
+#. sponsor can request one at <ulink url="http://www.internatif.org/bortzmeyer/debian/sponsor/">
+#. </ulink>.
+#
+#. type: Content of: <chapter><section><para>

 #: new-maintainer.dbk:76
 msgid ""
 "In addition, if you have some packages ready for inclusion in Debian, but "
 #: new-maintainer.dbk:76
 msgid ""
 "In addition, if you have some packages ready for inclusion in Debian, but "


@@ -126,53 +128,50 @@ msgid ""
 "able find a sponsor to upload your package for you.  Sponsors are people who "
 "are official Debian Developers, and who are willing to criticize and upload "
 "your packages for you.  Please read the unofficial debian-mentors FAQ at "
 "able find a sponsor to upload your package for you.  Sponsors are people who "
 "are official Debian Developers, and who are willing to criticize and upload "
 "your packages for you.  Please read the unofficial debian-mentors FAQ at "

-"<ulink "
-"url=\"http://people.debian.org/~mpalmer/debian-mentors_FAQ.html\"></ulink> "
-"first."
+"<ulink url=\"&url-mentors;\"></ulink> first."

 msgstr ""
 
 msgstr ""
 

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

 msgid ""
 "If you wish to be a mentor and/or sponsor, more information is available in "
 msgid ""
 "If you wish to be a mentor and/or sponsor, more information is available in "

-"<xref linkend=\"newmaint\"/> ."
+"<xref linkend=\"newmaint\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: new-maintainer.dbk:90
+#. type: Content of: <chapter><section><title>
+#: new-maintainer.dbk:95

 msgid "Registering as a Debian developer"
 msgstr ""
 
 msgid "Registering as a Debian developer"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: new-maintainer.dbk:92
+#. type: Content of: <chapter><section><para>
+#: new-maintainer.dbk:97

 msgid ""
 msgid ""

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

 msgstr ""
 
 msgstr ""
 

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

 msgid ""
 "The process of registering as a developer is a process of verifying your "
 "identity and intentions, and checking your technical skills.  As the number "
 msgid ""
 "The process of registering as a developer is a process of verifying your "
 "identity and intentions, and checking your technical skills.  As the number "

-"of people working on Debian GNU/Linux has grown to over 900 and our systems "
-"are used in several very important places, we have to be careful about being "
-"compromised.  Therefore, we need to verify new maintainers before we can "
-"give them accounts on our servers and let them upload packages."
+"of people working on &debian-formal; has grown to over "
+"&number-of-maintainers; and our systems are used in several very important "
+"places, we have to be careful about being compromised.  Therefore, we need "
+"to verify new maintainers before we can give them accounts on our servers "
+"and let them upload packages."

 msgstr ""
 
 msgstr ""
 

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

 msgid ""
 "Before you actually register you should have shown that you can do competent "
 "work and will be a good contributor.  You show this by submitting patches "
 msgid ""
 "Before you actually register you should have shown that you can do competent "
 "work and will be a good contributor.  You show this by submitting patches "


@@ -183,24 +182,23 @@ msgid ""
 "information on a bug or even a patch, then do so!"
 msgstr ""
 
 "information on a bug or even a patch, then do so!"
 msgstr ""
 

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

 msgid ""
 "Registration requires that you are familiar with Debian's philosophy and "
 "technical documentation.  Furthermore, you need a GnuPG key which has been "
 "signed by an existing Debian maintainer.  If your GnuPG key is not signed "
 "yet, you should try to meet a Debian Developer in person to get your key "
 msgid ""
 "Registration requires that you are familiar with Debian's philosophy and "
 "technical documentation.  Furthermore, you need a GnuPG key which has been "
 "signed by an existing Debian maintainer.  If your GnuPG key is not signed "
 "yet, you should try to meet a Debian Developer in person to get your key "

-"signed.  There's a <ulink url=\"http://nm.debian.org/gpg.php\">GnuPG Key "
-"Signing Coordination page</ulink> which should help you find a Debian "
-"Developer close to you.  (If there is no Debian Developer close to you, "
-"alternative ways to pass the ID check may be permitted as an absolute "
-"exception on a case-by-case-basis.  See the <ulink "
-"url=\"http://www.debian.org/devel/join/nm-step2\">identification "
+"signed.  There's a <ulink url=\"&url-gpg-coord;\">GnuPG Key Signing "
+"Coordination page</ulink> which should help you find a Debian Developer "
+"close to you.  (If there is no Debian Developer close to you, alternative "
+"ways to pass the ID check may be permitted as an absolute exception on a "
+"case-by-case-basis.  See the <ulink url=\"&url-newmaint-id;\">identification "

 "page</ulink> for more information.)"
 msgstr ""
 
 "page</ulink> for more information.)"
 msgstr ""
 

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

 msgid ""
 "If you do not have an OpenPGP key yet, generate one.  Every developer needs "
 "an OpenPGP key in order to sign and verify package uploads.  You should read "
 msgid ""
 "If you do not have an OpenPGP key yet, generate one.  Every developer needs "
 "an OpenPGP key in order to sign and verify package uploads.  You should read "


@@ -211,26 +209,18 @@ msgid ""
 "maintaining your public key."
 msgstr ""
 
 "maintaining your public key."
 msgstr ""
 

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

 msgid ""
 msgid ""

-"Debian uses the <command>GNU Privacy Guard</command> (package <systemitem "
+"Debian uses the <literal>GNU Privacy Guard</literal> (package <systemitem "

 "role=\"package\">gnupg</systemitem> version 1 or better) as its baseline "
 "standard.  You can use some other implementation of OpenPGP as well.  Note "
 "role=\"package\">gnupg</systemitem> version 1 or better) as its baseline "
 "standard.  You can use some other implementation of OpenPGP as well.  Note "

-"that OpenPGP is an open standard based on <ulink "
-"url=\"http://www.rfc-editor.org/rfc/rfc2440.txt\">RFC 2440</ulink>."
-msgstr ""
-
-# type: Content of: <chapter><section><para><footnote>
-#: new-maintainer.dbk:150
-msgid ""
-"You need a version 4 key for use in Debian Development.  Your key length "
-"must be at least 1024 bits; there is no reason to use a smaller key, and "
-"doing so would be much less secure.  <footnote>"
+"that OpenPGP is an open standard based on <ulink url=\"&url-rfc2440;\">RFC "
+"2440</ulink>."

 msgstr ""
 
 msgstr ""
 

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

 msgid ""
 "Version 4 keys are keys conforming to the OpenPGP standard as defined in RFC "
 "2440.  Version 4 is the key type that has always been created when using "
 msgid ""
 "Version 4 keys are keys conforming to the OpenPGP standard as defined in RFC "
 "2440.  Version 4 is the key type that has always been created when using "


@@ -238,8 +228,8 @@ msgid ""
 "having beein pgp 2.6.x compatible v3 keys (also called legacy RSA by PGP)."
 msgstr ""
 
 "having beein pgp 2.6.x compatible v3 keys (also called legacy RSA by PGP)."
 msgstr ""
 

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

 msgid ""
 "Version 4 (primary) keys can either use the RSA or the DSA algorithms, so "
 "this has nothing to do with GnuPG's question about which kind of key do you "
 msgid ""
 "Version 4 (primary) keys can either use the RSA or the DSA algorithms, so "
 "this has nothing to do with GnuPG's question about which kind of key do you "


@@ -247,12 +237,12 @@ msgid ""
 "you don't have any special requirements just pick the default."
 msgstr ""
 
 "you don't have any special requirements just pick the default."
 msgstr ""
 

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

 msgid ""
 "The easiest way to tell whether an existing key is a v4 key or a v3 (or v2) "
 "key is to look at the fingerprint: Fingerprints of version 4 keys are the "
 msgid ""
 "The easiest way to tell whether an existing key is a v4 key or a v3 (or v2) "
 "key is to look at the fingerprint: Fingerprints of version 4 keys are the "

-"SHA-1 hash of some key matieral, so they are 40 hex digits, usually grouped "
+"SHA-1 hash of some key material, so they are 40 hex digits, usually grouped "

 "in blocks of 4.  Fingerprints of older key format versions used MD5 and are "
 "generally shown in blocks of 2 hex digits.  For example if your fingerprint "
 "looks like "
 "in blocks of 4.  Fingerprints of older key format versions used MD5 and are "
 "generally shown in blocks of 2 hex digits.  For example if your fingerprint "
 "looks like "


@@ -260,15 +250,15 @@ msgid ""
 "it's a v4 key."
 msgstr ""
 
 "it's a v4 key."
 msgstr ""
 

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

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

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

 msgid ""
 "Also note that your key must be self-signed (i.e.  it has to sign all its "
 "own user IDs; this prevents user ID tampering).  All modern OpenPGP software "
 msgid ""
 "Also note that your key must be self-signed (i.e.  it has to sign all its "
 "own user IDs; this prevents user ID tampering).  All modern OpenPGP software "


@@ -276,19 +266,27 @@ msgid ""
 "manually add those signatures."
 msgstr ""
 
 "manually add those signatures."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: new-maintainer.dbk:175
+#. type: Content of: <chapter><section><para>
+#: new-maintainer.dbk:157
+msgid ""
+"You need a version 4 key for use in Debian Development.  Your key length "
+"must be at least 1024 bits; there is no reason to use a smaller key, and "
+"doing so would be much less secure.<placeholder type=\"footnote\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <chapter><section><para>
+#: new-maintainer.dbk:182

 msgid ""
 msgid ""

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

 msgstr ""
 
 msgstr ""
 

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

 msgid ""
 "Some countries restrict the use of cryptographic software by their "
 "citizens.  This need not impede one's activities as a Debian package "
 msgid ""
 "Some countries restrict the use of cryptographic software by their "
 "citizens.  This need not impede one's activities as a Debian package "


@@ -298,36 +296,36 @@ msgid ""
 "then please contact us so we can make special arrangements."
 msgstr ""
 
 "then please contact us so we can make special arrangements."
 msgstr ""
 

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

 msgid ""
 "To apply as a new maintainer, you need an existing Debian Developer to "
 msgid ""
 "To apply as a new maintainer, you need an existing Debian Developer to "

-"support your application (an <emphasis>advocate</emphasis>).  After you have "
+"support your application (an <literal>advocate</literal>).  After you have "

 "contributed to Debian for a while, and you want to apply to become a "
 "registered developer, an existing developer with whom you have worked over "
 "the past months has to express their belief that you can contribute to "
 "Debian successfully."
 msgstr ""
 
 "contributed to Debian for a while, and you want to apply to become a "
 "registered developer, an existing developer with whom you have worked over "
 "the past months has to express their belief that you can contribute to "
 "Debian successfully."
 msgstr ""
 

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

 msgid ""
 "When you have found an advocate, have your GnuPG key signed and have already "
 "contributed to Debian for a while, you're ready to apply.  You can simply "
 msgid ""
 "When you have found an advocate, have your GnuPG key signed and have already "
 "contributed to Debian for a while, you're ready to apply.  You can simply "

-"register on our <ulink url=\"http://nm.debian.org/newnm.php\">application "
+"register on our <ulink url=\"&url-newmaint-apply;\">application "

 "page</ulink>.  After you have signed up, your advocate has to confirm your "
 "application.  When your advocate has completed this step you will be "
 "assigned an Application Manager who will go with you through the necessary "
 "steps of the New Maintainer process.  You can always check your status on "
 "page</ulink>.  After you have signed up, your advocate has to confirm your "
 "application.  When your advocate has completed this step you will be "
 "assigned an Application Manager who will go with you through the necessary "
 "steps of the New Maintainer process.  You can always check your status on "

-"the <ulink url=\"http://nm.debian.org/\">applications status board</ulink>."
+"the <ulink url=\"&url-newmaint-db;\">applications status board</ulink>."

 msgstr ""
 
 msgstr ""
 

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

 msgid ""
 msgid ""

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

 msgstr ""
 msgstr ""