- update Japanese translation (not yet complete, step by step...)

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

diff --git a/po4a/ja/best-pkging-practices.po b/po4a/ja/best-pkging-practices.po
index 67a976229361021d8c6af42244e7f5ffe2fb264b..b23ab8a9bd6db9b588b192adf78164a6b1e01192 100644 (file)
--- a/po4a/ja/best-pkging-practices.po
+++ b/po4a/ja/best-pkging-practices.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.3.9\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.3.9\n"

-"POT-Creation-Date: 2008-03-05 18:02+0900\n"
+"POT-Creation-Date: 2008-06-14 14:14+0900\n"

 "PO-Revision-Date: 2008-03-05 18:30+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
 "PO-Revision-Date: 2008-03-05 18:30+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"


@@ -67,13 +67,13 @@ msgid ""
 "The rationale for using helper scripts in <filename>debian/rules</filename> "
 "is that they let maintainers use and share common logic among many "
 "packages.  Take for instance the question of installing menu entries: you "
 "The rationale for using helper scripts in <filename>debian/rules</filename> "
 "is that they let maintainers use and share common logic among many "
 "packages.  Take for instance the question of installing menu entries: you "

-"need to put the file into <filename>/usr/lib/menu</filename> (or <filename>/"
-"usr/lib/menu</filename> for executable binary menufiles, if this is needed), "
-"and add commands to the maintainer scripts to register and unregister the "
-"menu entries.  Since this is a very common thing for packages to do, why "
-"should each maintainer rewrite all this on their own, sometimes with bugs? "
-"Also, supposing the menu directory changed, every package would have to be "
-"changed."
+"need to put the file into <filename>/usr/share/menu</filename> (or "
+"<filename>/usr/lib/menu</filename> for executable binary menufiles, if this "
+"is needed), and add commands to the maintainer scripts to register and "
+"unregister the menu entries.  Since this is a very common thing for packages "
+"to do, why should each maintainer rewrite all this on their own, sometimes "
+"with bugs? Also, supposing the menu directory changed, every package would "
+"have to be changed."

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


@@ -468,9 +468,9 @@ msgstr ""
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #: best-pkging-practices.dbk:312
 msgid ""
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #: best-pkging-practices.dbk:312
 msgid ""

-"If the package is experimental, or there are other reasons it should not be "
-"used, if there are other packages that should be used instead, it should be "
-"here as well."
+"If the package is <literal>experimental</literal>, or there are other "
+"reasons it should not be used, if there are other packages that should be "
+"used instead, it should be here as well."

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


@@ -829,28 +829,30 @@ msgstr ""
 # type: Content of: <chapter><section><section><para>
 #: best-pkging-practices.dbk:551
 msgid ""
 # type: Content of: <chapter><section><section><para>
 #: best-pkging-practices.dbk:551
 msgid ""

-"Important news about changes in a package can also be put in NEWS.Debian "
-"files.  The news will be displayed by tools like apt-listchanges, before all "
-"the rest of the changelogs.  This is the preferred means to let the user "
-"know about significant changes in a package.  It is better than using "
-"debconf notes since it is less annoying and the user can go back and refer "
-"to the NEWS.Debian file after the install.  And it's better than listing "
-"major changes in README.Debian, since the user can easily miss such notes."
+"Important news about changes in a package can also be put in <filename> NEWS."
+"Debian</filename> files.  The news will be displayed by tools like apt-"
+"listchanges, before all the rest of the changelogs.  This is the preferred "
+"means to let the user know about significant changes in a package.  It is "
+"better than using debconf notes since it is less annoying and the user can "
+"go back and refer to the <filename> NEWS.Debian</filename> file after the "
+"install.  And it's better than listing major changes in <filename>README."
+"Debian</filename>, since the user can easily miss such notes."

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

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

 msgid ""
 "The file format is the same as a debian changelog file, but leave off the "
 "asterisks and describe each news item with a full paragraph when necessary "
 "rather than the more concise summaries that would go in a changelog.  It's a "
 msgid ""
 "The file format is the same as a debian changelog file, but leave off the "
 "asterisks and describe each news item with a full paragraph when necessary "
 "rather than the more concise summaries that would go in a changelog.  It's a "

-"good idea to run your file through dpkg-parsechangelog to check its "
-"formatting as it will not be automatically checked during build as the "
-"changelog is.  Here is an example of a real NEWS.Debian file:"
+"good idea to run your file through <literal>dpkg-parsechangelog</literal> to "
+"check its formatting as it will not be automatically checked during build as "
+"the changelog is.  Here is an example of a real <filename>NEWS.Debian </"
+"filename> file:"

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

-#: best-pkging-practices.dbk:567
+#: best-pkging-practices.dbk:570

 #, no-wrap
 msgid ""
 "\n"
 #, no-wrap
 msgid ""
 "\n"


@@ -865,30 +867,32 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:578
+#: best-pkging-practices.dbk:581

 msgid ""
 msgid ""

-"The NEWS.Debian file is installed as /usr/share/doc/&lt;package&gt;/NEWS."
-"Debian.gz.  It is compressed, and always has that name even in Debian native "
-"packages.  If you use debhelper, dh_installchangelogs will install debian/"
-"NEWS files for you."
+"The <filename>NEWS.Debian</filename> file is installed as <filename> /usr/"
+"share/doc/<replaceable>package</replaceable>/NEWS.Debian.gz</filename>.  It "
+"is compressed, and always has that name even in Debian native packages.  If "
+"you use <literal>debhelper</literal>, <literal>dh_installchangelogs </"
+"literal> will install <filename>debian/NEWS</filename> files for you."

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

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

 msgid ""
 msgid ""

-"Unlike changelog files, you need not update NEWS.Debian files with every "
-"release.  Only update them if you have something particularly newsworthy "
-"that user should know about.  If you have no news at all, there's no need to "
-"ship a NEWS.Debian file in your package.  No news is good news!"
+"Unlike changelog files, you need not update <filename>NEWS.Debian</filename> "
+"files with every release.  Only update them if you have something "
+"particularly newsworthy that user should know about.  If you have no news at "
+"all, there's no need to ship a <filename>NEWS.Debian</filename> file in your "
+"package.  No news is good news!"

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

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

 msgid "Best practices for maintainer scripts"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "Best practices for maintainer scripts"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:607
+#: best-pkging-practices.dbk:612

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


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

-#: best-pkging-practices.dbk:615
+#: best-pkging-practices.dbk:620

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


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

-#: best-pkging-practices.dbk:620
+#: best-pkging-practices.dbk:625

 msgid ""
 "Standard input and output may be redirected (e.g.  into pipes) for logging "
 "purposes, so don't rely on them being a tty."
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid ""
 "Standard input and output may be redirected (e.g.  into pipes) for logging "
 "purposes, so don't rely on them being a tty."
 msgstr ""
 
 # type: Content of: <chapter><section><para>

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

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


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

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

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


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

-#: best-pkging-practices.dbk:638
+#: best-pkging-practices.dbk:643

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


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

-#: best-pkging-practices.dbk:644
+#: best-pkging-practices.dbk:649

 msgid ""
 "If you need to check for the existence of a command, you should use "
 "something like"
 msgstr ""
 
 # type: Content of: <chapter><section><programlisting>
 msgid ""
 "If you need to check for the existence of a command, you should use "
 "something like"
 msgstr ""
 
 # type: Content of: <chapter><section><programlisting>

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

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

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

 msgid ""
 "If you don't wish to hard-code the path of a command in your maintainer "
 "script, the following POSIX-compliant shell function may help:"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid ""
 "If you don't wish to hard-code the path of a command in your maintainer "
 "script, the following POSIX-compliant shell function may help:"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

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

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


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

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

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


@@ -984,14 +988,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

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

 msgid ""
 "Configuration management with <systemitem role=\"package\">debconf</"
 "systemitem>"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid ""
 "Configuration management with <systemitem role=\"package\">debconf</"
 "systemitem>"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: best-pkging-practices.dbk:673
+#: best-pkging-practices.dbk:678

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


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

-#: best-pkging-practices.dbk:681
+#: best-pkging-practices.dbk:686

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


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

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

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


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

-#: best-pkging-practices.dbk:694
+#: best-pkging-practices.dbk:699

 msgid "Do not abuse debconf"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Do not abuse debconf"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:696
+#: best-pkging-practices.dbk:701

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


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

-#: best-pkging-practices.dbk:702
+#: best-pkging-practices.dbk:707

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


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

-#: best-pkging-practices.dbk:708
+#: best-pkging-practices.dbk:713

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


@@ -1053,38 +1057,38 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

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

 msgid "General recommendations for authors and translators"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgid "General recommendations for authors and translators"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

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

 msgid "Write correct English"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Write correct English"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:720
+#: best-pkging-practices.dbk:725

 msgid ""
 "Most Debian package maintainers are not native English speakers.  So, "
 "writing properly phrased templates may not be easy for them."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid ""
 "Most Debian package maintainers are not native English speakers.  So, "
 "writing properly phrased templates may not be easy for them."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

 msgid ""
 "Please use (and abuse) &email-debian-l10n-english; mailing list.  Have your "
 "templates proofread."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid ""
 "Please use (and abuse) &email-debian-l10n-english; mailing list.  Have your "
 "templates proofread."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:728
+#: best-pkging-practices.dbk:733

 msgid ""
 "Badly written templates give a poor image of your package, of your work...or "
 "even of Debian itself."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid ""
 "Badly written templates give a poor image of your package, of your work...or "
 "even of Debian itself."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

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


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

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

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

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

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


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

-#: best-pkging-practices.dbk:747
+#: best-pkging-practices.dbk:752

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

-"(man po-debconf is a good start)."
+"(<literal>man po-debconf</literal> is a good start)."

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

-#: best-pkging-practices.dbk:752
+#: best-pkging-practices.dbk:757

 msgid ""
 "Avoid changing templates too often.  Changing templates text induces more "
 "work to translators which will get their translation fuzzied.  If you plan "
 msgid ""
 "Avoid changing templates too often.  Changing templates text induces more "
 "work to translators which will get their translation fuzzied.  If you plan "


@@ -1126,22 +1130,23 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:761
+#: best-pkging-practices.dbk:766

 msgid ""
 msgid ""

-"The use of the <command>podebconf-report-po</command> from the po-debconf "
-"package is highly recommended to warn translators which have incomplete "
-"translations and request them for updates."
+"The use of the <command>podebconf-report-po</command> from the <systemitem "
+"role=\"package\">po-debconf</systemitem> package is highly recommended to "
+"warn translators which have incomplete translations and request them for "
+"updates."

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

-#: best-pkging-practices.dbk:766
+#: best-pkging-practices.dbk:771

 msgid ""
 "If in doubt, you may also contact the translation team for a given language "
 "(debian-l10n-xxxxx@&lists-host;), or the &email-debian-i18n; mailing list."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid ""
 "If in doubt, you may also contact the translation team for a given language "
 "(debian-l10n-xxxxx@&lists-host;), or the &email-debian-i18n; mailing list."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

 msgid ""
 "Calls for translations posted to &email-debian-i18n; with the "
 "<filename>debian/po/templates.pot</filename> file attached or referenced in "
 msgid ""
 "Calls for translations posted to &email-debian-i18n; with the "
 "<filename>debian/po/templates.pot</filename> file attached or referenced in "


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

-#: best-pkging-practices.dbk:780
+#: best-pkging-practices.dbk:785

 msgid "Unfuzzy complete translations when correcting typos and spelling"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Unfuzzy complete translations when correcting typos and spelling"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

 msgid ""
 "When the text of a debconf template is corrected and you are <emphasis role="
 "\"strong\">sure</emphasis> that the change does <emphasis role=\"strong"
 msgid ""
 "When the text of a debconf template is corrected and you are <emphasis role="
 "\"strong\">sure</emphasis> that the change does <emphasis role=\"strong"


@@ -1165,21 +1170,21 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

 msgid ""
 "If you don't do so, the whole template will not be translated as long as a "
 "translator will send you an update."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid ""
 "If you don't do so, the whole template will not be translated as long as a "
 "translator will send you an update."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

 msgid ""
 msgid ""

-"To <emphasis role=\"strong\">unfuzzy</emphasis> translations, you can "
-"proceed the following way:"
+"To <literal>unfuzzy</literal> translations, you can proceed the following "
+"way:"

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

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

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


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

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

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


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

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

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


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

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

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


@@ -1211,41 +1216,41 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

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

 msgid ""
 "run <command>debconf-updatepo</command>.  This will fuzzy all strings you "
 "modified in translations.  You can see this by running the above again"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgid ""
 "run <command>debconf-updatepo</command>.  This will fuzzy all strings you "
 "modified in translations.  You can see this by running the above again"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

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

 msgid "use the following command:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>
 msgid "use the following command:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><programlisting>

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

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

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

 msgid ""
 "move back to debian/po the files which showed fuzzy strings in the first step"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgid ""
 "move back to debian/po the files which showed fuzzy strings in the first step"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

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

 msgid "run <command>debconf-updatepo</command> again"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgid "run <command>debconf-updatepo</command> again"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

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

 msgid "Do not make assumptions about interfaces"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Do not make assumptions about interfaces"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

 msgid ""
 "Templates text should not make reference to widgets belonging to some "
 "debconf interfaces.  Sentences like If you answer Yes...  have no meaning "
 msgid ""
 "Templates text should not make reference to widgets belonging to some "
 "debconf interfaces.  Sentences like If you answer Yes...  have no meaning "


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

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

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


@@ -1262,19 +1267,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

 msgid ""
 "More generally speaking, try to avoid referring to user actions.  Just give "
 "facts."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgid ""
 "More generally speaking, try to avoid referring to user actions.  Just give "
 "facts."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:864
+#: best-pkging-practices.dbk:869

 msgid "Do not use first person"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Do not use first person"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

 msgid ""
 "You should avoid the use of first person (I will do this...  or We "
 "recommend...).  The computer is not a person and the Debconf templates do "
 msgid ""
 "You should avoid the use of first person (I will do this...  or We "
 "recommend...).  The computer is not a person and the Debconf templates do "


@@ -1286,24 +1291,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:876
+#: best-pkging-practices.dbk:881

 msgid "Be gender neutral"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Be gender neutral"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:878
+#: best-pkging-practices.dbk:883

 msgid ""
 "The world is made of men and women.  Please use gender-neutral constructions "
 "in your writing."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "The world is made of men and women.  Please use gender-neutral constructions "
 "in your writing."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:886
+#: best-pkging-practices.dbk:891

 msgid "Templates fields definition"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Templates fields definition"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

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


@@ -1311,28 +1316,28 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

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

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

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

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

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

 msgid ""
 "Results in a free-form input field that the user can type any string into."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 msgid ""
 "Results in a free-form input field that the user can type any string into."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>

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

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

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

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


@@ -1340,24 +1345,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>

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

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

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

 msgid ""
 "A true/false choice.  Remember: true/false, <emphasis role=\"strong\">not "
 "yes/no</emphasis>..."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 msgid ""
 "A true/false choice.  Remember: true/false, <emphasis role=\"strong\">not "
 "yes/no</emphasis>..."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:919
+#: best-pkging-practices.dbk:924

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

-#: best-pkging-practices.dbk:921
+#: best-pkging-practices.dbk:926

 msgid ""
 "A choice between one of a number of values.  The choices must be specified "
 "in a field named 'Choices'.  Separate the possible values with commas and "
 msgid ""
 "A choice between one of a number of values.  The choices must be specified "
 "in a field named 'Choices'.  Separate the possible values with commas and "


@@ -1365,24 +1370,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:928
+#: best-pkging-practices.dbk:933

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

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

 msgid ""
 "Like the select data type, except the user can choose any number of items "
 "from the choices list (or chose none of them)."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 msgid ""
 "Like the select data type, except the user can choose any number of items "
 "from the choices list (or chose none of them)."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>

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

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

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

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


@@ -1392,22 +1397,22 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>

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

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

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

 msgid "This type is now considered obsolete: don't use it."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 msgid "This type is now considered obsolete: don't use it."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>

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

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

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

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


@@ -1415,26 +1420,26 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><para>

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

 msgid ""
 "It is recommended to use this type for any message that needs user attention "
 "for a correction of any kind."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgid ""
 "It is recommended to use this type for any message that needs user attention "
 "for a correction of any kind."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:969
+#: best-pkging-practices.dbk:974

 msgid "Description: short and extended description"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Description: short and extended description"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:971
+#: best-pkging-practices.dbk:976

 msgid ""
 "Template descriptions have two parts: short and extended.  The short "
 "description is in the Description: line of the template."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid ""
 "Template descriptions have two parts: short and extended.  The short "
 "description is in the Description: line of the template."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

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


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

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

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


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

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

 msgid ""
 "The short description does not necessarily have to be a full sentence.  This "
 "is part of the keep it short and efficient recommendation."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid ""
 "The short description does not necessarily have to be a full sentence.  This "
 "is part of the keep it short and efficient recommendation."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

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


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

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

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


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

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

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


@@ -1486,26 +1491,26 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1009
+#: best-pkging-practices.dbk:1014

 msgid ""
 "The extended description should <emphasis role=\"strong\">never</emphasis> "
 "include a question."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid ""
 "The extended description should <emphasis role=\"strong\">never</emphasis> "
 "include a question."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

 msgid ""
 "For specific rules depending on templates type (string, boolean, etc.), "
 "please read below."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgid ""
 "For specific rules depending on templates type (string, boolean, etc.), "
 "please read below."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

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

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

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

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


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

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

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

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

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


@@ -1526,41 +1531,41 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1039
+#: best-pkging-practices.dbk:1044

 msgid "Templates fields specific style guide"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgid "Templates fields specific style guide"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

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

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

-#: best-pkging-practices.dbk:1043
+#: best-pkging-practices.dbk:1048

 msgid ""
 "No specific indication except: use the appropriate type by referring to the "
 "previous section."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgid ""
 "No specific indication except: use the appropriate type by referring to the "
 "previous section."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: best-pkging-practices.dbk:1049
+#: best-pkging-practices.dbk:1054

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

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

 msgid ""
 "Below are specific instructions for properly writing the Description (short "
 "and extended) depending on the template type."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 msgid ""
 "Below are specific instructions for properly writing the Description (short "
 "and extended) depending on the template type."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1055
+#: best-pkging-practices.dbk:1060

 msgid "String/password templates"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 msgid "String/password templates"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

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

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


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

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

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


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

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

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

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

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


@@ -1591,19 +1596,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

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

 msgid ""
 "Again, please avoid referring to specific interface widgets.  A common "
 "mistake for such templates is if you answer Yes-type constructions."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 msgid ""
 "Again, please avoid referring to specific interface widgets.  A common "
 "mistake for such templates is if you answer Yes-type constructions."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1096
+#: best-pkging-practices.dbk:1101

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

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

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


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

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

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


@@ -1621,24 +1626,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><title>

-#: best-pkging-practices.dbk:1118
+#: best-pkging-practices.dbk:1123

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

-#: best-pkging-practices.dbk:1122
+#: best-pkging-practices.dbk:1127

 msgid "The short description should be considered to be a *title*."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 msgid "The short description should be considered to be a *title*."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1127
+#: best-pkging-practices.dbk:1132

 msgid ""
 "The extended description is what will be displayed as a more detailed "
 "explanation of the note.  Phrases, no terse writing style."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "The extended description is what will be displayed as a more detailed "
 "explanation of the note.  Phrases, no terse writing style."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1133
+#: best-pkging-practices.dbk:1138

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


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

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

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

-#: best-pkging-practices.dbk:1150
+#: best-pkging-practices.dbk:1155

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


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

-#: best-pkging-practices.dbk:1157 best-pkging-practices.dbk:1195
+#: best-pkging-practices.dbk:1162 best-pkging-practices.dbk:1200

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

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

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


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

-#: best-pkging-practices.dbk:1164
+#: best-pkging-practices.dbk:1169

 msgid ""
 "This special field allow translators to put the most appropriate choice "
 "according to their own language.  It will become the default choice when "
 msgid ""
 "This special field allow translators to put the most appropriate choice "
 "according to their own language.  It will become the default choice when "


@@ -1685,12 +1690,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1170
+#: best-pkging-practices.dbk:1175

 msgid "Example, taken from the geneweb package templates:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><screen>
 msgid "Example, taken from the geneweb package templates:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><screen>

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

 #, no-wrap
 msgid ""
 "\n"
 #, no-wrap
 msgid ""
 "\n"


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

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

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


@@ -1714,21 +1719,21 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

 msgid ""
 "The comments are needed as the DefaultChoice trick is a bit confusing: the "
 "translators may put their own choice"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid ""
 "The comments are needed as the DefaultChoice trick is a bit confusing: the "
 "translators may put their own choice"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

 msgid ""
 "Do NOT use empty default field.  If you don't want to use default values, do "
 "not use Default at all."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid ""
 "Do NOT use empty default field.  If you don't want to use default values, do "
 "not use Default at all."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1201
+#: best-pkging-practices.dbk:1206

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


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

-#: best-pkging-practices.dbk:1206
+#: best-pkging-practices.dbk:1211

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


@@ -1745,17 +1750,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

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

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

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

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

-#: best-pkging-practices.dbk:1222
+#: best-pkging-practices.dbk:1227

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


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

-#: best-pkging-practices.dbk:1228
+#: best-pkging-practices.dbk:1233

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


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

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

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


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

-#: best-pkging-practices.dbk:1254
+#: best-pkging-practices.dbk:1259

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

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

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


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

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

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


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

-#: best-pkging-practices.dbk:1275
+#: best-pkging-practices.dbk:1280

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


@@ -1832,17 +1837,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: best-pkging-practices.dbk:1285
+#: best-pkging-practices.dbk:1290

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

-#: best-pkging-practices.dbk:1296
+#: best-pkging-practices.dbk:1301

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

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

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


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

-#: best-pkging-practices.dbk:1310
+#: best-pkging-practices.dbk:1315

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

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

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


@@ -1869,26 +1874,26 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1318
+#: best-pkging-practices.dbk:1323

 msgid ""
 "Good practices for library packaging have been grouped in <ulink url=\"&url-"
 "libpkg-guide;\">the library packaging guide</ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "Good practices for library packaging have been grouped in <ulink url=\"&url-"
 "libpkg-guide;\">the library packaging guide</ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1325
+#: best-pkging-practices.dbk:1330

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

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

 msgid ""
 "Be sure to follow the <ulink url=\"&url-debian-policy;ch-docs.html\">Policy "
 "on documentation</ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "Be sure to follow the <ulink url=\"&url-debian-policy;ch-docs.html\">Policy "
 "on documentation</ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1332
+#: best-pkging-practices.dbk:1337

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


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

-#: best-pkging-practices.dbk:1337
+#: best-pkging-practices.dbk:1342

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


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

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

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


@@ -1914,19 +1919,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1352
+#: best-pkging-practices.dbk:1357

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

-#: best-pkging-practices.dbk:1354
+#: best-pkging-practices.dbk:1359

 msgid ""
 "Several specific types of packages have special sub-policies and "
 "corresponding packaging rules and practices:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "Several specific types of packages have special sub-policies and "
 "corresponding packaging rules and practices:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

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

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


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

-#: best-pkging-practices.dbk:1369
+#: best-pkging-practices.dbk:1374

 msgid ""
 "Python related packages have their python policy; see &file-python-policy; "
 "in the <systemitem role=\"package\">python</systemitem> package."
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "Python related packages have their python policy; see &file-python-policy; "
 "in the <systemitem role=\"package\">python</systemitem> package."
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

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

 msgid ""
 "Emacs related packages have the <ulink url=\"&url-emacs-policy;\">emacs "
 "policy</ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "Emacs related packages have the <ulink url=\"&url-emacs-policy;\">emacs "
 "policy</ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1383
+#: best-pkging-practices.dbk:1388

 msgid ""
 "Java related packages have their <ulink url=\"&url-java-policy;\">java "
 "policy</ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "Java related packages have their <ulink url=\"&url-java-policy;\">java "
 "policy</ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1390
+#: best-pkging-practices.dbk:1395

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


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

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

 msgid ""
 "Packages providing XML or SGML DTDs should conform to the recommendations "
 "found in the <systemitem role=\"package\">sgml-base-doc</systemitem> package."
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "Packages providing XML or SGML DTDs should conform to the recommendations "
 "found in the <systemitem role=\"package\">sgml-base-doc</systemitem> package."
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: best-pkging-practices.dbk:1404
+#: best-pkging-practices.dbk:1409

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


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

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

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

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

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


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

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

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


@@ -2003,25 +2008,24 @@ msgid ""
 "debs, one per each architecture.  While this adds some extra overhead into "
 "the <filename>Packages</filename> files, it saves a lot of disk space on "
 "Debian mirrors.  Separating out architecture-independent data also reduces "
 "debs, one per each architecture.  While this adds some extra overhead into "
 "the <filename>Packages</filename> files, it saves a lot of disk space on "
 "Debian mirrors.  Separating out architecture-independent data also reduces "

-"processing time of <command>lintian</command> or <command>linda</command> "
-"(see <xref linkend=\"tools-lint\"/> ) when run over the entire Debian "
-"archive."
+"processing time of <command>lintian</command> (see <xref linkend=\"tools-lint"
+"\"/> ) when run over the entire Debian archive."

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

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

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

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

 msgid ""
 "If you need a certain locale during build, you can create a temporary file "
 "via this trick:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "If you need a certain locale during build, you can create a temporary file "
 "via this trick:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: best-pkging-practices.dbk:1461
+#: best-pkging-practices.dbk:1466

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


@@ -2030,7 +2034,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

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

 #, no-wrap
 msgid ""
 "\n"
 #, no-wrap
 msgid ""
 "\n"


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

-#: best-pkging-practices.dbk:1479
+#: best-pkging-practices.dbk:1484

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

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

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


@@ -2061,16 +2065,16 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 msgid ""

-"For example, with --guess-dummy, deborphan tries to search all transitional "
-"packages which were needed for upgrade but which can now safely be removed.  "
-"For that, it looks for the string dummy or transitional in their short "
-"description."
+"For example, with <literal>--guess-dummy</literal>, <command>deborphan</"
+"command> tries to search all transitional packages which were needed for "
+"upgrade but which can now safely be removed.  For that, it looks for the "
+"string dummy or transitional in their short description."

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

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

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


@@ -2079,32 +2083,32 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: best-pkging-practices.dbk:1502
+#: best-pkging-practices.dbk:1508

 msgid "Best practices for <filename>orig.tar.gz</filename> files"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Best practices for <filename>orig.tar.gz</filename> files"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 "There are two kinds of original source tarballs: Pristine source and "
 "repackaged upstream source."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgid ""
 "There are two kinds of original source tarballs: Pristine source and "
 "repackaged upstream source."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

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

 msgid "Pristine source"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para><footnote>
 msgid "Pristine source"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para><footnote>

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

 msgid ""
 msgid ""

-"The defining characteristic of a pristine source tarball is that the .orig."
-"tar.gz file is byte-for-byte identical to a tarball officially distributed "
-"by the upstream author.  <footnote>"
+"The defining characteristic of a pristine source tarball is that the "
+"<literal>.orig.tar.gz</literal> file is byte-for-byte identical to a tarball "
+"officially distributed by the upstream author.  <footnote>"

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

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

 msgid ""
 "We cannot prevent upstream authors from changing the tarball they distribute "
 "without also incrementing the version number, so there can be no guarantee "
 msgid ""
 "We cannot prevent upstream authors from changing the tarball they distribute "
 "without also incrementing the version number, so there can be no guarantee "


@@ -2113,13 +2117,13 @@ msgid ""
 "that it is identical to something that upstream once <emphasis>did</"
 "emphasis> distribute.  If a difference arises later (say, if upstream "
 "notices that he wasn't using maximal comression in his original distribution "
 "that it is identical to something that upstream once <emphasis>did</"
 "emphasis> distribute.  If a difference arises later (say, if upstream "
 "notices that he wasn't using maximal comression in his original distribution "

-"and then re-<literal>gzip</literal>s it), that's just too bad.  Since there "
-"is no good way to upload a new .orig.tar.gz for the same version, there is "
-"not even any point in treating this situation as a bug."
+"and then re-<command>gzip</command>s it), that's just too bad.  Since there "
+"is no good way to upload a new <literal>.orig.tar.gz</literal> for the same "
+"version, there is not even any point in treating this situation as a bug."

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

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

 msgid ""
 "</footnote> This makes it possible to use checksums to easily verify that "
 "all changes between Debian's version and upstream's are contained in the "
 msgid ""
 "</footnote> This makes it possible to use checksums to easily verify that "
 "all changes between Debian's version and upstream's are contained in the "


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

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

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


@@ -2138,12 +2142,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

-#: best-pkging-practices.dbk:1538
+#: best-pkging-practices.dbk:1544

 msgid "It unpacks the tarball in an empty temporary directory by doing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
 msgid "It unpacks the tarball in an empty temporary directory by doing"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>

-#: best-pkging-practices.dbk:1540
+#: best-pkging-practices.dbk:1546

 #, no-wrap
 msgid ""
 "\n"
 #, no-wrap
 msgid ""
 "\n"


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

-#: best-pkging-practices.dbk:1546
+#: best-pkging-practices.dbk:1552

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


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

-#: best-pkging-practices.dbk:1555
+#: best-pkging-practices.dbk:1561

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


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

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

 msgid "Repackaged upstream source"
 msgstr "upstream のソースをパッケージしなおす"
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Repackaged upstream source"
 msgstr "upstream のソースをパッケージしなおす"
 
 # type: Content of: <chapter><section><section><section><para>

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

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


@@ -2186,19 +2190,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

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

 msgid ""
 msgid ""

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

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

-#: best-pkging-practices.dbk:1584
+#: best-pkging-practices.dbk:1590

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


@@ -2210,12 +2214,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1593
-msgid "A repackaged .orig.tar.gz"
+#: best-pkging-practices.dbk:1599
+msgid "A repackaged <literal>.orig.tar.gz</literal>"

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

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

 msgid ""
 "<emphasis role=\"strong\">must</emphasis> contain detailed information how "
 "the repackaged source was obtained, and how this can be reproduced in the "
 msgid ""
 "<emphasis role=\"strong\">must</emphasis> contain detailed information how "
 "the repackaged source was obtained, and how this can be reproduced in the "


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

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

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


@@ -2236,7 +2240,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para><footnote><para>
 #.  or similarly named 
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para><footnote><para>
 #.  or similarly named 

-#: best-pkging-practices.dbk:1612
+#: best-pkging-practices.dbk:1618

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


@@ -2248,12 +2252,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><orderedlist><listitem><para>

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

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

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

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


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

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

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


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

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

 msgid ""
 "<emphasis role=\"strong\">should</emphasis> use <literal>&lt;packagename&gt;-"
 "&lt;upstream-version&gt;.orig</literal> as the name of the top-level "
 msgid ""
 "<emphasis role=\"strong\">should</emphasis> use <literal>&lt;packagename&gt;-"
 "&lt;upstream-version&gt;.orig</literal> as the name of the top-level "


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

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

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

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

 msgid ""
 "The canonical way to meet the latter two points is to let <literal>dpkg-"
 "source -b</literal> construct the repackaged tarball from an unpacked "
 msgid ""
 "The canonical way to meet the latter two points is to let <literal>dpkg-"
 "source -b</literal> construct the repackaged tarball from an unpacked "


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

-#: best-pkging-practices.dbk:1659
+#: best-pkging-practices.dbk:1665

 msgid "Changing binary files in <literal>diff.gz</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para><footnote>
 msgid "Changing binary files in <literal>diff.gz</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para><footnote>

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

 msgid ""
 "Sometimes it is necessary to change binary files contained in the original "
 "tarball, or to add binary files that are not in it.  If this is done by "
 msgid ""
 "Sometimes it is necessary to change binary files contained in the original "
 "tarball, or to add binary files that are not in it.  If this is done by "


@@ -2315,7 +2319,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para><footnote><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para><footnote><para>

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

 msgid ""
 "The file should have a name that makes it clear which binary file it "
 "encodes.  Usually, some postfix indicating the encoding should be appended "
 msgid ""
 "The file should have a name that makes it clear which binary file it "
 "encodes.  Usually, some postfix indicating the encoding should be appended "


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

-#: best-pkging-practices.dbk:1676
+#: best-pkging-practices.dbk:1682

 msgid ""
 "&example-uu; </footnote>.  The file would then be decoded and copied to its "
 "place during the build process.  Thus the change will be visible quite easy."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid ""
 "&example-uu; </footnote>.  The file would then be decoded and copied to its "
 "place during the build process.  Thus the change will be visible quite easy."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: best-pkging-practices.dbk:1682
+#: best-pkging-practices.dbk:1688

 msgid ""
 "Some packages use <command>dbs</command> to manage patches to their upstream "
 "source, and always create a new <literal>orig.tar.gz</literal> file that "
 msgid ""
 "Some packages use <command>dbs</command> to manage patches to their upstream "
 "source, and always create a new <literal>orig.tar.gz</literal> file that "


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

-#: best-pkging-practices.dbk:1695
+#: best-pkging-practices.dbk:1701

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

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

 msgid ""
 "A debug package is a package with a name ending in -dbg, that contains "
 "additional information that gdb can use.  Since Debian binaries are stripped "
 msgid ""
 "A debug package is a package with a name ending in -dbg, that contains "
 "additional information that gdb can use.  Since Debian binaries are stripped "


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

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

 msgid ""
 "It is up to a package's maintainer whether to create a debug package or "
 "not.  Maintainers are encouraged to create debug packages for library "
 msgid ""
 "It is up to a package's maintainer whether to create a debug package or "
 "not.  Maintainers are encouraged to create debug packages for library "


@@ -2374,48 +2378,50 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 "Some debug packages may contain an entire special debugging build of a "
 "library or other binary, but most of them can save space and build time by "
 "instead containing separated debugging symbols that gdb can find and load on "
 "the fly when debugging a program or library.  The convention in Debian is to "
 msgid ""
 "Some debug packages may contain an entire special debugging build of a "
 "library or other binary, but most of them can save space and build time by "
 "instead containing separated debugging symbols that gdb can find and load on "
 "the fly when debugging a program or library.  The convention in Debian is to "

-"keep these symbols in <filename>/usr/lib/debug/path</filename>, where "
-"<emphasis>path</emphasis> is the path to the executable or library.  For "
-"example, debugging symbols for <filename>/usr/bin/foo</filename> go in "
-"<filename>/usr/lib/debug/usr/bin/foo</filename>, and debugging symbols for "
-"<filename>/usr/lib/libfoo.so.1</filename> go in <filename>/usr/lib/debug/usr/"
-"lib/libfoo.so.1</filename>."
+"keep these symbols in <filename>/usr/lib/debug/<replaceable>path</"
+"replaceable></filename>, where <replaceable>path</replaceable> is the path "
+"to the executable or library.  For example, debugging symbols for <filename>/"
+"usr/bin/foo</filename> go in <filename>/usr/lib/debug/usr/bin/foo</"
+"filename>, and debugging symbols for <filename>/usr/lib/libfoo.so.1</"
+"filename> go in <filename>/usr/lib/debug/usr/lib/libfoo.so.1</filename>."

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

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

 msgid ""
 msgid ""

-"The debugging symbols can be extracted from an object file using objcopy --"
-"only-keep-debug.  Then the object file can be stripped, and objcopy --add-"
-"gnu-debuglink used to specify the path to the debugging symbol file.  "
-"<citerefentry> <refentrytitle>objcopy</refentrytitle> <manvolnum>1</"
-"manvolnum> </citerefentry> explains in detail how this works."
+"The debugging symbols can be extracted from an object file using <command> "
+"objcopy --only-keep-debug</command>.  Then the object file can be stripped, "
+"and <command>objcopy --add-gnu-debuglink</command> used to specify the path "
+"to the debugging symbol file.  <citerefentry> <refentrytitle>objcopy</"
+"refentrytitle> <manvolnum>1</manvolnum> </citerefentry> explains in detail "
+"how this works."

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

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

 msgid ""
 msgid ""

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

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

-#: best-pkging-practices.dbk:1741
+#: best-pkging-practices.dbk:1748

 msgid ""
 "Note that the Debian package should depend on the package that it provides "
 "debugging symbols for, and this dependency should be versioned.  For example:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgid ""
 "Note that the Debian package should depend on the package that it provides "
 "debugging symbols for, and this dependency should be versioned.  For example:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

-#: best-pkging-practices.dbk:1744
+#: best-pkging-practices.dbk:1751

 #, fuzzy, no-wrap
 msgid ""
 "\n"
 #, fuzzy, no-wrap
 msgid ""
 "\n"

diff --git a/po4a/ja/beyond-pkging.po b/po4a/ja/beyond-pkging.po
index d903bc7590ee6a262abefc5f2b89be8a1c4ff484..cd6e0003030c4034dcd376e39d93f4f30399eb37 100644 (file)
--- a/po4a/ja/beyond-pkging.po
+++ b/po4a/ja/beyond-pkging.po
@@ -1,23 +1,21 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Debian Developer's Reference (Japanese)
+# (C) Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2008.

 #
 #

-#, fuzzy

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

-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-03-05 18:04+0900\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"
+"Project-Id-Version: developers-reference 3.4.1\n"
+"POT-Creation-Date: 2008-06-14 23:00+0900\n"
+"PO-Revision-Date: 2008-07-04 04:27+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"

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

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

 
 # type: Content of: <chapter><title>
 #: beyond-pkging.dbk:7
 msgid "Beyond Packaging"
 
 # type: Content of: <chapter><title>
 #: beyond-pkging.dbk:7
 msgid "Beyond Packaging"

-msgstr ""
+msgstr "パッケージ化を越えて"

 
 # type: Content of: <chapter><para>
 #: beyond-pkging.dbk:9
 
 # type: Content of: <chapter><para>
 #: beyond-pkging.dbk:9


@@ -39,7 +37,7 @@ msgstr ""
 # type: Content of: <chapter><section><title>
 #: beyond-pkging.dbk:19
 msgid "Bug reporting"
 # type: Content of: <chapter><section><title>
 #: beyond-pkging.dbk:19
 msgid "Bug reporting"

-msgstr ""
+msgstr "バグ報告"

 
 # type: Content of: <chapter><section><para>
 #: beyond-pkging.dbk:21
 
 # type: Content of: <chapter><section><para>
 #: beyond-pkging.dbk:21


@@ -184,7 +182,7 @@ msgstr ""
 # type: Content of: <chapter><section><section><title>
 #: beyond-pkging.dbk:120
 msgid "Bug squashing parties"
 # type: Content of: <chapter><section><section><title>
 #: beyond-pkging.dbk:120
 msgid "Bug squashing parties"

-msgstr ""
+msgstr "バグ潰しパーティ (BSP)"

 
 # type: Content of: <chapter><section><section><para>
 #: beyond-pkging.dbk:122
 
 # type: Content of: <chapter><section><section><para>
 #: beyond-pkging.dbk:122


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

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

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


@@ -231,7 +229,7 @@ msgstr ""
 # type: Content of: <chapter><section><title>
 #: beyond-pkging.dbk:155
 msgid "Contacting other maintainers"
 # type: Content of: <chapter><section><title>
 #: beyond-pkging.dbk:155
 msgid "Contacting other maintainers"

-msgstr ""
+msgstr "他のメンテナにコンタクトを取る"

 
 # type: Content of: <chapter><section><para>
 #: beyond-pkging.dbk:157
 
 # type: Content of: <chapter><section><para>
 #: beyond-pkging.dbk:157


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

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

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


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

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

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

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

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


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

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

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


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

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

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

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

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

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

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


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

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

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


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

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

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


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

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

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


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

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

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

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

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

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

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

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

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


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

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

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

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

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


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

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

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


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

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

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


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

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

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


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

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

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

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

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


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

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

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


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

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

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


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

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

 msgid "Once the package meets Debian standards, build and sign it with"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgid "Once the package meets Debian standards, build and sign it with"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

-#: beyond-pkging.dbk:347
+#: beyond-pkging.dbk:348

 #, no-wrap
 msgid ""
 "\n"
 "dpkg-buildpackage -k<replaceable>KEY-ID</replaceable>\n"
 msgstr ""
 #, no-wrap
 msgid ""
 "\n"
 "dpkg-buildpackage -k<replaceable>KEY-ID</replaceable>\n"
 msgstr ""

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

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

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

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


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

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

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


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

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

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

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

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

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

 msgid "Advocating new developers"
 msgid "Advocating new developers"

-msgstr ""
+msgstr "新たな開発者を支持する"

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

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

 msgid ""
 "See the page about <ulink url=\"&url-newmaint-advocate;\">advocating a "
 "prospective developer</ulink> at the Debian web site."
 msgstr ""
 msgid ""
 "See the page about <ulink url=\"&url-newmaint-advocate;\">advocating a "
 "prospective developer</ulink> at the Debian web site."
 msgstr ""

+"Debian ウェブサイトの<ulink url=\"&url-newmaint-advocate;\">開発者志願者の支持者"
+"になる</ulink>のページを参照してください。"

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

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

 msgid "Handling new maintainer applications"
 msgid "Handling new maintainer applications"

-msgstr ""
+msgstr "新規メンテナ応募を取り扱う"

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

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

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

diff --git a/po4a/ja/developer-duties.po b/po4a/ja/developer-duties.po
index 21623db24d58b8af6c37658033570818582a5e5e..eb4fb78d298c233d350a471dcdd45f675f485614 100644 (file)
--- a/po4a/ja/developer-duties.po
+++ b/po4a/ja/developer-duties.po
@@ -1,11 +1,11 @@
 # Debian Developer's Reference (Japanese)
 # Debian Developer's Reference (Japanese)

-# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2007.
-# 
+# (C) Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2007-2008.
+#

 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.3.9\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.3.9\n"

-"POT-Creation-Date: 2007-07-01 21:18+0000\n"
-"PO-Revision-Date: 2007-08-02 20:04+0900\n"
+"POT-Creation-Date: 2008-06-14 14:14+0900\n"
+"PO-Revision-Date: 2008-06-14 20:04+0900\n"

 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
 "MIME-Version: 1.0\n"


@@ -32,12 +32,11 @@ msgid ""
 "as the address where you get your debian-private subscription if you choose "
 "to subscribe there."
 msgstr ""
 "as the address where you get your debian-private subscription if you choose "
 "to subscribe there."
 msgstr ""

-"Debian 開発者に関する情報が含まれた LDAP データベースが "
-"<ulink url=\"&url-debian-db;\"></ulink> にあります。"
-"ここに情報を入力して、情報に変更があった際に更新する必要があります。"
-"特に、あなたの debian.org アドレス宛メールの転送先アドレスが常に最新になっている"
-"のを必ず確認してください。debian-private の購読をここで設定した場合、そのメールを"
-"受け取るアドレスについても同様です。"
+"Debian 開発者に関する情報が含まれた LDAP データベースが <ulink url=\"&url-"
+"debian-db;\"></ulink> にあります。ここに情報を入力して、情報に変更があった際"
+"に更新する必要があります。特に、あなたの debian.org アドレス宛メールの転送先"
+"アドレスが常に最新になっているのを必ず確認してください。debian-private の購読"
+"をここで設定した場合、そのメールを受け取るアドレスについても同様です。"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:19
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:19


@@ -45,7 +44,8 @@ msgid ""
 "For more information about the database, please see <xref linkend=\"devel-db"
 "\"/> ."
 msgstr ""
 "For more information about the database, please see <xref linkend=\"devel-db"
 "\"/> ."
 msgstr ""

-"データベースについての詳細は <xref linkend=\"devel-db\"/> を参照してください。"
+"データベースについての詳細は <xref linkend=\"devel-db\"/> を参照してくださ"
+"い。"

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


@@ -61,12 +61,11 @@ msgid ""
 "documentation that comes with your software; read the <ulink url=\"&url-pgp-"
 "faq;\">PGP FAQ</ulink>."
 msgstr ""
 "documentation that comes with your software; read the <ulink url=\"&url-pgp-"
 "faq;\">PGP FAQ</ulink>."
 msgstr ""

-"秘密鍵の取扱いには十二分に注意してください。Debian サーバ "
-"(<xref linkend=\"server-machines\"/> 参照) のような公開サーバや複数のユーザが"
-"いるマシンには、どれにも置かないようにしてください。"
-"鍵をバックアップして、コピーはオフラインな場所に置きましょう。"
-"ソフトの使い方についてはドキュメントを参照してください。<ulink "
-"url=\"&url-pgp-faq;\">PGP FAQ</ulink> を読みましょう。"
+"秘密鍵の取扱いには十二分に注意してください。Debian サーバ (<xref linkend="
+"\"server-machines\"/> 参照) のような公開サーバや複数のユーザがいるマシンに"
+"は、どれにも置かないようにしてください。鍵をバックアップして、コピーはオフラ"
+"インな場所に置きましょう。ソフトの使い方についてはドキュメントを参照してくだ"
+"さい。<ulink url=\"&url-pgp-faq;\">PGP FAQ</ulink> を読みましょう。"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:34
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:34


@@ -76,9 +75,9 @@ msgid ""
 "(best also in paper form) of your revocation certificate; this is needed if "
 "your key is lost."
 msgstr ""
 "(best also in paper form) of your revocation certificate; this is needed if "
 "your key is lost."
 msgstr ""

-"鍵が盗難に対してだけではなく、紛失についても安全であることを保証する必要があります。"
-"失効証明書 (revocation certificate) を生成してコピーを作って下さい (紙にも出力して"
-"おくのがベストです)。これは鍵を紛失した場合に必要になります。"
+"鍵が盗難に対してだけではなく、紛失についても安全であることを保証する必要があ"
+"ります。失効証明書 (revocation certificate) を生成してコピーを作って下さい "
+"(紙にも出力しておくのがベストです)。これは鍵を紛失した場合に必要になります。"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:40
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:40


@@ -88,8 +87,8 @@ msgid ""
 "<literal>&keyserver-host;</literal>."
 msgstr ""
 "公開鍵に対して、署名したり身元情報を追加したりなどしたら、鍵を "
 "<literal>&keyserver-host;</literal>."
 msgstr ""
 "公開鍵に対して、署名したり身元情報を追加したりなどしたら、鍵を "

-"<literal>&keyserver-host;</literal> の鍵サーバに送付することで "
-"Debian key ring を更新できます。"
+"<literal>&keyserver-host;</literal> の鍵サーバに送付することで Debian key "
+"ring を更新できます。"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:45
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:45


@@ -101,13 +100,12 @@ msgid ""
 "key.  Details can be found at <ulink url=\"http://&keyserver-host;/"
 "replacing_keys.html\"></ulink>."
 msgstr ""
 "key.  Details can be found at <ulink url=\"http://&keyserver-host;/"
 "replacing_keys.html\"></ulink>."
 msgstr ""

-"まったく新しい鍵を追加したりあるいは古い鍵を削除したりする必要がある時は、"
-"別の開発者に署名された新しい鍵が必要になります。"
-"以前の鍵が侵害されたり利用不可能になった場合には、失効証明書 (revocation certificate) "
-"も追加する必要があります。"
-"新しい鍵が本当に必要な理由が見当たらない場合は、Keyring メンテナは新しい鍵を拒否する"
-"ことがあります。詳細は <ulink url=\"http://&keyserver-host;/replacing_keys.html\">"
-"</ulink> で確認できます。"
+"まったく新しい鍵を追加したりあるいは古い鍵を削除したりする必要がある時は、別"
+"の開発者に署名された新しい鍵が必要になります。以前の鍵が侵害されたり利用不可"
+"能になった場合には、失効証明書 (revocation certificate) も追加する必要があり"
+"ます。新しい鍵が本当に必要な理由が見当たらない場合は、Keyring メンテナは新し"
+"い鍵を拒否することがあります。詳細は <ulink url=\"http://&keyserver-host;/"
+"replacing_keys.html\"></ulink> で確認できます。"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:53
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:53


@@ -115,7 +113,8 @@ msgid ""
 "The same key extraction routines discussed in <xref linkend=\"registering\"/"
 "> apply."
 msgstr ""
 "The same key extraction routines discussed in <xref linkend=\"registering\"/"
 "> apply."
 msgstr ""

-"同様に鍵の取り出し方について <xref linkend=\"registering\"/> で説明されています。"
+"同様に鍵の取り出し方について <xref linkend=\"registering\"/> で説明されていま"
+"す。"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:57
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:57


@@ -124,9 +123,9 @@ msgid ""
 "documentation of the <systemitem role=\"package\">debian-keyring</"
 "systemitem> package."
 msgstr ""
 "documentation of the <systemitem role=\"package\">debian-keyring</"
 "systemitem> package."
 msgstr ""

-"Debian での鍵のメンテナンスについて、より突っ込んだ議論が <systemitem "
-"role=\"package\">debian-keyring</systemitem> パッケージ中のドキュメントで"
-"知ることができます。"
+"Debian での鍵のメンテナンスについて、より突っ込んだ議論が <systemitem role="
+"\"package\">debian-keyring</systemitem> パッケージ中のドキュメントで知ること"
+"ができます。"

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


@@ -140,10 +139,9 @@ msgid ""
 "elect our leaders and to approve general resolutions.  These procedures are "
 "defined by the <ulink url=\"&url-constitution;\">Debian Constitution</ulink>."
 msgstr ""
 "elect our leaders and to approve general resolutions.  These procedures are "
 "defined by the <ulink url=\"&url-constitution;\">Debian Constitution</ulink>."
 msgstr ""

-"Debian は本来の意味での民主主義ではありませんが、我々はリーダの選出や一般投票の承認"
-"において民主主義的なプロセスを利用しています。"
-"これらの手続きについては、<ulink url=\"&url-constitution;\">Debian 憲章</ulink>"
-"で規程されています。"
+"Debian は本来の意味での民主主義ではありませんが、我々はリーダの選出や一般投票"
+"の承認において民主主義的なプロセスを利用しています。これらの手続きについて"
+"は、<ulink url=\"&url-constitution;\">Debian 憲章</ulink>で規程されています。"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:72
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:72


@@ -153,10 +151,10 @@ msgid ""
 "&email-debian-vote; mailing list and it requires several endorsements before "
 "the project secretary starts the voting procedure."
 msgstr ""
 "&email-debian-vote; mailing list and it requires several endorsements before "
 "the project secretary starts the voting procedure."
 msgstr ""

-"毎年のリーダー選挙以外には、投票は定期的には実施されず、軽々しく提案されるものでは"
-"ã\81\82ã\82\8aã\81¾ã\81\9bã\82\93ã\80\82"
-"提案はそれぞれ &email-debian-vote; メーリングリストでまず議論され、プロジェクトの"
-"書記担当者が投票手順を開始する前に複数のエンドースメントを必要とします。"
+"毎年のリーダー選挙以外には、投票は定期的には実施されず、軽々しく提案されるも"
+"ã\81®ã\81§ã\81¯ã\81\82ã\82\8aã\81¾ã\81\9bã\82\93ã\80\82æ\8f\90æ¡\88ã\81¯ã\81\9dã\82\8cã\81\9eã\82\8c &email-debian-vote; ã\83¡ã\83¼ã\83ªã\83³ã\82°ã\83ªã\82¹ã\83\88ã\81§ã\81¾ã\81\9aè­°"
+"論され、プロジェクトの書記担当者が投票手順を開始する前に複数のエンドースメン"
+"トを必要とします。"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:78
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:78


@@ -168,12 +166,11 @@ msgid ""
 "all developers to vote.  Voting is conducted via GPG-signed/encrypted email "
 "messages."
 msgstr ""
 "all developers to vote.  Voting is conducted via GPG-signed/encrypted email "
 "messages."
 msgstr ""

-"書記担当者が &email-debian-devel-announce; 上で複数回投票の呼びかけを行うので、"
-"投票前の議論を追いかける必要はありません (全開発者がこのメーリングリストを購読する"
-"ことが求められています)。"
-"民主主義は、人々が投票に参加しないと正常に機能しません。"
-"これが我々が全ての開発者に投票を勧める理由です。"
-"投票は GPG によって署名／暗号化されたメールによって行われます。"
+"書記担当者が &email-debian-devel-announce; 上で複数回投票の呼びかけを行うの"
+"で、投票前の議論を追いかける必要はありません (全開発者がこのメーリングリスト"
+"を購読することが求められています)。民主主義は、人々が投票に参加しないと正常に"
+"機能しません。これが我々が全ての開発者に投票を勧める理由です。投票は GPG に"
+"よって署名／暗号化されたメールによって行われます。"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:86
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:86


@@ -182,8 +179,8 @@ msgid ""
 "\"&url-vote;\">Debian Voting Information</ulink> page, along with "
 "information on how to make, second and vote on proposals."
 msgstr ""
 "\"&url-vote;\">Debian Voting Information</ulink> page, along with "
 "information on how to make, second and vote on proposals."
 msgstr ""

-"(過去と現在の) 全ての提案リストが <ulink url=\"&url-vote;\">Debian 投票情報"
-"</ulink>ページで閲覧できます。提案について、どの様に起案され、支持され、投票が"
+"(過去と現在の) 全ての提案リストが <ulink url=\"&url-vote;\">Debian 投票情報</"
+"ulink>ページで閲覧できます。提案について、どの様に起案され、支持され、投票が"

 "行われたのかという関連情報の確認が可能になっています。"
 
 # type: Content of: <chapter><section><title>
 "行われたのかという関連情報の確認が可能になっています。"
 
 # type: Content of: <chapter><section><title>


@@ -200,11 +197,11 @@ msgid ""
 "that they can do whatever is needed if a problem occurs with your packages "
 "or other duties in the project."
 msgstr ""
 "that they can do whatever is needed if a problem occurs with your packages "
 "or other duties in the project."
 msgstr ""

-"予定していた休暇にせよ、それとも単に他の作業で忙しいにせよ、開発者が不在になること"
-"ã\81\8cã\81\82ã\82\8bã\81®ã\81¯ã\81\94ã\81\8fæ\99®é\80\9aã\81®ã\81\93ã\81¨ã\81§ã\81\99ã\80\82"
-"注意すべき重要な点は、他の開発者達があなたが休暇中であることを知る必要があることと、"
-"あなたのパッケージについて問題が起こった場合やプロジェクト内での責務を果たすのに問題"
-"ã\81\8cç\94\9fã\81\98ã\81\9fã\81¨ã\81\84ã\81\86æ§\98ã\81ªå ´å\90\88ã\81¯ã\80\81å¿\85è¦\81ã\81ªã\81\93ã\81¨ã\82\92å½¼ã\82\89ã\81\8cä½\95ã\81§ã\81\82ã\81£ã\81¦ã\82\82ã\81§ã\81\8dã\82\8bã\82\88ã\81\86ã\81«ã\81\99ã\82\8bã\81\93ã\81¨ã\81§ã\81\99ã\80\82"
+"予定していた休暇にせよ、それとも単に他の作業で忙しいにせよ、開発者が不在にな"
+"ã\82\8bã\81\93ã\81¨ã\81\8cã\81\82ã\82\8bã\81®ã\81¯ã\81\94ã\81\8fæ\99®é\80\9aã\81®ã\81\93ã\81¨ã\81§ã\81\99ã\80\82注æ\84\8fã\81\99ã\81¹ã\81\8dé\87\8dè¦\81ã\81ªç\82¹ã\81¯ã\80\81ä»\96ã\81®é\96\8bç\99ºè\80\85é\81\94ã\81\8cã\81\82ã\81ª"
+"たが休暇中であることを知る必要があることと、あなたのパッケージについて問題が"
+"起こった場合やプロジェクト内での責務を果たすのに問題が生じたという様な場合"
+"は、必要なことを彼らが何であってもできるようにすることです。"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:102
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:102


@@ -215,11 +212,11 @@ msgid ""
 "nothing as critical as that, but it's still appropriate to let others know "
 "that you're unavailable."
 msgstr ""
 "nothing as critical as that, but it's still appropriate to let others know "
 "that you're unavailable."
 msgstr ""

-"通常、これはあなたが休暇中にあなたのパッケージが大きな問題 (リリースクリティカルバグ"
-"ã\82\84ã\82»ã\82­ã\83¥ã\83ªã\83\86ã\82£æ\9b´æ\96°ã\81ªã\81©) ã\81¨ã\81ªã\81£ã\81¦ã\81\84ã\82\8bå ´å\90\88ã\81«ã\80\81ä»\96ã\81®é\96\8bç\99ºè\80\85ã\81«å¯¾ã\81\97ã\81¦ NMU (<xref "
-"linkend=\"nmu\"/> 参照) を許可することを意味しています。"
-"大抵の場合はそれほど致命的なことはおきませんが、他の開発者に対してあなたが"
-"作業できない状態であることを知らせるのは重要です。"
+"通常、これはあなたが休暇中にあなたのパッケージが大きな問題 (リリースクリティ"
+"ã\82«ã\83«ã\83\90ã\82°ã\82\84ã\82»ã\82­ã\83¥ã\83ªã\83\86ã\82£æ\9b´æ\96°ã\81ªã\81©) ã\81¨ã\81ªã\81£ã\81¦ã\81\84ã\82\8bå ´å\90\88ã\81«ã\80\81ä»\96ã\81®é\96\8bç\99ºè\80\85ã\81«å¯¾ã\81\97ã\81¦ NMU "
+"(<xref linkend=\"nmu\"/> 参照) を許可することを意味しています。大抵の場合はそ"
+"れほど致命的なことはおきませんが、他の開発者に対してあなたが作業できない状態"
+"であることを知らせるのは重要です。"

 
 # type: Content of: <chapter><section><para><footnote>
 #: developer-duties.dbk:109
 
 # type: Content of: <chapter><section><para><footnote>
 #: developer-duties.dbk:109


@@ -228,9 +225,9 @@ msgid ""
 "should do.  First send a mail to <email>debian-private@&lists-host;</email> "
 "with [VAC] prepended to the subject of your message<footnote>"
 msgstr ""
 "should do.  First send a mail to <email>debian-private@&lists-host;</email> "
 "with [VAC] prepended to the subject of your message<footnote>"
 msgstr ""

-"他の開発者に通知するために行わなければならないことが 2 つあります。"
-"まず、<email>debian-private@&lists-host;</email> にサブジェクトの先頭に [VAC] "
-"ã\81¨ä»\98ã\81\91ã\81\9fã\83¡ã\83¼ã\83«<footnote>"
+"他の開発者に通知するために行わなければならないことが 2 つあります。まず、"
+"<email>debian-private@&lists-host;</email> にサブジェクトの先頭に [VAC] と付"
+"けたメール<footnote>"

 
 # type: Content of: <chapter><section><para><footnote><para>
 #: developer-duties.dbk:111
 
 # type: Content of: <chapter><section><para><footnote><para>
 #: developer-duties.dbk:111


@@ -238,7 +235,8 @@ msgid ""
 "This is so that the message can be easily filtered by people who don't want "
 "to read vacation notices."
 msgstr ""
 "This is so that the message can be easily filtered by people who don't want "
 "to read vacation notices."
 msgstr ""

-"これは、休暇のメッセージを読みたくない人がメッセージを簡単に振り分け可能にするためです。"
+"これは、休暇のメッセージを読みたくない人がメッセージを簡単に振り分け可能にす"
+"るためです。"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:113
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:113


@@ -246,8 +244,9 @@ msgid ""
 "</footnote> and state the period of time when you will be on vacation.  You "
 "can also give some special instructions on what to do if a problem occurs."
 msgstr ""
 "</footnote> and state the period of time when you will be on vacation.  You "
 "can also give some special instructions on what to do if a problem occurs."
 msgstr ""

-"</footnote>の本文に、いつまで休暇予定なのかを記述して休暇に行く際に送ってください。"
-"問題が起こった際にどうすれば良いのか、特別な指示を書いておくこともできます。"
+"</footnote>の本文に、いつまで休暇予定なのかを記述して休暇に行く際に送ってくだ"
+"さい。問題が起こった際にどうすれば良いのか、特別な指示を書いておくこともでき"
+"ます。"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:118
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:118


@@ -258,9 +257,9 @@ msgid ""
 "remove the on vacation flag when you come back!"
 msgstr ""
 "他に行うべき事は <link linkend=\"devel-db\">Debian developers' LDAP "
 "remove the on vacation flag when you come back!"
 msgstr ""
 "他に行うべき事は <link linkend=\"devel-db\">Debian developers' LDAP "

-"database</link> 上 であなたを vacation とマークする事です "
-"(この情報は Debian 開発者のみがアクセスできます)。"
-"休暇から戻った時には vacation フラグを削除するのを忘れないように!"
+"database</link> 上 であなたを vacation とマークする事です (この情報は Debian "
+"開発者のみがアクセスできます)。休暇から戻った時には vacation フラグを削除する"
+"のを忘れないように!"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:124
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:124


@@ -272,9 +271,9 @@ msgid ""
 "people who are interested in applying."
 msgstr ""
 "理想的には、休暇にあわせて <ulink url=\"&url-newmaint-db;gpg.php\">GPG "
 "people who are interested in applying."
 msgstr ""
 "理想的には、休暇にあわせて <ulink url=\"&url-newmaint-db;gpg.php\">GPG "

-"coordination site</ulink> に登録して、誰かサインを希望している人がいるかどうかを"
-"ã\83\81ã\82§ã\83\83ã\82¯ã\81\97ã\81¾ã\81\99ã\80\82é\96\8bç\99ºè\80\85ã\81\8cã\81¾ã\81 誰ã\82\82ã\81\84ã\81ªã\81\84ã\81\91ã\82\8cã\81©ã\82\82å¿\9cå\8b\9fã\81«è\88\88å\91³ã\82\92æ\8c\81ã\81£ã\81¦ã\81\84ã\82\8b人ã\81\8cã\81\84ã\82\8bã\82\88ã\81\86ã\81ª"
-"エキゾチックな場所に行く場合、これは特に重要です。"
+"coordination site</ulink> に登録して、誰かサインを希望している人がいるかどう"
+"ã\81\8bã\82\92ã\83\81ã\82§ã\83\83ã\82¯ã\81\97ã\81¾ã\81\99ã\80\82é\96\8bç\99ºè\80\85ã\81\8cã\81¾ã\81 誰ã\82\82ã\81\84ã\81ªã\81\84ã\81\91ã\82\8cã\81©ã\82\82å¿\9cå\8b\9fã\81«è\88\88å\91³ã\82\92æ\8c\81ã\81£ã\81¦ã\81\84ã\82\8b人ã\81\8c"
+"ã\81\84ã\82\8bã\82\88ã\81\86ã\81ªã\82¨ã\82­ã\82¾ã\83\81ã\83\83ã\82¯ã\81ªå ´æ\89\80ã\81«è¡\8cã\81\8få ´å\90\88ã\80\81ã\81\93ã\82\8cã\81¯ç\89¹ã\81«é\87\8dè¦\81ã\81§ã\81\99ã\80\82"

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


@@ -290,11 +289,11 @@ msgid ""
 "these bug reports to the upstream developers so that they can be fixed in a "
 "future upstream release."
 msgstr ""
 "these bug reports to the upstream developers so that they can be fixed in a "
 "future upstream release."
 msgstr ""

-"Debian メンテナとしての仕事のうち重要な位置を占めるのは、上流 (upstream) の開発者"
-"との窓口であることです。Debian ユーザは、時折バグ報告システムに Debian 特有ではない"
-"バグを報告する事があります。"
-"Debian メンテナは、いつか上流のリリースで修正できるようにする為、このようなバグ報告"
-"ã\82\92ä¸\8aæµ\81ã\81®é\96\8bç\99ºè\80\85ã\81«è»¢é\80\81ã\81\97ã\81ªã\81\8fã\81¦ã\81¯ã\81ªã\82\8aã\81¾ã\81\9bã\82\93ã\80\82"
+"Debian メンテナとしての仕事のうち重要な位置を占めるのは、上流 (upstream) の開"
+"発者との窓口であることです。Debian ユーザは、時折バグ報告システムに Debian 特"
+"有ではないバグを報告する事があります。Debian メンテナは、いつか上流のリリース"
+"で修正できるようにする為、このようなバグ報告を上流の開発者に転送しなくてはな"
+"りません。"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:142
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:142


@@ -305,11 +304,10 @@ msgid ""
 "submit patches to fix upstream bugs — you should evaluate and forward these "
 "patches upstream."
 msgstr ""
 "submit patches to fix upstream bugs — you should evaluate and forward these "
 "patches upstream."
 msgstr ""

-"Debian 固有ではないバグの修正はあなたの義務ではないとはいえ、できるなら遠慮なく"
-"修正してください。"
-"そのような修正を行った際は、上流の開発者にも送ってください。"
-"時折 Debian ユーザ／開発者が上流のバグを修正するパッチを送ってくる事があります。"
-"その場合は、あなたはパッチを確認して上流へ転送する必要があります。"
+"Debian 固有ではないバグの修正はあなたの義務ではないとはいえ、できるなら遠慮な"
+"く修正してください。そのような修正を行った際は、上流の開発者にも送ってくださ"
+"い。時折 Debian ユーザ／開発者が上流のバグを修正するパッチを送ってくる事があ"
+"ります。その場合は、あなたはパッチを確認して上流へ転送する必要があります。"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:149
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:149


@@ -320,10 +318,10 @@ msgid ""
 "sources of the next upstream version.  Whatever changes you need, always try "
 "not to fork from the upstream sources."
 msgstr ""
 "sources of the next upstream version.  Whatever changes you need, always try "
 "not to fork from the upstream sources."
 msgstr ""

-"ポリシーに準拠したパッケージをビルドするために上流のソースに手を入れる必要がある場合、"
-"以降の上流でのリリースにおいて手を入れなくても済むために、ここで含まれる修正を"
-"上流の開発者にとって良い形で提案する必要があります。"
-"必要な変更が何であれ、上流のソースからフォークしないように常に試みてください。"
+"ポリシーに準拠したパッケージをビルドするために上流のソースに手を入れる必要が"
+"ある場合、以降の上流でのリリースにおいて手を入れなくても済むために、ここで含"
+"まれる修正を上流の開発者にとって良い形で提案する必要があります。必要な変更が"
+"何であれ、上流のソースからフォークしないように常に試みてください。"

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


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

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

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

-"大抵の場合、パッケージに対するバグ報告については <xref linkend=\"bug-handling\"/>"
-"で記述されているように対応する必要があります。しかしながら、注意を必要とする特別な"
-"ã\82«ã\83\86ã\82´ã\83ªã\81®ã\83\90ã\82°ã\81\8cã\81\82ã\82\8aã\81¾ã\81\99 - ã\83ªã\83ªã\83¼ã\82¹ã\82¯ã\83ªã\83\86ã\82£ã\82«ã\83«ã\83\90ã\82° (RC bug) ã\81¨å\91¼ã\81°ã\82\8cã\82\8bã\82\82ã\81®ã\81§ã\81\99ã\80\82"
-"<emphasis>critical</emphasis>、<emphasis>grave</emphasis>、<emphasis>serious"
-"</emphasis> の重要度が付けられている全てのバグ報告は、Debian の次期安定版リリース"
-"からパッケージに含めるかどうかについての影響を持つと見なされています。"
-"ã\81\93ã\82\8cã\82\89ã\81®ã\83\90ã\82°ã\81¯ Debian ã\81®ã\83ªã\83ªã\83¼ã\82¹ã\82\92é\81\85ã\82\89ã\81\9bã\81\9fã\82\8aã\80\81ã\83\95ã\83ªã\83¼ã\82ºæ\99\82ã\81«ã\83\91ã\83\83ã\82±ã\83¼ã\82¸å\89\8aé\99¤ã\81®èª¿æ\95´ã\81«"
-"使われるなどされることがあります。"
-"ã\81\93ã\82\8cã\81\8cã\80\81ã\81\93ã\82\8cã\82\89ã\81®ã\83\90ã\82°ã\82\92å\8f¯è\83½ã\81ªé\99\90ã\82\8aç´ æ\97©ã\81\8f修正ã\81\99ã\82\8bå¿\85è¦\81ã\81\8cã\81\82ã\82\8bç\90\86ç\94±ã\81§ã\81\99ã\80\82"
+"大抵の場合、パッケージに対するバグ報告については <xref linkend=\"bug-handling"
+"\"/>で記述されているように対応する必要があります。しかしながら、注意を必要と"
+"ã\81\99ã\82\8bç\89¹å\88¥ã\81ªã\82«ã\83\86ã\82´ã\83ªã\81®ã\83\90ã\82°ã\81\8cã\81\82ã\82\8aã\81¾ã\81\99 - ã\83ªã\83ªã\83¼ã\82¹ã\82¯ã\83ªã\83\86ã\82£ã\82«ã\83«ã\83\90ã\82° (RC bug) ã\81¨å\91¼ã\81°"
+"れるものです。<literal>critical</literal>、<literal>grave</literal>、"
+"<literal>serious</literal> の重要度が付けられている全てのバグ報告は、"
+"Debian の次期安定版リリースからパッケージに含めるかどうかについての影響を持つ"
+"ã\81¨è¦\8bã\81ªã\81\95ã\82\8cã\81¦ã\81\84ã\81¾ã\81\99ã\80\82ã\81\93ã\82\8cã\82\89ã\81®ã\83\90ã\82°ã\81¯ Debian ã\81®ã\83ªã\83ªã\83¼ã\82¹ã\82\92é\81\85ã\82\89ã\81\9bã\81\9fã\82\8aã\80\81ã\83\95ã\83ªã\83¼ã\82ºæ\99\82"
+"にパッケージ削除の調整に使われるなどされることがあります。これが、これらのバ"
+"グを可能な限り素早く修正する必要がある理由です。"

 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:171
 
 # type: Content of: <chapter><section><para>
 #: developer-duties.dbk:171


@@ -367,16 +365,15 @@ msgid ""
 "trying to contact you (they might not wait as long as usual before they do "
 "their NMU if they have seen no recent activity from you in the BTS)."
 msgstr ""
 "trying to contact you (they might not wait as long as usual before they do "
 "their NMU if they have seen no recent activity from you in the BTS)."
 msgstr ""

-"<ulink url=\"&url-debian-qa;\">品質保証</ulink> グループに所属している開発者は"
-"そのようなバグ全てを取扱い、何時でも可能な時に修正を試みます。"
-"どの様な理由であれ、2 週間の間でパッケージの RC バグを修正出来なかったりする場合は"
-"品質保証 (QA) グループ <email>debian-qa@&lists-host;</email> にメールを送って"
-"協力を求めるか、困難な点を説明してどうやってそれを修正するつもりなのか、バグ報告"
-"に対してメールを送ってください。"
-"そうしない場合は、QA グループのメンバーはあなたにコンタクトを試みた後で "
-"Non-Maintainer アップロード (<xref linkend=\"nmu\"/> 参照) を行おうとします "
-"(BTS 上で最近の活動が見られない場合は、彼らは NMU を行う前にいつもの様には待とうとは"
-"しないでしょう)。"
+"<ulink url=\"&url-debian-qa;\">品質保証</ulink> グループに所属している開発者"
+"はそのようなバグ全てを取扱い、何時でも可能な時に修正を試みます。どの様な理由"
+"であれ、2 週間の間でパッケージの RC バグを修正出来なかったりする場合は品質保"
+"証 (QA) グループ <email>debian-qa@&lists-host;</email> にメールを送って協力を"
+"求めるか、困難な点を説明してどうやってそれを修正するつもりなのか、バグ報告に"
+"対してメールを送ってください。そうしない場合は、QA グループのメンバーはあなた"
+"にコンタクトを試みた後で Non-Maintainer アップロード (<xref linkend=\"nmu\"/"
+"> 参照) を行おうとします (BTS 上で最近の活動が見られない場合は、彼らは NMU を"
+"行う前にいつもの様には待とうとはしないでしょう)。"

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


@@ -396,8 +393,8 @@ msgstr ""
 msgid ""
 "Orphan all your packages, as described in <xref linkend=\"orphaning\"/> ."
 msgstr ""
 msgid ""
 "Orphan all your packages, as described in <xref linkend=\"orphaning\"/> ."
 msgstr ""

-"<xref linkend=\"orphaning\"/> の記述にしたがって、全てのパッケージをみなしご化 "
-"(orphan) してください。"
+"<xref linkend=\"orphaning\"/> の記述にしたがって、全てのパッケージをみなしご"
+"化 (orphan) してください。"

 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
 #: developer-duties.dbk:199
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
 #: developer-duties.dbk:199


@@ -405,8 +402,8 @@ msgid ""
 "Send an gpg-signed email about why you are leaving the project to "
 "<email>debian-private@&lists-host;</email>."
 msgstr ""
 "Send an gpg-signed email about why you are leaving the project to "
 "<email>debian-private@&lists-host;</email>."
 msgstr ""

-"何故プロジェクトを去るのかについて GPG でサインされたメールを "
-"<email>debian-private@&lists-host;</email> に投げてください。"
+"何故プロジェクトを去るのかについて GPG でサインされたメールを <email>debian-"
+"private@&lists-host;</email> に投げてください。"

 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
 #: developer-duties.dbk:205
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
 #: developer-duties.dbk:205


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

-"'Debian RT' という単語 (大文字小文字は関係なし) が入ったメールを "
-"keyring@rt.debian.org に投げて Debian RT でチケットをオープンすることで、"
-"あなたがプロジェクトを去るのを Debian key ring メンテナに知らせてください。"
-
+"'Debian RT' という単語 (大文字小文字は関係なし) が入ったメールを keyring@rt."
+"debian.org に投げて Debian RT でチケットをオープンすることで、あなたがプロ"
+"ジェクトを去るのを Debian key ring メンテナに知らせてください。"

diff --git a/po4a/ja/index.po b/po4a/ja/index.po
index dde6c388d42db5397f5a26b4baf6b298793102f6..ce2b194eef91666c6cccb133c74bc56b77bc125d 100644 (file)
--- a/po4a/ja/index.po
+++ b/po4a/ja/index.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.3.9\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: developers-reference 3.3.9\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-03-05 18:02+0900\n"
+"POT-Creation-Date: 2008-06-14 14:14+0900\n"

 "PO-Revision-Date: 2007-07-16 20:04+0000\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
 "PO-Revision-Date: 2007-07-16 20:04+0000\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"


@@ -27,14 +27,15 @@ msgstr "Debian 開発者リファレンス"
 
 # type: Content of: <book><bookinfo>
 #: index.dbk:11
 
 # type: Content of: <book><bookinfo>
 #: index.dbk:11

+#, fuzzy

 msgid ""
 msgid ""

-"<author> <othername>Developer's Reference Team</othername> <email>&email-"
-"devel-ref;</email> </author> <author> <firstname>Andreas</firstname> "
-"<surname>Barth</surname> </author> <author> <firstname>Adam</firstname> "
-"<surname>Di Carlo</surname> </author> <author> <firstname>Raphaël</"
-"firstname> <surname>Hertzog</surname> </author> <author> "
-"<firstname>Christian</firstname> <surname>Schwarz</surname> </author> "
-"<author> <firstname>Ian</firstname> <surname>Jackson</surname> </author>"
+"<author> <othername>Developer's Reference Team</othername> &email-devel-ref; "
+"</author> <author> <firstname>Andreas</firstname> <surname>Barth</surname> </"
+"author> <author> <firstname>Adam</firstname> <surname>Di Carlo</surname> </"
+"author> <author> <firstname>Raphaël</firstname> <surname>Hertzog</surname> </"
+"author> <author> <firstname>Christian</firstname> <surname>Schwarz</surname> "
+"</author> <author> <firstname>Ian</firstname> <surname>Jackson</surname> </"
+"author>"

 msgstr ""
 "<author> <othername>Developer's Reference Team</othername> <email>&email-"
 "devel-ref;</email> </author> <author> <firstname>Andreas</firstname> "
 msgstr ""
 "<author> <othername>Developer's Reference Team</othername> <email>&email-"
 "devel-ref;</email> </author> <author> <firstname>Andreas</firstname> "

diff --git a/po4a/ja/l10n.po b/po4a/ja/l10n.po
index 3b257f8e7b90f9f1b3b86177e60ec72ff740a24b..a22088ee4d2784cbc3e3a5379f8b2ba49789a096 100644 (file)
--- a/po4a/ja/l10n.po
+++ b/po4a/ja/l10n.po
@@ -1,24 +1,23 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
-#, fuzzy
+# Debian Developer's Reference (Japanese)
+# (C) Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2008.
+#

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

-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-07-01 21:18+0000\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"
+"Project-Id-Version: developers-reference 3.4.1\n"
+"POT-Creation-Date: 2008-06-14 23:00+0900\n"
+"PO-Revision-Date: 2008-07-04 04:27+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"

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

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

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

+"国際化、翻訳、国際化されること、翻訳されること"

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


@@ -38,7 +37,7 @@ msgid ""
 "\">Introduction to i18n</ulink> from Tomohiro KUBOTA, I18N "
 "(internationalization) means modification of a software or related "
 "technologies so that a software can potentially handle multiple languages, "
 "\">Introduction to i18n</ulink> from Tomohiro KUBOTA, I18N "
 "(internationalization) means modification of a software or related "
 "technologies so that a software can potentially handle multiple languages, "

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

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


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

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

 "has to be done manually."
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 #: l10n.dbk:40
 msgid "How translations are handled within Debian"
 "has to be done manually."
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 #: l10n.dbk:40
 msgid "How translations are handled within Debian"

-msgstr ""
+msgstr "どの様にして Debian では翻訳が取り扱われているか"

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


@@ -150,7 +149,7 @@ msgstr ""
 # type: Content of: <chapter><section><title>
 #: l10n.dbk:98
 msgid "I18N &amp; L10N FAQ for maintainers"
 # type: Content of: <chapter><section><title>
 #: l10n.dbk:98
 msgid "I18N &amp; L10N FAQ for maintainers"

-msgstr ""
+msgstr "メンテナへの I18N &amp; L10N FAQ"

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


@@ -189,7 +188,7 @@ msgstr ""
 # type: Content of: <chapter><section><section><title>
 #: l10n.dbk:124
 msgid "How to get a given translation reviewed"
 # type: Content of: <chapter><section><section><title>
 #: l10n.dbk:124
 msgid "How to get a given translation reviewed"

-msgstr ""
+msgstr "どの様にして提供された翻訳をレビューするか"

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


@@ -205,7 +204,7 @@ msgstr ""
 # type: Content of: <chapter><section><section><title>
 #: l10n.dbk:136
 msgid "How to get a given translation updated"
 # type: Content of: <chapter><section><section><title>
 #: l10n.dbk:136
 msgid "How to get a given translation updated"

-msgstr ""
+msgstr "どの様にして提供された翻訳を更新するか"

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


@@ -236,7 +235,7 @@ msgstr ""
 # type: Content of: <chapter><section><section><title>
 #: l10n.dbk:157
 msgid "How to handle a bug report concerning a translation"
 # type: Content of: <chapter><section><section><title>
 #: l10n.dbk:157
 msgid "How to handle a bug report concerning a translation"

-msgstr ""
+msgstr "どの様にして翻訳関連のバグ報告を取り扱うか"

 
 # type: Content of: <chapter><section><section><para>
 #.  TODO: add the i18n tag to the bug? 
 
 # type: Content of: <chapter><section><section><para>
 #.  TODO: add the i18n tag to the bug? 


@@ -250,7 +249,7 @@ msgstr ""
 # type: Content of: <chapter><section><title>
 #: l10n.dbk:169
 msgid "I18N &amp; L10N FAQ for translators"
 # type: Content of: <chapter><section><title>
 #: l10n.dbk:169
 msgid "I18N &amp; L10N FAQ for translators"

-msgstr ""
+msgstr "翻訳者への I18N &amp; L10N FAQ"

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


@@ -263,7 +262,7 @@ msgstr ""
 # type: Content of: <chapter><section><section><title>
 #: l10n.dbk:176
 msgid "How to help the translation effort"
 # type: Content of: <chapter><section><section><title>
 #: l10n.dbk:176
 msgid "How to help the translation effort"

-msgstr ""
+msgstr "どの様にして翻訳作業を支援するか"

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


@@ -277,7 +276,7 @@ msgstr ""
 # type: Content of: <chapter><section><section><title>
 #: l10n.dbk:186
 msgid "How to provide a translation for inclusion in a package"
 # type: Content of: <chapter><section><section><title>
 #: l10n.dbk:186
 msgid "How to provide a translation for inclusion in a package"

-msgstr ""
+msgstr "どの様にして提供した翻訳をパッケージに含めてもらうか"

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


@@ -300,7 +299,7 @@ msgstr ""
 # type: Content of: <chapter><section><title>
 #: l10n.dbk:204
 msgid "Best current practice concerning l10n"
 # type: Content of: <chapter><section><title>
 #: l10n.dbk:204
 msgid "Best current practice concerning l10n"

-msgstr ""
+msgstr "l10n に関する現状でのベストプラクティス"

 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #: l10n.dbk:208
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #: l10n.dbk:208

diff --git a/po4a/ja/new-maintainer.po b/po4a/ja/new-maintainer.po
index c50e06d12807e275c15441a7bc5ec0398c634c92..0d7d41cd5cd5005d1f201074fa1329400466b60a 100644 (file)
--- a/po4a/ja/new-maintainer.po
+++ b/po4a/ja/new-maintainer.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.3.9\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: developers-reference 3.3.9\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-03-05 18:02+0900\n"
+"POT-Creation-Date: 2008-06-14 14:15+0900\n"

 "PO-Revision-Date: 2007-08-02 22:30+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
 "PO-Revision-Date: 2007-08-02 22:30+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"


@@ -45,7 +45,7 @@ msgstr ""
 #: new-maintainer.dbk:19
 msgid ""
 "Firstly, subscribe to &email-debian-devel; if you haven't already.  Send the "
 #: new-maintainer.dbk:19
 msgid ""
 "Firstly, subscribe to &email-debian-devel; if you haven't already.  Send the "

-"word <literal>subscribe</literal> in the <emphasis>Subject</emphasis> of an "
+"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-"
 "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-"


@@ -53,11 +53,11 @@ msgid ""
 "follow Debian's development."
 msgstr ""
 "まず始めに、まだであれば &email-debian-devel; を購読しましょう。"
 "follow Debian's development."
 msgstr ""
 "まず始めに、まだであれば &email-debian-devel; を購読しましょう。"

-"<literal>subscribe</literal> という単語を<emphasis>サブジェクト</emphasis>に"
+"<literal>subscribe</literal> という単語を<literal>サブジェクト</literal>に"

 "書いた &email-debian-devel-req; へのメールを送ってください。何か問題がある場"
 "合は、&email-listmaster; のメーリングリスト管理者に確認をとりましょう。メーリ"
 "ングリストについての詳しい情報は <xref linkend=\"mailing-lists\"/> で見つけら"
 "書いた &email-debian-devel-req; へのメールを送ってください。何か問題がある場"
 "合は、&email-listmaster; のメーリングリスト管理者に確認をとりましょう。メーリ"
 "ングリストについての詳しい情報は <xref linkend=\"mailing-lists\"/> で見つけら"

-"ã\82\8cã\81¾ã\81\99ã\80\82ã\81\9dã\82\8cã\81\8bã\82\89 &email-debian-devel-announce; は、Debian の開発に携わりたい"
+"ã\82\8cã\81¾ã\81\99ã\80\82ã\81\9dã\81\97ã\81¦ &email-debian-devel-announce; は、Debian の開発に携わりたい"

 "という人は誰でも読む義務がある、もう一つのメーリングリストです。"
 
 # type: Content of: <chapter><section><para>
 "という人は誰でも読む義務がある、もう一つのメーリングリストです。"
 
 # type: Content of: <chapter><section><para>


@@ -432,14 +432,14 @@ msgstr ""
 #: new-maintainer.dbk:198
 msgid ""
 "To apply as a new maintainer, you need an existing Debian Developer to "
 #: new-maintainer.dbk:198
 msgid ""
 "To apply as a new maintainer, you need an existing Debian Developer to "

-"support your application (an <emphasis>advocate</emphasis>).  After you have "
+"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 ""
 "新規メンテナの応募をするのであれば、既存の Debian 開発者にあなたの応募をサ"
 "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 ""
 "新規メンテナの応募をするのであれば、既存の Debian 開発者にあなたの応募をサ"

-"ポートしてもらう (<emphasis>支持者 (Advocate)</emphasis> になってもらう) 必要"
+"ポートしてもらう (<literal>支持者 (Advocate)</literal> になってもらう) 必要"

 "があります。ある程度の期間 Debian に対して貢献を行った後で、登録された開発者"
 "になるために応募をしたい場合、過去何ヶ月かに渡って一緒に作業をした既存の開発"
 "者に、あなたが Debian に間違いなく貢献できることを信じている旨を表明してもら"
 "があります。ある程度の期間 Debian に対して貢献を行った後で、登録された開発者"
 "になるために応募をしたい場合、過去何ヶ月かに渡って一緒に作業をした既存の開発"
 "者に、あなたが Debian に間違いなく貢献できることを信じている旨を表明してもら"


@@ -457,8 +457,8 @@ msgid ""
 "steps of the New Maintainer process.  You can always check your status on "
 "the <ulink url=\"&url-newmaint-db;\">applications status board</ulink>."
 msgstr ""
 "steps of the New Maintainer process.  You can always check your status on "
 "the <ulink url=\"&url-newmaint-db;\">applications status board</ulink>."
 msgstr ""

-"advocate を見つけ、GnuPG 鍵に署名をしてもらい、既にある程度の間 Debian に対し"
-"て貢献的な作業をしているのであれば、応募の準備は完了です。すぐに <ulink url="
+"支持者 (Advocate) を見つけ、GnuPG 鍵に署名をしてもらい、既にある程度の間 Debian "
+"ã\81«å¯¾ã\81\97ã\81¦è²¢ç\8c®ç\9a\84ã\81ªä½\9c業ã\82\92ã\81\97ã\81¦ã\81\84ã\82\8bã\81®ã\81§ã\81\82ã\82\8cã\81°ã\80\81å¿\9cå\8b\9fã\81®æº\96å\82\99ã\81¯å®\8cäº\86ã\81§ã\81\99ã\80\82ã\81\99ã\81\90ã\81« <ulink url="

 "\"&url-newmaint-apply;\">応募のページ</ulink>で登録できます。登録後、支持者 "
 "(Advocate) はあなたの応募に関してその意志を確認をする必要があります。支持者が"
 "この手順を完了すると応募管理者 (Application Manager) に割り当てられます。応募"
 "\"&url-newmaint-apply;\">応募のページ</ulink>で登録できます。登録後、支持者 "
 "(Advocate) はあなたの応募に関してその意志を確認をする必要があります。支持者が"
 "この手順を完了すると応募管理者 (Application Manager) に割り当てられます。応募"

diff --git a/po4a/ja/pkgs.po b/po4a/ja/pkgs.po
index 33af47f9351adc4b0b7c1b0cd28621db7423bc24..562345e72fc443a2415870e051c718da2e7a7f26 100644 (file)
--- a/po4a/ja/pkgs.po
+++ b/po4a/ja/pkgs.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.3.9\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.3.9\n"

-"POT-Creation-Date: 2008-03-05 18:02+0900\n"
+"POT-Creation-Date: 2008-06-14 14:15+0900\n"

 "PO-Revision-Date: 2008-03-05 18:30+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
 "PO-Revision-Date: 2008-03-05 18:30+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"


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

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

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

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

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


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

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

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


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

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

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

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

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


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

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

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

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

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

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

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

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

 msgid ""
 msgid ""

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

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

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

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

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

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

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

 msgid "Recording changes in the package"
 msgstr "パッケージの変更を記録する"
 
 # type: Content of: <chapter><section><para>
 msgid "Recording changes in the package"
 msgstr "パッケージの変更を記録する"
 
 # type: Content of: <chapter><section><para>

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

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


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

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

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

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

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

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

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


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

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

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

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

 #, fuzzy, no-wrap
 msgid ""
 "\n"
 #, fuzzy, no-wrap
 msgid ""
 "\n"


@@ -190,7 +192,7 @@ msgid ""
 msgstr "* new upstream version"
 
 # type: Content of: <chapter><section><para>
 msgstr "* new upstream version"
 
 # type: Content of: <chapter><section><para>

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

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


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

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

 msgid "See also <xref linkend=\"bpp-debian-changelog\"/> ."
 msgstr "<xref linkend=\"bpp-debian-changelog\"/> も参照してください。"
 
 # type: Content of: <chapter><section><title>
 msgid "See also <xref linkend=\"bpp-debian-changelog\"/> ."
 msgstr "<xref linkend=\"bpp-debian-changelog\"/> も参照してください。"
 
 # type: Content of: <chapter><section><title>

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

 msgid "Testing the package"
 msgstr "パッケージをテストする"
 
 # type: Content of: <chapter><section><para>
 msgid "Testing the package"
 msgstr "パッケージをテストする"
 
 # type: Content of: <chapter><section><para>

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

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


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

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

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


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

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

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


@@ -236,41 +238,41 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

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

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

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

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

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

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

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

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

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

 #, fuzzy
 msgid "Remove the package, then reinstall it."
 msgstr "パッケージを削除して、再インストールしてください。"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "Remove the package, then reinstall it."
 msgstr "パッケージを削除して、再インストールしてください。"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

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

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


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

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

 #, fuzzy
 msgid "Layout of the source package"
 msgstr "ソースパッケージの構造"
 
 # type: Content of: <chapter><section><para>
 #, fuzzy
 msgid "Layout of the source package"
 msgstr "ソースパッケージの構造"
 
 # type: Content of: <chapter><section><para>

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

 msgid "There are two types of Debian source packages:"
 msgstr "Debian のソースパッケージには 2 種類あります："
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "There are two types of Debian source packages:"
 msgstr "Debian のソースパッケージには 2 種類あります："
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

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

 msgid ""
 msgid ""

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

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

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

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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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

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

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


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

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

 msgid ""
 msgid ""

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

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

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

 msgid ""
 msgid ""

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

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

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

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

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

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

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

 msgid ""
 msgid ""

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

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

-"archive.  From there, it will be included in <emphasis>stable</emphasis> "
-"with the next point release."
+"archive.  From there, it will be included in <literal>stable</literal> with "
+"the next point release."

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

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

 msgid ""
 msgid ""

-"Extra care should be taken when uploading to <emphasis>stable</emphasis>.  "
-"Basically, a package should only be uploaded to stable if one of the "
-"following happens:"
+"To ensure that your upload will be accepted, you should discuss the changes "
+"with the stable release team before you upload. For that, send a mail to the "
+"&email-debian-release; mailing list, including the patch you want to apply "
+"to the package version currently in <literal>stable</literal>. Always be "
+"verbose and detailed in your changelog entries for uploads to the "
+"<literal>stable</literal> distribution."
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:310
+msgid ""
+"Extra care should be taken when uploading to <literal>stable</literal>.  "
+"Basically, a package should only be uploaded to <literal>stable</literal> if "
+"one of the following happens:"

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

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

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

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

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

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

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

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

 msgid ""
 msgid ""

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

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

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

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

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

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

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

 msgid ""
 msgid ""

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

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

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

 msgid ""
 msgid ""

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

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

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

 msgid ""
 msgid ""

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

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

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

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

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

 msgid "Uploading a package"
 msgstr "パッケージをアップロードする"
 
 # type: Content of: <chapter><section><section><title>
 msgid "Uploading a package"
 msgstr "パッケージをアップロードする"
 
 # type: Content of: <chapter><section><section><title>

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

 msgid "Uploading to <literal>ftp-master</literal>"
 msgstr "<literal>ftp-master</literal> にアップロードする"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Uploading to <literal>ftp-master</literal>"
 msgstr "<literal>ftp-master</literal> にアップロードする"
 
 # type: Content of: <chapter><section><section><para>

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

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

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

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

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

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


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

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

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


@@ -539,32 +547,33 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

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

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

-#: pkgs.dbk:395
+#: pkgs.dbk:403

 msgid "Delayed uploads"
 msgstr "遅延アップロード"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Delayed uploads"
 msgstr "遅延アップロード"
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 msgid ""

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

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

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

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

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

 #, fuzzy, no-wrap
 msgid ""
 "\n"
 #, fuzzy, no-wrap
 msgid ""
 "\n"


@@ -579,55 +588,58 @@ msgstr ""
 "incoming = ~tfheen"
 
 # type: Content of: <chapter><section><section><para>
 "incoming = ~tfheen"
 
 # type: Content of: <chapter><section><section><para>

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

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

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

 msgid ""
 msgid ""

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

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

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

 msgid "Security uploads"
 msgstr "セキュリティアップロード"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Security uploads"
 msgstr "セキュリティアップロード"
 
 # type: Content of: <chapter><section><section><para>

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

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

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

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

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

 msgid "Other upload queues"
 msgstr "他のアップロードキュー"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Other upload queues"
 msgstr "他のアップロードキュー"
 
 # type: Content of: <chapter><section><section><para>

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

 msgid ""
 msgid ""

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

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

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

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

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

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


@@ -635,34 +647,26 @@ msgid ""
 "debian.or.jp some day."
 msgstr ""
 
 "debian.or.jp some day."
 msgstr ""
 

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

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

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

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

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

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

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

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

-#: pkgs.dbk:467
+#: pkgs.dbk:474

 msgid ""
 "In any case, you will receive an email notification indicating that the "
 "package has been added to the archive, which also indicates which bugs will "
 msgid ""
 "In any case, you will receive an email notification indicating that the "
 "package has been added to the archive, which also indicates which bugs will "


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

-#: pkgs.dbk:473
+#: pkgs.dbk:480

 msgid ""
 "The installation notification also includes information on what section the "
 "package was inserted into.  If there is a disparity, you will receive a "
 msgid ""
 "The installation notification also includes information on what section the "
 "package was inserted into.  If there is a disparity, you will receive a "


@@ -679,19 +683,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:478
+#: pkgs.dbk:485

 msgid ""
 "Note that if you upload via queues, the queue daemon software will also send "
 "you a notification by email."
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgid ""
 "Note that if you upload via queues, the queue daemon software will also send "
 "you a notification by email."
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: pkgs.dbk:486
+#: pkgs.dbk:493

 msgid "Specifying the package section, subsection and priority"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "Specifying the package section, subsection and priority"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:488
+#: pkgs.dbk:495

 msgid ""
 "The <filename>debian/control</filename> file's <literal>Section</literal> "
 "and <literal>Priority</literal> fields do not actually specify where the "
 msgid ""
 "The <filename>debian/control</filename> file's <literal>Section</literal> "
 "and <literal>Priority</literal> fields do not actually specify where the "


@@ -702,20 +706,20 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:496
+#: pkgs.dbk:503

 msgid ""
 "The archive maintainers keep track of the canonical sections and priorities "
 msgid ""
 "The archive maintainers keep track of the canonical sections and priorities "

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

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

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

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

-#: pkgs.dbk:506
+#: pkgs.dbk:513

 msgid ""
 "To alter the actual section that a package is put in, you need to first make "
 "sure that the <filename>debian/control</filename> file in your package is "
 msgid ""
 "To alter the actual section that a package is put in, you need to first make "
 "sure that the <filename>debian/control</filename> file in your package is "


@@ -726,16 +730,16 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:514
+#: pkgs.dbk:521

 msgid ""
 msgid ""

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

 "<citerefentry> <refentrytitle>dpkg-scanpackages</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> and <ulink url=\"&url-bts-devel;"
 "#maintincorrect\"></ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 "<citerefentry> <refentrytitle>dpkg-scanpackages</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> and <ulink url=\"&url-bts-devel;"
 "#maintincorrect\"></ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:520
+#: pkgs.dbk:527

 msgid ""
 "Note that the <literal>Section</literal> field describes both the section as "
 "well as the subsection, which are described in <xref linkend=\"archive-"
 msgid ""
 "Note that the <literal>Section</literal> field describes both the section as "
 "well as the subsection, which are described in <xref linkend=\"archive-"


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

-#: pkgs.dbk:529
+#: pkgs.dbk:536

 msgid "Handling bugs"
 msgstr "バグの取扱い"
 
 # type: Content of: <chapter><section><para>
 msgid "Handling bugs"
 msgstr "バグの取扱い"
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:531
+#: pkgs.dbk:538

 msgid ""
 "Every developer has to be able to work with the Debian <ulink url=\"&url-bts;"
 "\">bug tracking system</ulink>.  This includes knowing how to file bug "
 msgid ""
 "Every developer has to be able to work with the Debian <ulink url=\"&url-bts;"
 "\">bug tracking system</ulink>.  This includes knowing how to file bug "


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

-#: pkgs.dbk:537
+#: pkgs.dbk:544

 msgid ""
 "The bug tracking system's features are described in the <ulink url=\"&url-"
 "bts-devel;\">BTS documentation for developers</ulink>.  This includes "
 msgid ""
 "The bug tracking system's features are described in the <ulink url=\"&url-"
 "bts-devel;\">BTS documentation for developers</ulink>.  This includes "


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

-#: pkgs.dbk:543
+#: pkgs.dbk:550

 msgid ""
 "Operations such as reassigning bugs to other packages, merging separate bug "
 "reports about the same issue, or reopening bugs when they are prematurely "
 msgid ""
 "Operations such as reassigning bugs to other packages, merging separate bug "
 "reports about the same issue, or reopening bugs when they are prematurely "


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

-#: pkgs.dbk:551
+#: pkgs.dbk:558

 msgid "Monitoring bugs"
 msgstr "バグの監視"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Monitoring bugs"
 msgstr "バグの監視"
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:553
+#: pkgs.dbk:560

 msgid ""
 "If you want to be a good maintainer, you should periodically check the "
 "<ulink url=\"&url-bts;\">Debian bug tracking system (BTS)</ulink> for your "
 msgid ""
 "If you want to be a good maintainer, you should periodically check the "
 "<ulink url=\"&url-bts;\">Debian bug tracking system (BTS)</ulink> for your "


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

-#: pkgs.dbk:560
+#: pkgs.dbk:567

 msgid ""
 "Maintainers interact with the BTS via email addresses at <literal>&bugs-host;"
 "</literal>.  Documentation on available commands can be found at <ulink url="
 msgid ""
 "Maintainers interact with the BTS via email addresses at <literal>&bugs-host;"
 "</literal>.  Documentation on available commands can be found at <ulink url="


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

-#: pkgs.dbk:567
+#: pkgs.dbk:574

 msgid ""
 "Some find it useful to get periodic reports on open bugs.  You can add a "
 "cron job such as the following if you want to get a weekly email outlining "
 msgid ""
 "Some find it useful to get periodic reports on open bugs.  You can add a "
 "cron job such as the following if you want to get a weekly email outlining "


@@ -811,7 +815,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

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

 #, no-wrap
 msgid ""
 "\n"
 #, no-wrap
 msgid ""
 "\n"


@@ -820,19 +824,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:576
+#: pkgs.dbk:583

 msgid ""
 "Replace <replaceable>address</replaceable> with your official Debian "
 "maintainer address."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "Replace <replaceable>address</replaceable> with your official Debian "
 "maintainer address."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:582
+#: pkgs.dbk:589

 msgid "Responding to bugs"
 msgstr "バグへの対応"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Responding to bugs"
 msgstr "バグへの対応"
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:584
+#: pkgs.dbk:591

 msgid ""
 "When responding to bugs, make sure that any discussion you have about bugs "
 "is sent both to the original submitter of the bug, and to the bug itself (e."
 msgid ""
 "When responding to bugs, make sure that any discussion you have about bugs "
 "is sent both to the original submitter of the bug, and to the bug itself (e."


@@ -844,24 +848,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:593
+#: pkgs.dbk:600

 msgid ""
 "If you get a bug which mentions FTBFS, this means Fails to build from "
 "source.  Porters frequently use this acronym."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "If you get a bug which mentions FTBFS, this means Fails to build from "
 "source.  Porters frequently use this acronym."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:597
+#: pkgs.dbk:604

 msgid ""
 "Once you've dealt with a bug report (e.g.  fixed it), mark it as "
 msgid ""
 "Once you've dealt with a bug report (e.g.  fixed it), mark it as "

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

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

-#: pkgs.dbk:604
+#: pkgs.dbk:611

 msgid ""
 "You should <emphasis>never</emphasis> close bugs via the bug server "
 "<literal>close</literal> command sent to &email-bts-control;.  If you do so, "
 msgid ""
 "You should <emphasis>never</emphasis> close bugs via the bug server "
 "<literal>close</literal> command sent to &email-bts-control;.  If you do so, "


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

-#: pkgs.dbk:612
+#: pkgs.dbk:619

 msgid "Bug housekeeping"
 msgstr "バグを掃除する"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Bug housekeeping"
 msgstr "バグを掃除する"
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:614
+#: pkgs.dbk:621

 msgid ""
 "As a package maintainer, you will often find bugs in other packages or have "
 "bugs reported against your packages which are actually bugs in other "
 msgid ""
 "As a package maintainer, you will often find bugs in other packages or have "
 "bugs reported against your packages which are actually bugs in other "


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

-#: pkgs.dbk:625
+#: pkgs.dbk:632

 msgid ""
 "Filing bugs for problems that you find in other packages is one of the civic "
 "obligations of maintainership, see <xref linkend=\"submit-bug\"/> for "
 msgid ""
 "Filing bugs for problems that you find in other packages is one of the civic "
 "obligations of maintainership, see <xref linkend=\"submit-bug\"/> for "


@@ -897,12 +901,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:630
+#: pkgs.dbk:637

 msgid "Here's a list of steps that you may follow to handle a bug report:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgid "Here's a list of steps that you may follow to handle a bug report:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:635
+#: pkgs.dbk:642

 msgid ""
 "Decide whether the report corresponds to a real bug or not.  Sometimes users "
 "are just calling a program in the wrong way because they haven't read the "
 msgid ""
 "Decide whether the report corresponds to a real bug or not.  Sometimes users "
 "are just calling a program in the wrong way because they haven't read the "


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

-#: pkgs.dbk:645
+#: pkgs.dbk:652

 msgid ""
 "If the bug submitter disagrees with your decision to close the bug, they may "
 "reopen it until you find an agreement on how to handle it.  If you don't "
 msgid ""
 "If the bug submitter disagrees with your decision to close the bug, they may "
 "reopen it until you find an agreement on how to handle it.  If you don't "


@@ -930,18 +934,33 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:659
+#: pkgs.dbk:666

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

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

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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

 msgid ""
 msgid ""

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

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

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

 msgid "When bugs are closed by new uploads"
 msgstr "新規アップロードでバグがクローズされる時"
 
 # type: Content of: <chapter><section><section><para>
 msgid "When bugs are closed by new uploads"
 msgstr "新規アップロードでバグがクローズされる時"
 
 # type: Content of: <chapter><section><section><para>

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

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


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

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

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


@@ -1034,7 +1053,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

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

 #, fuzzy, no-wrap
 msgid ""
 "\n"
 #, fuzzy, no-wrap
 msgid ""
 "\n"


@@ -1053,14 +1072,14 @@ msgstr ""
 "  * Added man page. Closes: #98725."
 
 # type: Content of: <chapter><section><section><para>
 "  * Added man page. Closes: #98725."
 
 # type: Content of: <chapter><section><section><para>

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

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

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

 #, fuzzy, no-wrap
 msgid ""
 "\n"
 #, fuzzy, no-wrap
 msgid ""
 "\n"


@@ -1068,7 +1087,7 @@ msgid ""
 msgstr "/closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig"
 
 # type: Content of: <chapter><section><section><para>
 msgstr "/closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig"
 
 # type: Content of: <chapter><section><section><para>

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

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


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

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

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


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

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

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


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

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

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


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

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

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

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

 msgid "Handling security-related bugs"
 msgstr "セキュリティ関連バグの取扱い"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Handling security-related bugs"
 msgstr "セキュリティ関連バグの取扱い"
 
 # type: Content of: <chapter><section><section><para>

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

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

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

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

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

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

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

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

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

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

-"testing and unstable."
+"<literal>testing</literal> and <literal>unstable</literal>."

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

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

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

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

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


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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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


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

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

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


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

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

 msgid ""
 msgid ""

-"Please note that if secrecy is needed you may not upload a fix to unstable "
-"(or anywhere else, such as a public CVS repository).  It is not sufficient "
-"to obfuscate the details of the change, as the code itself is public, and "
-"can (and will) be examined by the general public."
+"Please note that if secrecy is needed you may not upload a fix to "
+"<literal>unstable</literal> (or anywhere else, such as a public CVS "
+"repository).  It is not sufficient to obfuscate the details of the change, "
+"as the code itself is public, and can (and will) be examined by the general "
+"public."

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

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

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


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

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

 msgid "Security Advisories"
 msgstr "セキュリティ勧告"
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Security Advisories"
 msgstr "セキュリティ勧告"
 
 # type: Content of: <chapter><section><section><section><para>

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

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

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

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

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

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

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

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

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

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

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

 msgid "How it can be exploited"
 msgstr "どのようにして攻撃が可能なのか"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "How it can be exploited"
 msgstr "どのようにして攻撃が可能なのか"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

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

 msgid "Whether it is remotely or locally exploitable"
 msgstr "攻撃はリモートから可能なのかそれともローカルから可能なのか"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Whether it is remotely or locally exploitable"
 msgstr "攻撃はリモートから可能なのかそれともローカルから可能なのか"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>

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

 msgid "How the problem was fixed"
 msgstr "どのようにして問題が修正されたのか"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "How the problem was fixed"
 msgstr "どのようにして問題が修正されたのか"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

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

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

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

 msgid "Version numbers of affected packages"
 msgstr "影響を受けるパッケージのバージョン番号"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "Version numbers of affected packages"
 msgstr "影響を受けるパッケージのバージョン番号"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

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

 msgid "Version numbers of fixed packages"
 msgstr "修正されたパッケージのバージョン番号"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "Version numbers of fixed packages"
 msgstr "修正されたパッケージのバージョン番号"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

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

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

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

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


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

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

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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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

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

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

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

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

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

 msgid "The upload should have urgency=high."
 msgstr "アップロードは urgency=high で行う必要があります。"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 msgid "The upload should have urgency=high."
 msgstr "アップロードは urgency=high で行う必要があります。"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>

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

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

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

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

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

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

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

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

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

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


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

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

 msgid ""
 msgid ""

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

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

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

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


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

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

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


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

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

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

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

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

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

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

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

 msgid ""
 msgid ""

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

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

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

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


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

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

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


@@ -1555,7 +1578,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1161
+#: pkgs.dbk:1186

 msgid ""
 "Uploads which are waiting for acceptance or verification are only accessible "
 "by the security team.  This is necessary since there might be fixes for "
 msgid ""
 "Uploads which are waiting for acceptance or verification are only accessible "
 "by the security team.  This is necessary since there might be fixes for "


@@ -1563,20 +1586,21 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1166
+#: pkgs.dbk:1191

 msgid ""
 "If a member of the security team accepts a package, it will be installed on "
 msgid ""
 "If a member of the security team accepts a package, it will be installed on "

-"security.debian.org as well as proposed for the proper "
-"<replaceable>distribution</replaceable>-proposed-updates on ftp-master."
+"<literal>security.debian.org</literal> as well as proposed for the proper "
+"<replaceable>distribution</replaceable><literal>-proposed-updates</literal> "
+"on <literal>&ftp-master-host;</literal>."

 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: pkgs.dbk:1177
+#: pkgs.dbk:1203

 msgid "Moving, removing, renaming, adopting, and orphaning packages"
 msgstr "パッケージの移動、削除、リネーム、変更、みなしご化"
 
 # type: Content of: <chapter><section><para>
 msgid "Moving, removing, renaming, adopting, and orphaning packages"
 msgstr "パッケージの移動、削除、リネーム、変更、みなしご化"
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:1179
+#: pkgs.dbk:1205

 msgid ""
 "Some archive manipulation operations are not automated in the Debian upload "
 "process.  These procedures should be manually followed by maintainers.  This "
 msgid ""
 "Some archive manipulation operations are not automated in the Debian upload "
 "process.  These procedures should be manually followed by maintainers.  This "


@@ -1584,12 +1608,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1184
+#: pkgs.dbk:1210

 msgid "Moving packages"
 msgstr "パッケージの移動"
 
 # type: Content of: <chapter><section><section><para><footnote>
 msgid "Moving packages"
 msgstr "パッケージの移動"
 
 # type: Content of: <chapter><section><section><para><footnote>

-#: pkgs.dbk:1186
+#: pkgs.dbk:1212

 msgid ""
 "Sometimes a package will change its section.  For instance, a package from "
 "the `non-free' section might be GPL'd in a later version, in which case the "
 msgid ""
 "Sometimes a package will change its section.  For instance, a package from "
 "the `non-free' section might be GPL'd in a later version, in which case the "


@@ -1597,19 +1621,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para><footnote><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para><footnote><para>

-#: pkgs.dbk:1188
+#: pkgs.dbk:1214

 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "guidelines on what section a package belongs in."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "guidelines on what section a package belongs in."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1190 pkgs.dbk:1576
+#: pkgs.dbk:1216 pkgs.dbk:1648

 msgid "</footnote>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "</footnote>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1193
+#: pkgs.dbk:1219

 msgid ""
 "If you need to change the section for one of your packages, change the "
 "package control information to place the package in the desired section, and "
 msgid ""
 "If you need to change the section for one of your packages, change the "
 "package control information to place the package in the desired section, and "


@@ -1623,38 +1647,63 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1205
+#: pkgs.dbk:1231

 msgid ""
 msgid ""

-"If, on the other hand, you need to change the <emphasis>subsection</"
-"emphasis> of one of your packages (e.g., ``devel'', ``admin''), the "
-"procedure is slightly different.  Correct the subsection as found in the "
-"control file of the package, and re-upload that.  Also, you'll need to get "
-"the override file updated, as described in <xref linkend=\"override-file\"/"
-"> ."
+"If, on the other hand, you need to change the <literal>subsection</literal> "
+"of one of your packages (e.g., ``devel'', ``admin''), the procedure is "
+"slightly different.  Correct the subsection as found in the control file of "
+"the package, and re-upload that.  Also, you'll need to get the override file "
+"updated, as described in <xref linkend=\"override-file\"/> ."

 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1214
+#: pkgs.dbk:1240

 msgid "Removing packages"
 msgstr "パッケージの削除"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Removing packages"
 msgstr "パッケージの削除"
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1216
+#: pkgs.dbk:1242

 msgid ""
 "If for some reason you want to completely remove a package (say, if it is an "
 "old compatibility library which is no longer required), you need to file a "
 "bug against <literal>ftp.debian.org</literal> asking that the package be "
 msgid ""
 "If for some reason you want to completely remove a package (say, if it is an "
 "old compatibility library which is no longer required), you need to file a "
 "bug against <literal>ftp.debian.org</literal> asking that the package be "

-"removed; as all bugs, this bug should normally have normal severity.  Make "
-"sure you indicate which distribution the package should be removed from.  "
-"Normally, you can only have packages removed from <emphasis>unstable</"
-"emphasis> and <emphasis>experimental</emphasis>.  Packages are not removed "
-"from <emphasis>testing</emphasis> directly.  Rather, they will be removed "
-"automatically after the package has been removed from <emphasis>unstable</"
-"emphasis> and no package in <emphasis>testing</emphasis> depends on it."
+"removed; as all bugs, this bug should normally have normal severity.  The "
+"bug title should be in the form <literal>RM: <replaceable>package </"
+"replaceable> <replaceable>[architecture list]</replaceable> -- "
+"<replaceable>reason</replaceable></literal>, where <replaceable>package</"
+"replaceable> is the package to be removed and <replaceable>reason</"
+"replaceable> is a short summary of the reason for the removal request.  "
+"<replaceable>[architecture list]</replaceable> is optional and only needed "
+"if the removal request only applies to some architectures, not all. Note "
+"that the <command>reportbug</command> will create a title conforming to "
+"these rules when you use it to report a bug against the <literal> ftp.debian."
+"org</literal> pseudo-package."
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1259
+msgid ""
+"If you want to remove a package you maintain, you should note this in the "
+"bug title by prepending <literal>ROM</literal> (Request Of Maintainer).  "
+"There are several other standard acronyms used in the reasoning for a "
+"package removal, see <ulink url=\"http://&ftp-master-host;/removals.html\"></"
+"ulink> for a complete list. That page also provides a convenient overview of "
+"pending removal requests."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1229
+#: pkgs.dbk:1268
+msgid ""
+"Note that removals can only be done for the <literal>unstable </literal>, "
+"<literal>experimental</literal> and <literal>stable </literal> "
+"distribution.  Packages are not removed from <literal>testing</literal> "
+"directly.  Rather, they will be removed automatically after the package has "
+"been removed from <literal>unstable</literal> and no package in "
+"<literal>testing </literal> depends on it."
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1277

 msgid ""
 "There is one exception when an explicit removal request is not necessary: If "
 "a (source or binary) package is an orphan, it will be removed semi-"
 msgid ""
 "There is one exception when an explicit removal request is not necessary: If "
 "a (source or binary) package is an orphan, it will be removed semi-"


@@ -1666,7 +1715,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1238
+#: pkgs.dbk:1286

 msgid ""
 "In your removal request, you have to detail the reasons justifying the "
 "request.  This is to avoid unwanted removals and to keep a trace of why a "
 msgid ""
 "In your removal request, you have to detail the reasons justifying the "
 "request.  This is to avoid unwanted removals and to keep a trace of why a "


@@ -1675,15 +1724,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1244
+#: pkgs.dbk:1292

 msgid ""
 "Usually you only ask for the removal of a package maintained by yourself.  "
 "If you want to remove another package, you have to get the approval of its "
 msgid ""
 "Usually you only ask for the removal of a package maintained by yourself.  "
 "If you want to remove another package, you have to get the approval of its "

-"maintainer."
+"maintainer. Should the package be orphaned and thus have no maintainer, you "
+"should first discuss the removal request on &email-debian-qa;. If there is a "
+"consensus that the package should be removed, you should reassign and "
+"retitle the <literal>O:</literal> bug filed against the <literal>wnpp</"
+"literal> package instead of filing a new bug as removal request."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1249
+#: pkgs.dbk:1302

 msgid ""
 "Further information relating to these and other package removal related "
 "topics may be found at <ulink url=\"http://wiki.debian.org/ftpmaster_Removals"
 msgid ""
 "Further information relating to these and other package removal related "
 "topics may be found at <ulink url=\"http://wiki.debian.org/ftpmaster_Removals"


@@ -1691,7 +1744,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1254
+#: pkgs.dbk:1307

 msgid ""
 "If in doubt concerning whether a package is disposable, email &email-debian-"
 "devel; asking for opinions.  Also of interest is the <command>apt-cache</"
 msgid ""
 "If in doubt concerning whether a package is disposable, email &email-debian-"
 "devel; asking for opinions.  Also of interest is the <command>apt-cache</"


@@ -1700,12 +1753,13 @@ msgid ""
 "replaceable></literal>, the program will show details for "
 "<replaceable>package</replaceable>, including reverse depends.  Other useful "
 "programs include <literal>apt-cache rdepends</literal>, <command>apt-"
 "replaceable></literal>, the program will show details for "
 "<replaceable>package</replaceable>, including reverse depends.  Other useful "
 "programs include <literal>apt-cache rdepends</literal>, <command>apt-"

-"rdepends</command> and <command>grep-dctrl</command>.  Removal of orphaned "
-"packages is discussed on &email-debian-qa;."
+"rdepends</command>, <command>build-rdeps</command> (in the <systemitem role="
+"\"package\">devscripts</systemitem> package) and <command>grep-dctrl</"
+"command>.  Removal of orphaned packages is discussed on &email-debian-qa;."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1265
+#: pkgs.dbk:1320

 msgid ""
 "Once the package has been removed, the package's bugs should be handled.  "
 "They should either be reassigned to another package in the case where the "
 msgid ""
 "Once the package has been removed, the package's bugs should be handled.  "
 "They should either be reassigned to another package in the case where the "


@@ -1715,44 +1769,49 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1272
+#: pkgs.dbk:1327

 msgid "Removing packages from <filename>Incoming</filename>"
 msgstr "<filename>Incoming</filename> からパッケージを削除する"
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Removing packages from <filename>Incoming</filename>"
 msgstr "<filename>Incoming</filename> からパッケージを削除する"
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1274
+#: pkgs.dbk:1329

 msgid ""
 "In the past, it was possible to remove packages from <filename>incoming</"
 "filename>.  However, with the introduction of the new incoming system, this "
 "is no longer possible.  Instead, you have to upload a new revision of your "
 "package with a higher version than the package you want to replace.  Both "
 "versions will be installed in the archive but only the higher version will "
 msgid ""
 "In the past, it was possible to remove packages from <filename>incoming</"
 "filename>.  However, with the introduction of the new incoming system, this "
 "is no longer possible.  Instead, you have to upload a new revision of your "
 "package with a higher version than the package you want to replace.  Both "
 "versions will be installed in the archive but only the higher version will "

-"actually be available in <emphasis>unstable</emphasis> since the previous "
+"actually be available in <literal>unstable</literal> since the previous "

 "version will immediately be replaced by the higher.  However, if you do "
 "proper testing of your packages, the need to replace a package should not "
 "occur too often anyway."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 "version will immediately be replaced by the higher.  However, if you do "
 "proper testing of your packages, the need to replace a package should not "
 "occur too often anyway."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1289
+#: pkgs.dbk:1344

 msgid "Replacing or renaming packages"
 msgstr "パッケージをリプレースあるいはリネームする"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Replacing or renaming packages"
 msgstr "パッケージをリプレースあるいはリネームする"
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1291
+#: pkgs.dbk:1346

 msgid ""
 msgid ""

-"When you make a mistake naming your package, you should follow a two-step "
-"process to rename it.  First, set your <filename>debian/control</filename> "
-"file to replace and conflict with the obsolete name of the package (see the "
-"<ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
-"details).  Once you've uploaded the package and the package has moved into "
-"the archive, file a bug against <literal>ftp.debian.org</literal> asking to "
-"remove the package with the obsolete name.  Do not forget to properly "
-"reassign the package's bugs at the same time."
+"When the upstream maintainers for one of your packages chose to rename their "
+"software (or you made a mistake naming your package), you should follow a "
+"two-step process to rename it. In the first step, change the "
+"<filename>debian/control</filename> file to reflect the new name and to "
+"replace, provide and conflict with the obsolete package name (see the <ulink "
+"url=\"&url-debian-policy;\"> Debian Policy Manual</ulink> for details).  "
+"Please note that you should only add a <literal>Provides</literal> relation "
+"if all packages depending on the obsolete package name continue to work "
+"after the renaming. Once you've uploaded the package and the package has "
+"moved into the archive, file a bug against <literal> ftp.debian.org</"
+"literal> asking to remove the package with the obsolete name (see <xref "
+"linkend=\"removing-pkgs\"/>).  Do not forget to properly reassign the "
+"package's bugs at the same time."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1301
+#: pkgs.dbk:1362

 msgid ""
 "At other times, you may make a mistake in constructing your package and wish "
 "to replace it.  The only way to do this is to increase the version number "
 msgid ""
 "At other times, you may make a mistake in constructing your package and wish "
 "to replace it.  The only way to do this is to increase the version number "


@@ -1766,12 +1825,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1315
+#: pkgs.dbk:1376

 msgid "Orphaning a package"
 msgstr "パッケージをみなしご化する"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Orphaning a package"
 msgstr "パッケージをみなしご化する"
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1317
+#: pkgs.dbk:1378

 msgid ""
 "If you can no longer maintain a package, you need to inform others, and see "
 "that the package is marked as orphaned.  You should set the package "
 msgid ""
 "If you can no longer maintain a package, you need to inform others, and see "
 "that the package is marked as orphaned.  You should set the package "


@@ -1780,7 +1839,7 @@ msgid ""
 "systemitem>.  The bug report should be titled <literal>O: "
 "<replaceable>package</replaceable> -- <replaceable>short description</"
 "replaceable></literal> indicating that the package is now orphaned.  The "
 "systemitem>.  The bug report should be titled <literal>O: "
 "<replaceable>package</replaceable> -- <replaceable>short description</"
 "replaceable></literal> indicating that the package is now orphaned.  The "

-"severity of the bug should be set to <emphasis>normal</emphasis>; if the "
+"severity of the bug should be set to <literal>normal</literal>; if the "

 "package has a priority of standard or higher, it should be set to "
 "important.  If you feel it's necessary, send a copy to &email-debian-devel; "
 "by putting the address in the X-Debbugs-CC: header of the message (no, don't "
 "package has a priority of standard or higher, it should be set to "
 "important.  If you feel it's necessary, send a copy to &email-debian-devel; "
 "by putting the address in the X-Debbugs-CC: header of the message (no, don't "


@@ -1789,18 +1848,18 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1332
+#: pkgs.dbk:1393

 msgid ""
 "If you just intend to give the package away, but you can keep maintainership "
 "for the moment, then you should instead submit a bug against <systemitem "
 "role=\"package\">wnpp</systemitem> and title it <literal>RFA: "
 "<replaceable>package</replaceable> -- <replaceable>short description</"
 msgid ""
 "If you just intend to give the package away, but you can keep maintainership "
 "for the moment, then you should instead submit a bug against <systemitem "
 "role=\"package\">wnpp</systemitem> and title it <literal>RFA: "
 "<replaceable>package</replaceable> -- <replaceable>short description</"

-"replaceable></literal>.  <literal>RFA</literal> stands for <emphasis>Request "
-"For Adoption</emphasis>."
+"replaceable></literal>.  <literal>RFA</literal> stands for <literal>Request "
+"For Adoption</literal>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1340
+#: pkgs.dbk:1401

 msgid ""
 "More information is on the <ulink url=\"&url-wnpp;\">WNPP web pages</ulink>."
 msgstr ""
 msgid ""
 "More information is on the <ulink url=\"&url-wnpp;\">WNPP web pages</ulink>."
 msgstr ""


@@ -1808,12 +1867,12 @@ msgstr ""
 "す。"
 
 # type: Content of: <chapter><section><section><title>
 "す。"
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1346
+#: pkgs.dbk:1407

 msgid "Adopting a package"
 msgstr "パッケージに変更を加える"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Adopting a package"
 msgstr "パッケージに変更を加える"
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1348
+#: pkgs.dbk:1409

 msgid ""
 "A list of packages in need of a new maintainer is available in the <ulink "
 "url=\"&url-wnpp;\">Work-Needing and Prospective Packages list (WNPP)</"
 msgid ""
 "A list of packages in need of a new maintainer is available in the <ulink "
 "url=\"&url-wnpp;\">Work-Needing and Prospective Packages list (WNPP)</"


@@ -1823,7 +1882,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1355
+#: pkgs.dbk:1416

 msgid ""
 "It is not OK to simply take over a package that you feel is neglected — that "
 "would be package hijacking.  You can, of course, contact the current "
 msgid ""
 "It is not OK to simply take over a package that you feel is neglected — that "
 "would be package hijacking.  You can, of course, contact the current "


@@ -1833,7 +1892,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1361
+#: pkgs.dbk:1422

 msgid ""
 "Generally, you may not take over the package without the assent of the "
 "current maintainer.  Even if they ignore you, that is still not grounds to "
 msgid ""
 "Generally, you may not take over the package without the assent of the "
 "current maintainer.  Even if they ignore you, that is still not grounds to "


@@ -1845,7 +1904,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1371
+#: pkgs.dbk:1432

 msgid ""
 "If you take over an old package, you probably want to be listed as the "
 "package's official maintainer in the bug system.  This will happen "
 msgid ""
 "If you take over an old package, you probably want to be listed as the "
 "package's official maintainer in the bug system.  This will happen "


@@ -1858,12 +1917,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: pkgs.dbk:1385
+#: pkgs.dbk:1446

 msgid "Porting and being ported"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "Porting and being ported"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:1387
+#: pkgs.dbk:1448

 msgid ""
 "Debian supports an ever-increasing number of architectures.  Even if you are "
 "not a porter, and you don't use any architecture but one, it is part of your "
 msgid ""
 "Debian supports an ever-increasing number of architectures.  Even if you are "
 "not a porter, and you don't use any architecture but one, it is part of your "


@@ -1872,23 +1931,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:1393
+#: pkgs.dbk:1454

 msgid ""
 "Porting is the act of building Debian packages for architectures that are "
 "different from the original architecture of the package maintainer's binary "
 "package.  It is a unique and essential activity.  In fact, porters do most "
 msgid ""
 "Porting is the act of building Debian packages for architectures that are "
 "different from the original architecture of the package maintainer's binary "
 "package.  It is a unique and essential activity.  In fact, porters do most "

-"of the actual compiling of Debian packages.  For instance, for a single "
-"<emphasis>i386</emphasis> binary package, there must be a recompile for each "
-"architecture, which amounts to &number-of-arches; more builds."
+"of the actual compiling of Debian packages.  For instance, when a maintainer "
+"uploads a (portable) source packages with binaries for the <literal>i386 </"
+"literal> architecture, it will be built for each of the other architectures, "
+"amounting to &number-of-arches; more builds."

 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1401
+#: pkgs.dbk:1463

 msgid "Being kind to porters"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Being kind to porters"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1403
+#: pkgs.dbk:1465

 msgid ""
 "Porters have a difficult and unique task, since they are required to deal "
 "with a large volume of packages.  Ideally, every source package should build "
 msgid ""
 "Porters have a difficult and unique task, since they are required to deal "
 "with a large volume of packages.  Ideally, every source package should build "


@@ -1899,7 +1959,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1411
+#: pkgs.dbk:1473

 msgid ""
 "The first and most important thing is to respond quickly to bug or issues "
 "raised by porters.  Please treat porters with courtesy, as if they were in "
 msgid ""
 "The first and most important thing is to respond quickly to bug or issues "
 "raised by porters.  Please treat porters with courtesy, as if they were in "


@@ -1909,7 +1969,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1418
+#: pkgs.dbk:1480

 msgid ""
 "By far, most of the problems encountered by porters are caused by "
 "<emphasis>packaging bugs</emphasis> in the source packages.  Here is a "
 msgid ""
 "By far, most of the problems encountered by porters are caused by "
 "<emphasis>packaging bugs</emphasis> in the source packages.  Here is a "


@@ -1917,46 +1977,49 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1425
+#: pkgs.dbk:1487

 msgid ""
 "Make sure that your <literal>Build-Depends</literal> and <literal>Build-"
 "Depends-Indep</literal> settings in <filename>debian/control</filename> are "
 "set properly.  The best way to validate this is to use the <systemitem role="
 msgid ""
 "Make sure that your <literal>Build-Depends</literal> and <literal>Build-"
 "Depends-Indep</literal> settings in <filename>debian/control</filename> are "
 "set properly.  The best way to validate this is to use the <systemitem role="

-"\"package\">debootstrap</systemitem> package to create an unstable chroot "
-"environment (see <xref linkend=\"debootstrap\"/> ).  Within that chrooted "
-"environment, install the <systemitem role=\"package\">build-essential</"
-"systemitem> package and any package dependencies mentioned in <literal>Build-"
-"Depends</literal> and/or <literal>Build-Depends-Indep</literal>.  Finally, "
-"try building your package within that chrooted environment.  These steps can "
-"be automated by the use of the <command>pbuilder</command> program which is "
-"provided by the package of the same name (see <xref linkend=\"pbuilder\"/> )."
+"\"package\">debootstrap</systemitem> package to create an <literal>unstable</"
+"literal> chroot environment (see <xref linkend=\"debootstrap\"/> ).  Within "
+"that chrooted environment, install the <systemitem role=\"package\">build-"
+"essential</systemitem> package and any package dependencies mentioned in "
+"<literal>Build-Depends</literal> and/or <literal>Build-Depends-Indep</"
+"literal>.  Finally, try building your package within that chrooted "
+"environment.  These steps can be automated by the use of the "
+"<command>pbuilder</command> program which is provided by the package of the "
+"same name (see <xref linkend=\"pbuilder\"/> )."

 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1439
+#: pkgs.dbk:1502

 msgid ""
 "If you can't set up a proper chroot, <command>dpkg-depcheck</command> may be "
 "of assistance (see <xref linkend=\"dpkg-depcheck\"/> )."
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgid ""
 "If you can't set up a proper chroot, <command>dpkg-depcheck</command> may be "
 "of assistance (see <xref linkend=\"dpkg-depcheck\"/> )."
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1443
+#: pkgs.dbk:1506

 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "instructions on setting build dependencies."
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgid ""
 "See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
 "instructions on setting build dependencies."
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1449
+#: pkgs.dbk:1512

 msgid ""
 msgid ""

-"Don't set architecture to a value other than ``all'' or ``any'' unless you "
-"really mean it.  In too many cases, maintainers don't follow the "
-"instructions in the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</"
-"ulink>.  Setting your architecture to ``i386'' is usually incorrect."
+"Don't set architecture to a value other than <literal>all</literal> or "
+"<literal>any</literal> unless you really mean it.  In too many cases, "
+"maintainers don't follow the instructions in the <ulink url=\"&url-debian-"
+"policy;\">Debian Policy Manual</ulink>.  Setting your architecture to only "
+"one architecture (such as <literal>i386</literal> or <literal>amd64</"
+"literal>) is usually incorrect."

 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1457
+#: pkgs.dbk:1522

 msgid ""
 "Make sure your source package is correct.  Do <literal>dpkg-source -x "
 "<replaceable>package</replaceable>.dsc</literal> to make sure your source "
 msgid ""
 "Make sure your source package is correct.  Do <literal>dpkg-source -x "
 "<replaceable>package</replaceable>.dsc</literal> to make sure your source "


@@ -1965,15 +2028,16 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1465
+#: pkgs.dbk:1530

 msgid ""
 "Make sure you don't ship your source package with the <filename>debian/"
 "files</filename> or <filename>debian/substvars</filename> files.  They "
 msgid ""
 "Make sure you don't ship your source package with the <filename>debian/"
 "files</filename> or <filename>debian/substvars</filename> files.  They "

-"should be removed by the `clean' target of <filename>debian/rules</filename>."
+"should be removed by the <literal>clean</literal> target of <filename>debian/"
+"rules</filename>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1473
+#: pkgs.dbk:1538

 msgid ""
 "Make sure you don't rely on locally installed or hacked configurations or "
 "programs.  For instance, you should never be calling programs in <filename>/"
 msgid ""
 "Make sure you don't rely on locally installed or hacked configurations or "
 "programs.  For instance, you should never be calling programs in <filename>/"


@@ -1983,14 +2047,16 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1482
+#: pkgs.dbk:1547

 msgid ""
 "Don't depend on the package you're building being installed already (a sub-"
 msgid ""
 "Don't depend on the package you're building being installed already (a sub-"

-"case of the above issue)."
+"case of the above issue). There are, of course, exceptions to this rule, but "
+"be aware that any case like this needs manual bootstrapping and cannot be "
+"done by automated package builders."

 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1488
+#: pkgs.dbk:1555

 msgid ""
 "Don't rely on the compiler being a certain version, if possible.  If not, "
 "then make sure your build dependencies reflect the restrictions, although "
 msgid ""
 "Don't rely on the compiler being a certain version, if possible.  If not, "
 "then make sure your build dependencies reflect the restrictions, although "


@@ -1999,22 +2065,22 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>

-#: pkgs.dbk:1496
+#: pkgs.dbk:1563

 msgid ""
 msgid ""

-"Make sure your debian/rules contains separate ``binary-arch'' and ``binary-"
-"indep'' targets, as the Debian Policy Manual requires.  Make sure that both "
-"targets work independently, that is, that you can call the target without "
-"having called the other before.  To test this, try to run <literal>dpkg-"
-"buildpackage -B</literal>."
+"Make sure your debian/rules contains separate <literal>binary-arch</literal> "
+"and <literal>binary-indep</literal> targets, as the Debian Policy Manual "
+"requires.  Make sure that both targets work independently, that is, that you "
+"can call the target without having called the other before.  To test this, "
+"try to run <command>dpkg-buildpackage -B</command>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1507
+#: pkgs.dbk:1574

 msgid "Guidelines for porter uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Guidelines for porter uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1509
+#: pkgs.dbk:1576

 msgid ""
 "If the package builds out of the box for the architecture to be ported to, "
 "you are in luck and your job is easy.  This section applies to that case; it "
 msgid ""
 "If the package builds out of the box for the architecture to be ported to, "
 "you are in luck and your job is easy.  This section applies to that case; it "


@@ -2025,7 +2091,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1517
+#: pkgs.dbk:1584

 msgid ""
 "For a porter upload, no changes are being made to the source.  You do not "
 "need to touch any of the files in the source package.  This includes "
 msgid ""
 "For a porter upload, no changes are being made to the source.  You do not "
 "need to touch any of the files in the source package.  This includes "


@@ -2033,18 +2099,18 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1522
+#: pkgs.dbk:1589

 msgid ""
 "The way to invoke <command>dpkg-buildpackage</command> is as <literal>dpkg-"
 "buildpackage -B -m<replaceable>porter-email</replaceable></literal>.  Of "
 "course, set <replaceable>porter-email</replaceable> to your email address.  "
 "This will do a binary-only build of only the architecture-dependent portions "
 msgid ""
 "The way to invoke <command>dpkg-buildpackage</command> is as <literal>dpkg-"
 "buildpackage -B -m<replaceable>porter-email</replaceable></literal>.  Of "
 "course, set <replaceable>porter-email</replaceable> to your email address.  "
 "This will do a binary-only build of only the architecture-dependent portions "

-"of the package, using the `binary-arch' target in <filename>debian/rules</"
-"filename>."
+"of the package, using the <literal>binary-arch</literal> target in "
+"<filename>debian/rules </filename>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1530
+#: pkgs.dbk:1598

 msgid ""
 "If you are working on a Debian machine for your porting efforts and you need "
 "to sign your upload locally for its acceptance in the archive, you can run "
 msgid ""
 "If you are working on a Debian machine for your porting efforts and you need "
 "to sign your upload locally for its acceptance in the archive, you can run "


@@ -2054,33 +2120,34 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1537
+#: pkgs.dbk:1605

 msgid "Recompilation or binary-only NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Recompilation or binary-only NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1539
+#: pkgs.dbk:1607

 msgid ""
 "Sometimes the initial porter upload is problematic because the environment "
 "in which the package was built was not good enough (outdated or obsolete "
 "library, bad compiler, ...).  Then you may just need to recompile it in an "
 "updated environment.  However, you have to bump the version number in this "
 "case, so that the old bad package can be replaced in the Debian archive "
 msgid ""
 "Sometimes the initial porter upload is problematic because the environment "
 "in which the package was built was not good enough (outdated or obsolete "
 "library, bad compiler, ...).  Then you may just need to recompile it in an "
 "updated environment.  However, you have to bump the version number in this "
 "case, so that the old bad package can be replaced in the Debian archive "

-"(<command>katie</command> refuses to install new packages if they don't have "
-"a version number greater than the currently available one)."
+"(<command>dak</command> refuses to install new packages if they don't have a "
+"version number greater than the currently available one)."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1548
+#: pkgs.dbk:1616

 msgid ""
 "You have to make sure that your binary-only NMU doesn't render the package "
 "uninstallable.  This could happen when a source package generates arch-"
 msgid ""
 "You have to make sure that your binary-only NMU doesn't render the package "
 "uninstallable.  This could happen when a source package generates arch-"

-"dependent and arch-independent packages that depend on each other via "
-"$(Source-Version)."
+"dependent and arch-independent packages that have inter-dependencies "
+"generated using dpkg's substitution variable <literal>$(Source-Version)  </"
+"literal>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1554
+#: pkgs.dbk:1623

 msgid ""
 "Despite the required modification of the changelog, these are called binary-"
 "only NMUs — there is no need in this case to trigger all other architectures "
 msgid ""
 "Despite the required modification of the changelog, these are called binary-"
 "only NMUs — there is no need in this case to trigger all other architectures "


@@ -2088,7 +2155,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1559
+#: pkgs.dbk:1628

 msgid ""
 "Such recompilations require special ``magic'' version numbering, so that the "
 "archive maintenance tools recognize that, even though there is a new Debian "
 msgid ""
 "Such recompilations require special ``magic'' version numbering, so that the "
 "archive maintenance tools recognize that, even though there is a new Debian "


@@ -2098,18 +2165,20 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para><footnote>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para><footnote>

-#: pkgs.dbk:1566
+#: pkgs.dbk:1635

 msgid ""
 "The ``magic'' for a recompilation-only NMU is triggered by using a suffix "
 msgid ""
 "The ``magic'' for a recompilation-only NMU is triggered by using a suffix "

-"appended to the package version number, following the form b&lt;number&gt;.  "
-"For instance, if the latest version you are recompiling against was version "
-"``2.9-3'', your NMU should carry a version of ``2.9-3+b1''.  If the latest "
-"version was ``3.4+b1'' (i.e, a native package with a previous recompilation "
-"NMU), your NMU should have a version number of ``3.4+b2''.  <footnote>"
+"appended to the package version number, following the form <literal> "
+"b<replaceable>number</replaceable></literal>.  For instance, if the latest "
+"version you are recompiling against was version <literal>2.9-3</literal>, "
+"your binary-only NMU should carry a version of <literal>2.9-3+b1</literal>.  "
+"If the latest version was <literal>3.4+b1 </literal> (i.e, a native package "
+"with a previous recompilation NMU), your binary-only NMU should have a "
+"version number of <literal>3.4+b2</literal>.  <footnote>"

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para><footnote><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para><footnote><para>

-#: pkgs.dbk:1571
+#: pkgs.dbk:1643

 msgid ""
 "In the past, such NMUs used the third-level number on the Debian part of the "
 "revision to denote their recompilation-only status; however, this syntax was "
 msgid ""
 "In the past, such NMUs used the third-level number on the Debian part of the "
 "revision to denote their recompilation-only status; however, this syntax was "


@@ -2119,7 +2188,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1579
+#: pkgs.dbk:1651

 msgid ""
 "Similar to initial porter uploads, the correct way of invoking <command>dpkg-"
 "buildpackage</command> is <literal>dpkg-buildpackage -B</literal> to only "
 msgid ""
 "Similar to initial porter uploads, the correct way of invoking <command>dpkg-"
 "buildpackage</command> is <literal>dpkg-buildpackage -B</literal> to only "


@@ -2127,12 +2196,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1586
+#: pkgs.dbk:1658

 msgid "When to do a source NMU if you are a porter"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "When to do a source NMU if you are a porter"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1588
+#: pkgs.dbk:1660

 msgid ""
 "Porters doing a source NMU generally follow the guidelines found in <xref "
 "linkend=\"nmu\"/> , just like non-porters.  However, it is expected that the "
 msgid ""
 "Porters doing a source NMU generally follow the guidelines found in <xref "
 "linkend=\"nmu\"/> , just like non-porters.  However, it is expected that the "


@@ -2145,32 +2214,33 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1597
+#: pkgs.dbk:1669

 msgid ""
 msgid ""

-"If you are a porter doing an NMU for `unstable', the above guidelines for "
-"porting should be followed, with two variations.  Firstly, the acceptable "
-"waiting period — the time between when the bug is submitted to the BTS and "
-"when it is OK to do an NMU — is seven days for porters working on the "
-"unstable distribution.  This period can be shortened if the problem is "
-"critical and imposes hardship on the porting effort, at the discretion of "
-"the porter group.  (Remember, none of this is Policy, just mutually agreed "
-"upon guidelines.) For uploads to stable or testing, please coordinate with "
-"the appropriate release team first."
+"If you are a porter doing an NMU for <literal>unstable</literal>, the above "
+"guidelines for porting should be followed, with two variations.  Firstly, "
+"the acceptable waiting period — the time between when the bug is submitted "
+"to the BTS and when it is OK to do an NMU — is seven days for porters "
+"working on the <literal>unstable</literal> distribution.  This period can be "
+"shortened if the problem is critical and imposes hardship on the porting "
+"effort, at the discretion of the porter group.  (Remember, none of this is "
+"Policy, just mutually agreed upon guidelines.) For uploads to "
+"<literal>stable</literal> or <literal>testing </literal>, please coordinate "
+"with the appropriate release team first."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1608
+#: pkgs.dbk:1681

 msgid ""
 "Secondly, porters doing source NMUs should make sure that the bug they "
 msgid ""
 "Secondly, porters doing source NMUs should make sure that the bug they "

-"submit to the BTS should be of severity `serious' or greater.  This ensures "
-"that a single source package can be used to compile every supported Debian "
-"architecture by release time.  It is very important that we have one version "
-"of the binary and source package for all architecture in order to comply "
-"with many licenses."
+"submit to the BTS should be of severity <literal>serious</literal> or "
+"greater.  This ensures that a single source package can be used to compile "
+"every supported Debian architecture by release time.  It is very important "
+"that we have one version of the binary and source package for all "
+"architectures in order to comply with many licenses."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1616
+#: pkgs.dbk:1689

 msgid ""
 "Porters should try to avoid patches which simply kludge around bugs in the "
 "current version of the compile environment, kernel, or libc.  Sometimes such "
 msgid ""
 "Porters should try to avoid patches which simply kludge around bugs in the "
 "current version of the compile environment, kernel, or libc.  Sometimes such "


@@ -2181,7 +2251,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1624
+#: pkgs.dbk:1697

 msgid ""
 "Porters may also have an unofficial location where they can put the results "
 "of their work during the waiting period.  This helps others running the port "
 msgid ""
 "Porters may also have an unofficial location where they can put the results "
 "of their work during the waiting period.  This helps others running the port "


@@ -2190,12 +2260,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1634
+#: pkgs.dbk:1707

 msgid "Porting infrastructure and automation"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Porting infrastructure and automation"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1636
+#: pkgs.dbk:1709

 msgid ""
 "There is infrastructure and several tools to help automate package porting.  "
 "This section contains a brief overview of this automation and porting to "
 msgid ""
 "There is infrastructure and several tools to help automate package porting.  "
 "This section contains a brief overview of this automation and porting to "


@@ -2204,19 +2274,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1641
+#: pkgs.dbk:1714

 msgid "Mailing lists and web pages"
 msgstr "メーリングリストとウェブページ"
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Mailing lists and web pages"
 msgstr "メーリングリストとウェブページ"
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1643
+#: pkgs.dbk:1716

 msgid ""
 "Web pages containing the status of each port can be found at <ulink url="
 "\"&url-debian-ports;\"></ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid ""
 "Web pages containing the status of each port can be found at <ulink url="
 "\"&url-debian-ports;\"></ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1647
+#: pkgs.dbk:1720

 msgid ""
 "Each port of Debian has a mailing list.  The list of porting mailing lists "
 "can be found at <ulink url=\"&url-debian-port-lists;\"></ulink>.  These "
 msgid ""
 "Each port of Debian has a mailing list.  The list of porting mailing lists "
 "can be found at <ulink url=\"&url-debian-port-lists;\"></ulink>.  These "


@@ -2225,61 +2295,57 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1655
+#: pkgs.dbk:1728

 msgid "Porter tools"
 msgstr "移植用ツール"
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Porter tools"
 msgstr "移植用ツール"
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1657
+#: pkgs.dbk:1730

 msgid ""
 "Descriptions of several porting tools can be found in <xref linkend=\"tools-"
 "porting\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgid ""
 "Descriptions of several porting tools can be found in <xref linkend=\"tools-"
 "porting\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:1663
-msgid "<systemitem role=\"package\">buildd</systemitem>"
+#: pkgs.dbk:1736
+msgid "<systemitem role=\"package\">wanna-build</systemitem>"

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1665
+#: pkgs.dbk:1738

 msgid ""
 msgid ""

-"The <systemitem role=\"package\">buildd</systemitem> system is used as a "
-"distributed, client-server build distribution system.  It is usually used in "
-"conjunction with <emphasis>auto-builders</emphasis>, which are ``slave'' "
-"hosts which simply check out and attempt to auto-build packages which need "
-"to be ported.  There is also an email interface to the system, which allows "
-"porters to ``check out'' a source package (usually one which cannot yet be "
-"auto-built)  and work on it."
+"The <systemitem role=\"package\">wanna-build</systemitem> system is used as "
+"a distributed, client-server build distribution system.  It is usually used "
+"in conjunction with build daemons running the <systemitem role=\"package"
+"\">buildd </systemitem> program. <literal>Build daemons</literal> are "
+"``slave'' hosts which contact the central <systemitem role=\"package\"> "
+"wanna-build</systemitem> system to receive a list of packages that need to "
+"be built."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1674
+#: pkgs.dbk:1746

 msgid ""
 msgid ""

-"<systemitem role=\"package\">buildd</systemitem> is not yet available as a "
-"package; however, most porting efforts are either using it currently or "
-"planning to use it in the near future.  The actual automated builder is "
-"packaged as <systemitem role=\"package\">sbuild</systemitem>, see its "
-"description in <xref linkend=\"sbuild\"/> .  The complete <systemitem role="
-"\"package\">buildd</systemitem> system also collects a number of as yet "
-"unpackaged components which are currently very useful and in use "
-"continually, such as <command>andrea</command> and <command>wanna-build</"
-"command>."
+"<systemitem role=\"package\">wanna-build</systemitem> is not yet available "
+"as a package; however, all Debian porting efforts are using it for automated "
+"package building.  The tool used to do the actual package builds, "
+"<systemitem role=\"package\">sbuild</systemitem> is available as a package, "
+"see its description in <xref linkend=\"sbuild\"/> .  Please note that the "
+"packaged version is not the same as the one used on build daemons, but it is "
+"close enough to reproduce problems."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1684
+#: pkgs.dbk:1755

 msgid ""
 msgid ""

-"Some of the data produced by <systemitem role=\"package\">buildd</"
+"Most of the data produced by <systemitem role=\"package\">wanna-build </"

 "systemitem> which is generally useful to porters is available on the web at "
 "<ulink url=\"&url-buildd;\"></ulink>.  This data includes nightly updated "
 "systemitem> which is generally useful to porters is available on the web at "
 "<ulink url=\"&url-buildd;\"></ulink>.  This data includes nightly updated "

-"information from <command>andrea</command> (source dependencies) and "
-"<systemitem role=\"package\">quinn-diff</systemitem> (packages needing "
-"recompilation)."
+"statistics, queueing information and logs for build attempts."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1692
+#: pkgs.dbk:1761

 msgid ""
 "We are quite proud of this system, since it has so many possible uses.  "
 "Independent development groups can use the system for different sub-flavors "
 msgid ""
 "We are quite proud of this system, since it has so many possible uses.  "
 "Independent development groups can use the system for different sub-flavors "


@@ -2289,36 +2355,37 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:1699
+#: pkgs.dbk:1768

 msgid ""
 "The buildds admins of each arch can be contacted at the mail address "
 msgid ""
 "The buildds admins of each arch can be contacted at the mail address "

-"$arch@buildd.debian.org."
+"<literal><replaceable>arch</replaceable>@buildd.debian.org</literal>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1707
+#: pkgs.dbk:1776

 msgid "When your package is <emphasis>not</emphasis> portable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "When your package is <emphasis>not</emphasis> portable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1709
+#: pkgs.dbk:1778

 msgid ""
 "Some packages still have issues with building and/or working on some of the "
 "architectures supported by Debian, and cannot be ported at all, or not "
 "within a reasonable amount of time.  An example is a package that is SVGA-"
 msgid ""
 "Some packages still have issues with building and/or working on some of the "
 "architectures supported by Debian, and cannot be ported at all, or not "
 "within a reasonable amount of time.  An example is a package that is SVGA-"

-"specific (only i386), or uses other hardware-specific features not supported "
-"on all architectures."
+"specific (only available for <literal>i386</literal> and <literal>amd64</"
+"literal>), or uses other hardware-specific features not supported on all "
+"architectures."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1716
+#: pkgs.dbk:1785

 msgid ""
 "In order to prevent broken packages from being uploaded to the archive, and "
 "wasting buildd time, you need to do a few things:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "In order to prevent broken packages from being uploaded to the archive, and "
 "wasting buildd time, you need to do a few things:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1722
+#: pkgs.dbk:1791

 msgid ""
 "First, make sure your package <emphasis>does</emphasis> fail to build on "
 "architectures that it cannot support.  There are a few ways to achieve "
 msgid ""
 "First, make sure your package <emphasis>does</emphasis> fail to build on "
 "architectures that it cannot support.  There are a few ways to achieve "


@@ -2330,16 +2397,16 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1730
+#: pkgs.dbk:1799

 msgid ""
 "Additionally, if you believe the list of supported architectures is pretty "
 msgid ""
 "Additionally, if you believe the list of supported architectures is pretty "

-"constant, you should change 'any' to a list of supported architectures in "
-"debian/control.  This way, the build will fail also, and indicate this to a "
-"human reader without actually trying."
+"constant, you should change <literal>any</literal> to a list of supported "
+"architectures in <filename>debian/control</filename>.  This way, the build "
+"will fail also, and indicate this to a human reader without actually trying."

 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1738
+#: pkgs.dbk:1807

 msgid ""
 "In order to prevent autobuilders from needlessly trying to build your "
 "package, it must be included in <filename>packages-arch-specific</filename>, "
 msgid ""
 "In order to prevent autobuilders from needlessly trying to build your "
 "package, it must be included in <filename>packages-arch-specific</filename>, "


@@ -2350,7 +2417,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1748
+#: pkgs.dbk:1817

 msgid ""
 "Please note that it is insufficient to only add your package to Packages-"
 "arch-specific without making it fail to build on unsupported architectures: "
 msgid ""
 "Please note that it is insufficient to only add your package to Packages-"
 "arch-specific without making it fail to build on unsupported architectures: "


@@ -2362,12 +2429,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: pkgs.dbk:1761
+#: pkgs.dbk:1830

 msgid "Non-Maintainer Uploads (NMUs)"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid "Non-Maintainer Uploads (NMUs)"
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:1763
+#: pkgs.dbk:1832

 msgid ""
 "Under certain circumstances it is necessary for someone other than the "
 "official package maintainer to make a release of a package.  This is called "
 msgid ""
 "Under certain circumstances it is necessary for someone other than the "
 "official package maintainer to make a release of a package.  This is called "


@@ -2375,17 +2442,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:1768
+#: pkgs.dbk:1837

 msgid ""
 "This section handles only source NMUs, i.e.  NMUs which upload a new version "
 "of the package.  For binary-only NMUs by porters or QA members, please see "
 "<xref linkend=\"binary-only-nmu\"/> .  If a buildd builds and uploads a "
 "package, that too is strictly speaking a binary NMU.  See <xref linkend="
 msgid ""
 "This section handles only source NMUs, i.e.  NMUs which upload a new version "
 "of the package.  For binary-only NMUs by porters or QA members, please see "
 "<xref linkend=\"binary-only-nmu\"/> .  If a buildd builds and uploads a "
 "package, that too is strictly speaking a binary NMU.  See <xref linkend="

-"\"buildd\"/> for some more information."
+"\"wanna-build\"/> for some more information."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:1775
+#: pkgs.dbk:1844

 msgid ""
 "The main reason why NMUs are done is when a developer needs to fix another "
 "developer's package in order to address serious problems or crippling bugs "
 msgid ""
 "The main reason why NMUs are done is when a developer needs to fix another "
 "developer's package in order to address serious problems or crippling bugs "


@@ -2394,7 +2461,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:1780
+#: pkgs.dbk:1849

 msgid ""
 "First and foremost, it is critical that NMU patches to source should be as "
 "non-disruptive as possible.  Do not do housekeeping tasks, do not change the "
 msgid ""
 "First and foremost, it is critical that NMU patches to source should be as "
 "non-disruptive as possible.  Do not do housekeeping tasks, do not change the "


@@ -2406,7 +2473,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:1789
+#: pkgs.dbk:1858

 msgid ""
 "And please remember the Hippocratic Oath: Above all, do no harm.  It is "
 "better to leave a package with an open grave bug than applying a non-"
 msgid ""
 "And please remember the Hippocratic Oath: Above all, do no harm.  It is "
 "better to leave a package with an open grave bug than applying a non-"


@@ -2414,12 +2481,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1794
+#: pkgs.dbk:1863

 msgid "How to do a NMU"
 msgstr "NMU のやり方"
 
 # type: Content of: <chapter><section><section><para>
 msgid "How to do a NMU"
 msgstr "NMU のやり方"
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1796
+#: pkgs.dbk:1865

 msgid ""
 "NMUs which fix important, serious or higher severity bugs are encouraged and "
 "accepted.  You should endeavor to reach the current maintainer of the "
 msgid ""
 "NMUs which fix important, serious or higher severity bugs are encouraged and "
 "accepted.  You should endeavor to reach the current maintainer of the "


@@ -2428,7 +2495,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1802
+#: pkgs.dbk:1871

 msgid ""
 "NMUs should be made to assist a package's maintainer in resolving bugs.  "
 "Maintainers should be thankful for that help, and NMUers should respect the "
 msgid ""
 "NMUs should be made to assist a package's maintainer in resolving bugs.  "
 "Maintainers should be thankful for that help, and NMUers should respect the "


@@ -2437,14 +2504,15 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1808
+#: pkgs.dbk:1877

 msgid ""
 "A NMU should follow all conventions, written down in this section.  For an "
 msgid ""
 "A NMU should follow all conventions, written down in this section.  For an "

-"upload to testing or unstable, this order of steps is recommended:"
+"upload to <literal>testing</literal> or <literal>unstable</literal>, this "
+"order of steps is recommended:"

 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1814
+#: pkgs.dbk:1884

 msgid ""
 "Make sure that the package's bugs that the NMU is meant to address are all "
 "filed in the Debian Bug Tracking System (BTS).  If they are not, submit them "
 msgid ""
 "Make sure that the package's bugs that the NMU is meant to address are all "
 "filed in the Debian Bug Tracking System (BTS).  If they are not, submit them "


@@ -2452,7 +2520,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1821
+#: pkgs.dbk:1891

 msgid ""
 "Wait a few days for the response from the maintainer.  If you don't get any "
 "response, you may want to help them by sending the patch that fixes the "
 msgid ""
 "Wait a few days for the response from the maintainer.  If you don't get any "
 "response, you may want to help them by sending the patch that fixes the "


@@ -2460,7 +2528,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1828
+#: pkgs.dbk:1898

 msgid ""
 "Wait a few more days.  If you still haven't got an answer from the "
 "maintainer, send them a mail announcing your intent to NMU the package.  "
 msgid ""
 "Wait a few more days.  If you still haven't got an answer from the "
 "maintainer, send them a mail announcing your intent to NMU the package.  "


@@ -2471,7 +2539,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1838
+#: pkgs.dbk:1908

 msgid ""
 "Upload your package to incoming in <filename>DELAYED/7-day</filename> (cf.  "
 "<xref linkend=\"delayed-incoming\"/> ), send the final patch to the "
 msgid ""
 "Upload your package to incoming in <filename>DELAYED/7-day</filename> (cf.  "
 "<xref linkend=\"delayed-incoming\"/> ), send the final patch to the "


@@ -2480,7 +2548,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:1846
+#: pkgs.dbk:1916

 msgid ""
 "Follow what happens, you're responsible for any bug that you introduced with "
 "your NMU.  You should probably use <xref linkend=\"pkg-tracking-system\"/> "
 msgid ""
 "Follow what happens, you're responsible for any bug that you introduced with "
 "your NMU.  You should probably use <xref linkend=\"pkg-tracking-system\"/> "


@@ -2488,7 +2556,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1853
+#: pkgs.dbk:1923

 msgid ""
 "At times, the release manager or an organized group of developers can "
 "announce a certain period of time in which the NMU rules are relaxed.  This "
 msgid ""
 "At times, the release manager or an organized group of developers can "
 "announce a certain period of time in which the NMU rules are relaxed.  This "


@@ -2500,15 +2568,16 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1862
+#: pkgs.dbk:1932

 msgid ""
 msgid ""

-"For the testing distribution, the rules may be changed by the release "
-"managers.  Please take additional care, and acknowledge that the usual way "
-"for a package to enter testing is through unstable."
+"For the <literal>testing</literal> distribution, the rules may be changed by "
+"the release managers.  Please take additional care, and acknowledge that the "
+"usual way for a package to enter <literal>testing</literal> is through "
+"<literal>unstable</literal>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1867
+#: pkgs.dbk:1938

 msgid ""
 "For the stable distribution, please take extra care.  Of course, the release "
 "managers may also change the rules here.  Please verify before you upload "
 msgid ""
 "For the stable distribution, please take extra care.  Of course, the release "
 "managers may also change the rules here.  Please verify before you upload "


@@ -2517,7 +2586,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1873
+#: pkgs.dbk:1944

 msgid ""
 "When a security bug is detected, the security team may do an NMU, using "
 "their own rules.  Please refer to <xref linkend=\"bug-security\"/> for more "
 msgid ""
 "When a security bug is detected, the security team may do an NMU, using "
 "their own rules.  Please refer to <xref linkend=\"bug-security\"/> for more "


@@ -2525,14 +2594,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1878
+#: pkgs.dbk:1949

 msgid ""
 "For the differences for Porters NMUs, please see <xref linkend=\"source-nmu-"
 "when-porter\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "For the differences for Porters NMUs, please see <xref linkend=\"source-nmu-"
 "when-porter\"/> ."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1882
+#: pkgs.dbk:1953

 msgid ""
 "Of course, it is always possible to agree on special rules with a maintainer "
 "(like the maintainer asking please upload this fix directly for me, and no "
 msgid ""
 "Of course, it is always possible to agree on special rules with a maintainer "
 "(like the maintainer asking please upload this fix directly for me, and no "


@@ -2540,19 +2609,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1889
+#: pkgs.dbk:1960

 msgid "NMU version numbering"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "NMU version numbering"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1891
+#: pkgs.dbk:1962

 msgid ""
 "Whenever you have made a change to a package, no matter how trivial, the "
 "version number needs to change.  This enables our packing system to function."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "Whenever you have made a change to a package, no matter how trivial, the "
 "version number needs to change.  This enables our packing system to function."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1895
+#: pkgs.dbk:1966

 msgid ""
 "If you are doing a non-maintainer upload (NMU), you should add a new minor "
 "version number to the <replaceable>debian-revision</replaceable> part of the "
 msgid ""
 "If you are doing a non-maintainer upload (NMU), you should add a new minor "
 "version number to the <replaceable>debian-revision</replaceable> part of the "


@@ -2566,7 +2635,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1906
+#: pkgs.dbk:1977

 msgid ""
 "The Debian revision minor number is needed to avoid stealing one of the "
 "package maintainer's version numbers, which might disrupt their work.  It "
 msgid ""
 "The Debian revision minor number is needed to avoid stealing one of the "
 "package maintainer's version numbers, which might disrupt their work.  It "


@@ -2575,7 +2644,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1912
+#: pkgs.dbk:1983

 msgid ""
 "If there is no <replaceable>debian-revision</replaceable> component in the "
 "version number then one should be created, starting at `0.1' (but in case of "
 msgid ""
 "If there is no <replaceable>debian-revision</replaceable> component in the "
 "version number then one should be created, starting at `0.1' (but in case of "


@@ -2588,20 +2657,20 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1922
+#: pkgs.dbk:1993

 msgid ""
 msgid ""

-"If you upload a package to testing or stable, sometimes, you need to fork "
-"the version number tree.  For this, version numbers like 1.1-3sarge0.1 could "
-"be used."
+"If you upload a package to <literal>testing</literal> or <literal>stable </"
+"literal>, sometimes, you need to fork the version number tree.  For this, "
+"version numbers like 1.1-3sarge0.1 could be used."

 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1929
+#: pkgs.dbk:2000

 msgid "Source NMUs must have a new changelog entry"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Source NMUs must have a new changelog entry"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1931
+#: pkgs.dbk:2002

 msgid ""
 "Anyone who is doing a source NMU must create a changelog entry, describing "
 "which bugs are fixed by the NMU, and generally why the NMU was required and "
 msgid ""
 "Anyone who is doing a source NMU must create a changelog entry, describing "
 "which bugs are fixed by the NMU, and generally why the NMU was required and "


@@ -2610,12 +2679,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1937
+#: pkgs.dbk:2008

 msgid "By convention, source NMU changelog entries start with the line"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgid "By convention, source NMU changelog entries start with the line"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

-#: pkgs.dbk:1939
+#: pkgs.dbk:2010

 #, fuzzy, no-wrap
 msgid ""
 "\n"
 #, fuzzy, no-wrap
 msgid ""
 "\n"


@@ -2623,12 +2692,12 @@ msgid ""
 msgstr "* Non-maintainer upload"
 
 # type: Content of: <chapter><section><section><title>
 msgstr "* Non-maintainer upload"
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1945
+#: pkgs.dbk:2016

 msgid "Source NMUs and the Bug Tracking System"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Source NMUs and the Bug Tracking System"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1947
+#: pkgs.dbk:2018

 msgid ""
 "Maintainers other than the official package maintainer should make as few "
 "changes to the package as possible, and they should always send a patch as a "
 msgid ""
 "Maintainers other than the official package maintainer should make as few "
 "changes to the package as possible, and they should always send a patch as a "


@@ -2637,7 +2706,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1953
+#: pkgs.dbk:2024

 msgid ""
 "What if you are simply recompiling the package? If you just need to "
 "recompile it for a single architecture, then you may do a binary-only NMU as "
 msgid ""
 "What if you are simply recompiling the package? If you just need to "
 "recompile it for a single architecture, then you may do a binary-only NMU as "


@@ -2648,7 +2717,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1960
+#: pkgs.dbk:2031

 msgid ""
 "Bugs fixed by source NMUs used to be tagged fixed instead of closed, but "
 "since version tracking is in place, such bugs are now also closed with the "
 msgid ""
 "Bugs fixed by source NMUs used to be tagged fixed instead of closed, but "
 "since version tracking is in place, such bugs are now also closed with the "


@@ -2656,7 +2725,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1965
+#: pkgs.dbk:2036

 msgid ""
 "Also, after doing an NMU, you have to send the information to the existing "
 "bugs that are fixed by your NMU, including the unified diff.  Historically, "
 msgid ""
 "Also, after doing an NMU, you have to send the information to the existing "
 "bugs that are fixed by your NMU, including the unified diff.  Historically, "


@@ -2671,7 +2740,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1976
+#: pkgs.dbk:2047

 msgid ""
 "In addition, the normal maintainer should <emphasis>always</emphasis> retain "
 "the entry in the changelog file documenting the non-maintainer upload -- and "
 msgid ""
 "In addition, the normal maintainer should <emphasis>always</emphasis> retain "
 "the entry in the changelog file documenting the non-maintainer upload -- and "


@@ -2680,12 +2749,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1984
+#: pkgs.dbk:2055

 msgid "Building source NMUs"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Building source NMUs"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1986
+#: pkgs.dbk:2057

 msgid ""
 "Source NMU packages are built normally.  Pick a distribution using the same "
 "rules as found in <xref linkend=\"distribution\"/> , follow the other "
 msgid ""
 "Source NMU packages are built normally.  Pick a distribution using the same "
 "rules as found in <xref linkend=\"distribution\"/> , follow the other "


@@ -2693,7 +2762,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:1991
+#: pkgs.dbk:2062

 msgid ""
 "Make sure you do <emphasis>not</emphasis> change the value of the maintainer "
 "in the <filename>debian/control</filename> file.  Your name as given in the "
 msgid ""
 "Make sure you do <emphasis>not</emphasis> change the value of the maintainer "
 "in the <filename>debian/control</filename> file.  Your name as given in the "


@@ -2702,12 +2771,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:1999
+#: pkgs.dbk:2070

 msgid "Acknowledging an NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Acknowledging an NMU"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2001
+#: pkgs.dbk:2072

 msgid ""
 "If one of your packages has been NMU'ed, you have to incorporate the changes "
 "in your copy of the sources.  This is easy, you just have to apply the patch "
 msgid ""
 "If one of your packages has been NMU'ed, you have to incorporate the changes "
 "in your copy of the sources.  This is easy, you just have to apply the patch "


@@ -2721,7 +2790,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2012
+#: pkgs.dbk:2083

 msgid ""
 "In any case, you should not be upset by the NMU.  An NMU is not a personal "
 "attack against the maintainer.  It is a proof that someone cares enough "
 msgid ""
 "In any case, you should not be upset by the NMU.  An NMU is not a personal "
 "attack against the maintainer.  It is a proof that someone cares enough "


@@ -2732,12 +2801,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2022
+#: pkgs.dbk:2093

 msgid "NMU vs QA uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "NMU vs QA uploads"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2024
+#: pkgs.dbk:2095

 msgid ""
 "Unless you know the maintainer is still active, it is wise to check the "
 "package to see if it has been orphaned.  The current list of orphaned "
 msgid ""
 "Unless you know the maintainer is still active, it is wise to check the "
 "package to see if it has been orphaned.  The current list of orphaned "


@@ -2748,12 +2817,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2034
+#: pkgs.dbk:2105

 msgid "Who can do an NMU"
 msgstr "誰が NMU 可能なのか"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Who can do an NMU"
 msgstr "誰が NMU 可能なのか"
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2036
+#: pkgs.dbk:2107

 msgid ""
 "Only official, registered Debian Developers can do binary or source NMUs.  A "
 "Debian Developer is someone who has their key in the Debian key ring.  Non-"
 msgid ""
 "Only official, registered Debian Developers can do binary or source NMUs.  A "
 "Debian Developer is someone who has their key in the Debian key ring.  Non-"


@@ -2764,23 +2833,23 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2046
+#: pkgs.dbk:2117

 msgid "Terminology"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Terminology"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2048
+#: pkgs.dbk:2119

 msgid ""
 "There are two new terms used throughout this section: ``binary-only NMU'' "
 "and ``source NMU''.  These terms are used with specific technical meaning "
 "throughout this document.  Both binary-only and source NMUs are similar, "
 "since they involve an upload of a package by a developer who is not the "
 msgid ""
 "There are two new terms used throughout this section: ``binary-only NMU'' "
 "and ``source NMU''.  These terms are used with specific technical meaning "
 "throughout this document.  Both binary-only and source NMUs are similar, "
 "since they involve an upload of a package by a developer who is not the "

-"official maintainer of that package.  That is why it's a <emphasis>non-"
-"maintainer</emphasis> upload."
+"official maintainer of that package.  That is why it's a <literal>non-"
+"maintainer</literal> upload."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2056
+#: pkgs.dbk:2127

 msgid ""
 "A source NMU is an upload of a package by a developer who is not the "
 "official maintainer, for the purposes of fixing a bug in the package.  "
 msgid ""
 "A source NMU is an upload of a package by a developer who is not the "
 "official maintainer, for the purposes of fixing a bug in the package.  "


@@ -2792,7 +2861,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2065
+#: pkgs.dbk:2136

 msgid ""
 "A binary-only NMU is a recompilation and upload of a binary package for a "
 "given architecture.  As such, it is usually part of a porting effort.  A "
 msgid ""
 "A binary-only NMU is a recompilation and upload of a binary package for a "
 "given architecture.  As such, it is usually part of a porting effort.  A "


@@ -2805,7 +2874,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2075
+#: pkgs.dbk:2146

 msgid ""
 "Both classes of NMUs, source and binary-only, can be lumped under the term "
 "``NMU''.  However, this often leads to confusion, since most people think "
 msgid ""
 "Both classes of NMUs, source and binary-only, can be lumped under the term "
 "``NMU''.  However, this often leads to confusion, since most people think "


@@ -2814,12 +2883,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: pkgs.dbk:2085
+#: pkgs.dbk:2156

 msgid "Collaborative maintenance"
 msgstr "共同メンテナンス"
 
 # type: Content of: <chapter><section><para>
 msgid "Collaborative maintenance"
 msgstr "共同メンテナンス"
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:2087
+#: pkgs.dbk:2158

 msgid ""
 "Collaborative maintenance is a term describing the sharing of Debian package "
 "maintenance duties by several people.  This collaboration is almost always a "
 msgid ""
 "Collaborative maintenance is a term describing the sharing of Debian package "
 "maintenance duties by several people.  This collaboration is almost always a "


@@ -2830,23 +2899,25 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:2095
+#: pkgs.dbk:2166

 msgid ""
 "Generally there is a primary maintainer and one or more co-maintainers.  The "
 "primary maintainer is the person whose name is listed in the "
 "<literal>Maintainer</literal> field of the <filename>debian/control</"
 msgid ""
 "Generally there is a primary maintainer and one or more co-maintainers.  The "
 "primary maintainer is the person whose name is listed in the "
 "<literal>Maintainer</literal> field of the <filename>debian/control</"

-"filename> file.  Co-maintainers are all the other maintainers."
+"filename> file.  Co-maintainers are all the other maintainers, usually "
+"listed in the <literal>Uploaders</literal> field of the <filename>debian/"
+"control</filename> file."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:2101
+#: pkgs.dbk:2174

 msgid ""
 "In its most basic form, the process of adding a new co-maintainer is quite "
 "easy:"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid ""
 "In its most basic form, the process of adding a new co-maintainer is quite "
 "easy:"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2107
+#: pkgs.dbk:2180

 msgid ""
 "Setup the co-maintainer with access to the sources you build the package "
 "from.  Generally this implies you are using a network-capable version "
 msgid ""
 "Setup the co-maintainer with access to the sources you build the package "
 "from.  Generally this implies you are using a network-capable version "


@@ -2856,15 +2927,15 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2115
+#: pkgs.dbk:2188

 msgid ""
 "Add the co-maintainer's correct maintainer name and address to the "
 msgid ""
 "Add the co-maintainer's correct maintainer name and address to the "

-"<literal>Uploaders</literal> field in the global part of the "
+"<literal>Uploaders</literal> field in the first paragraph of the "

 "<filename>debian/control</filename> file."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><screen>
 "<filename>debian/control</filename> file."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><screen>

-#: pkgs.dbk:2119
+#: pkgs.dbk:2192

 #, fuzzy, no-wrap
 msgid ""
 "\n"
 #, fuzzy, no-wrap
 msgid ""
 "\n"


@@ -2872,14 +2943,14 @@ msgid ""
 msgstr "Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex &lt;arex@debian.org&gt;"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgstr "Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex &lt;arex@debian.org&gt;"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2125
+#: pkgs.dbk:2198

 msgid ""
 "Using the PTS (<xref linkend=\"pkg-tracking-system\"/> ), the co-maintainers "
 "should subscribe themselves to the appropriate source package."
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid ""
 "Using the PTS (<xref linkend=\"pkg-tracking-system\"/> ), the co-maintainers "
 "should subscribe themselves to the appropriate source package."
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:2131
+#: pkgs.dbk:2204

 msgid ""
 "Another form of collaborative maintenance is team maintenance, which is "
 "recommended if you maintain several packages with the same group of "
 msgid ""
 "Another form of collaborative maintenance is team maintenance, which is "
 "recommended if you maintain several packages with the same group of "


@@ -2889,7 +2960,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>

-#: pkgs.dbk:2140
+#: pkgs.dbk:2213

 msgid ""
 "Put the team member mainly responsible for the package in the Maintainer "
 "field.  In the Uploaders, put the mailing list address, and the team members "
 msgid ""
 "Put the team member mainly responsible for the package in the Maintainer "
 "field.  In the Uploaders, put the mailing list address, and the team members "


@@ -2897,7 +2968,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>

-#: pkgs.dbk:2147
+#: pkgs.dbk:2220

 msgid ""
 "Put the mailing list address in the Maintainer field.  In the Uploaders "
 "field, put the team members who care for the package.  In this case, you "
 msgid ""
 "Put the mailing list address in the Maintainer field.  In the Uploaders "
 "field, put the team members who care for the package.  In this case, you "


@@ -2906,7 +2977,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: pkgs.dbk:2155
+#: pkgs.dbk:2228

 msgid ""
 "In any case, it is a bad idea to automatically put all team members in the "
 "Uploaders field.  It clutters the Developer's Package Overview listing (see "
 msgid ""
 "In any case, it is a bad idea to automatically put all team members in the "
 "Uploaders field.  It clutters the Developer's Package Overview listing (see "


@@ -2915,112 +2986,114 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: pkgs.dbk:2163
+#: pkgs.dbk:2236

 msgid "The testing distribution"
 msgstr "テスト版ディストリビューション"
 
 # type: Content of: <chapter><section><section><title>
 msgid "The testing distribution"
 msgstr "テスト版ディストリビューション"
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2165
+#: pkgs.dbk:2238

 msgid "Basics"
 msgstr "基本"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Basics"
 msgstr "基本"
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2167
+#: pkgs.dbk:2240

 msgid ""
 msgid ""

-"Packages are usually installed into the `testing' distribution after they "
-"have undergone some degree of testing in unstable."
+"Packages are usually installed into the <literal>testing</literal> "
+"distribution after they have undergone some degree of <literal>testing</"
+"literal> in <literal>unstable</literal>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2171
+#: pkgs.dbk:2245

 msgid ""
 "They must be in sync on all architectures and mustn't have dependencies that "
 "make them uninstallable; they also have to have generally no known release-"
 msgid ""
 "They must be in sync on all architectures and mustn't have dependencies that "
 "make them uninstallable; they also have to have generally no known release-"

-"critical bugs at the time they're installed into testing.  This way, "
-"`testing' should always be close to being a release candidate.  Please see "
-"below for details."
+"critical bugs at the time they're installed into <literal>testing </"
+"literal>.  This way, <literal>testing</literal> should always be close to "
+"being a release candidate.  Please see below for details."

 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2180
+#: pkgs.dbk:2254

 msgid "Updates from unstable"
 msgstr "不安定版からの更新"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Updates from unstable"
 msgstr "不安定版からの更新"
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2182
+#: pkgs.dbk:2256

 msgid ""
 msgid ""

-"The scripts that update the <emphasis>testing</emphasis> distribution are "
-"run each day after the installation of the updated packages; these scripts "
-"are called <emphasis>britney</emphasis>.  They generate the "
-"<filename>Packages</filename> files for the <emphasis>testing</emphasis> "
+"The scripts that update the <literal>testing</literal> distribution are run "
+"twice each day, right after the installation of the updated packages; these "
+"scripts are called <literal>britney</literal>.  They generate the "
+"<filename>Packages</filename> files for the <literal>testing</literal> "

 "distribution, but they do so in an intelligent manner; they try to avoid any "
 "inconsistency and to use only non-buggy packages."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 "distribution, but they do so in an intelligent manner; they try to avoid any "
 "inconsistency and to use only non-buggy packages."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2190
+#: pkgs.dbk:2264

 msgid ""
 msgid ""

-"The inclusion of a package from <emphasis>unstable</emphasis> is conditional "
+"The inclusion of a package from <literal>unstable</literal> is conditional "

 "on the following:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 "on the following:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2196
+#: pkgs.dbk:2270

 msgid ""
 msgid ""

-"The package must have been available in <emphasis>unstable</emphasis> for 2, "
-"5 or 10 days, depending on the urgency (high, medium or low).  Please note "
+"The package must have been available in <literal>unstable</literal> for 2, 5 "
+"or 10 days, depending on the urgency (high, medium or low).  Please note "

 "that the urgency is sticky, meaning that the highest urgency uploaded since "
 "that the urgency is sticky, meaning that the highest urgency uploaded since "

-"the previous testing transition is taken into account.  Those delays may be "
-"doubled during a freeze, or testing transitions may be switched off "
-"altogether;"
+"the previous <literal>testing</literal> transition is taken into account.  "
+"Those delays may be doubled during a freeze, or <literal>testing</literal> "
+"transitions may be switched off altogether;"

 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2205
+#: pkgs.dbk:2280

 msgid ""
 msgid ""

-"It must have the same number or fewer release-critical bugs than the version "
-"currently available in <emphasis>testing</emphasis>;"
+"It must not have new release-critical bugs (RC bugs affecting the version "
+"available in <literal>unstable</literal>, but not affecting the version in "
+"<literal>testing</literal>);"

 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2211
+#: pkgs.dbk:2287

 msgid ""
 "It must be available on all architectures on which it has previously been "
 msgid ""
 "It must be available on all architectures on which it has previously been "

-"built in unstable.  <xref linkend=\"madison\"/> may be of interest to check "
-"that information;"
+"built in <literal>unstable</literal>.  <xref linkend=\"dak ls\"/> may be of "
+"interest to check that information;"

 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2218
+#: pkgs.dbk:2294

 msgid ""
 "It must not break any dependency of a package which is already available in "
 msgid ""
 "It must not break any dependency of a package which is already available in "

-"<emphasis>testing</emphasis>;"
+"<literal>testing</literal>;"

 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2224
+#: pkgs.dbk:2300

 msgid ""
 "The packages on which it depends must either be available in "
 msgid ""
 "The packages on which it depends must either be available in "

-"<emphasis>testing</emphasis> or they must be accepted into "
-"<emphasis>testing</emphasis> at the same time (and they will be if they "
-"fulfill all the necessary criteria);"
+"<literal>testing</literal> or they must be accepted into <literal>testing</"
+"literal> at the same time (and they will be if they fulfill all the "
+"necessary criteria);"

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2232
+#: pkgs.dbk:2308

 msgid ""
 msgid ""

-"To find out whether a package is progressing into testing or not, see the "
-"testing script output on the <ulink url=\"&url-testing-maint;\">web page of "
-"the testing distribution</ulink>, or use the program <command>grep-excuses</"
-"command> which is in the <systemitem role=\"package\">devscripts</"
-"systemitem> package.  This utility can easily be used in a <citerefentry> "
-"<refentrytitle>crontab</refentrytitle> <manvolnum>5</manvolnum> </"
-"citerefentry> to keep yourself informed of the progression of your packages "
-"into <emphasis>testing</emphasis>."
+"To find out whether a package is progressing into <literal>testing</literal> "
+"or not, see the <literal>testing</literal> script output on the <ulink url="
+"\"&url-testing-maint;\">web page of the testing distribution</ulink>, or use "
+"the program <command>grep-excuses</command> which is in the <systemitem role="
+"\"package\">devscripts</systemitem> package.  This utility can easily be "
+"used in a <citerefentry> <refentrytitle>crontab</refentrytitle> "
+"<manvolnum>5</manvolnum> </citerefentry> to keep yourself informed of the "
+"progression of your packages into <literal>testing</literal>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2243
+#: pkgs.dbk:2319

 msgid ""
 "The <filename>update_excuses</filename> file does not always give the "
 "precise reason why the package is refused; you may have to find it on your "
 msgid ""
 "The <filename>update_excuses</filename> file does not always give the "
 "precise reason why the package is refused; you may have to find it on your "


@@ -3030,105 +3103,109 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2250
+#: pkgs.dbk:2326

 msgid ""
 msgid ""

-"Sometimes, some packages never enter <emphasis>testing</emphasis> because "
-"the set of inter-relationship is too complicated and cannot be sorted out by "
-"the scripts.  See below for details."
+"Sometimes, some packages never enter <literal>testing</literal> because the "
+"set of inter-relationship is too complicated and cannot be sorted out by the "
+"scripts.  See below for details."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2255
+#: pkgs.dbk:2331

 msgid ""
 msgid ""

-"Some further dependency analysis is shown on <ulink url=\"http://bjorn.haxx."
-"se/debian/\"></ulink> — but be warned, this page also shows build "
+"Some further dependency analysis is shown on <ulink url=\"http://release."
+"debian.org/migration/\"></ulink> — but be warned, this page also shows build "

 "dependencies which are not considered by britney."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 "dependencies which are not considered by britney."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2260
+#: pkgs.dbk:2336

 msgid "out-of-date"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #.  FIXME: better rename this file than document rampant professionalism? 
 msgid "out-of-date"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #.  FIXME: better rename this file than document rampant professionalism? 

-#: pkgs.dbk:2263
+#: pkgs.dbk:2339

 msgid ""
 msgid ""

-"For the testing migration script, outdated means: There are different "
-"versions in unstable for the release architectures (except for the "
-"architectures in fuckedarches; fuckedarches is a list of architectures that "
-"don't keep up (in update_out.py), but currently, it's empty).  outdated has "
-"nothing whatsoever to do with the architectures this package has in testing."
+"For the <literal>testing</literal> migration script, outdated means: There "
+"are different versions in <literal>unstable</literal> for the release "
+"architectures (except for the architectures in fuckedarches; fuckedarches is "
+"a list of architectures that don't keep up (in <filename>update_out.py</"
+"filename>), but currently, it's empty).  outdated has nothing whatsoever to "
+"do with the architectures this package has in <literal>testing</literal>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2270
+#: pkgs.dbk:2347

 msgid "Consider this example:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 msgid "Consider this example:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2277 pkgs.dbk:2308
+#: pkgs.dbk:2354 pkgs.dbk:2387

 msgid "alpha"
 msgstr "alpha"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 msgid "alpha"
 msgstr "alpha"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2278 pkgs.dbk:2309
+#: pkgs.dbk:2355 pkgs.dbk:2388

 msgid "arm"
 msgstr "arm"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 msgid "arm"
 msgstr "arm"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2283 pkgs.dbk:2315 pkgs.dbk:2375
+#: pkgs.dbk:2360 pkgs.dbk:2394 pkgs.dbk:2456

 msgid "testing"
 msgstr "テスト版"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "testing"
 msgstr "テスト版"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2284 pkgs.dbk:2289 pkgs.dbk:2316 pkgs.dbk:2317 pkgs.dbk:2324
+#: pkgs.dbk:2361 pkgs.dbk:2366 pkgs.dbk:2395 pkgs.dbk:2396 pkgs.dbk:2403

 msgid "1"
 msgstr "1"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "1"
 msgstr "1"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2285 pkgs.dbk:2318 pkgs.dbk:2323
+#: pkgs.dbk:2362 pkgs.dbk:2397 pkgs.dbk:2402

 msgid "-"
 msgstr "-"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 msgid "-"
 msgstr "-"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2288 pkgs.dbk:2321 pkgs.dbk:2376
+#: pkgs.dbk:2365 pkgs.dbk:2400 pkgs.dbk:2457

 msgid "unstable"
 msgstr "不安定版"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "unstable"
 msgstr "不安定版"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2290 pkgs.dbk:2322
+#: pkgs.dbk:2367 pkgs.dbk:2401

 msgid "2"
 msgstr "2"
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "2"
 msgstr "2"
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2296
+#: pkgs.dbk:2373

 msgid ""
 msgid ""

-"The package is out of date on alpha in unstable, and will not go to "
-"testing.  And removing foo from testing would not help at all, the package "
-"is still out of date on alpha, and will not propagate to testing."
+"The package is out of date on alpha in <literal>unstable</literal>, and will "
+"not go to <literal>testing</literal>. Removing the package would not help at "
+"all, the package is still out of date on <literal>alpha</literal>, and will "
+"not propagate to testing."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2301
-msgid "However, if ftp-master removes a package in unstable (here on arm):"
+#: pkgs.dbk:2379
+msgid ""
+"However, if ftp-master removes a package in <literal>unstable</literal> "
+"(here on <literal>arm</literal>):"

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>

-#: pkgs.dbk:2310
+#: pkgs.dbk:2389

 msgid "hurd-i386"
 msgstr "hurd-i386"
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "hurd-i386"
 msgstr "hurd-i386"
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2330
+#: pkgs.dbk:2409

 msgid ""
 "In this case, the package is up to date on all release architectures in "
 msgid ""
 "In this case, the package is up to date on all release architectures in "

-"unstable (and the extra hurd-i386 doesn't matter, as it's not a release "
-"architecture)."
+"<literal>unstable</literal> (and the extra <literal>hurd-i386</literal> "
+"doesn't matter, as it's not a release architecture)."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2335
+#: pkgs.dbk:2414

 msgid ""
 "Sometimes, the question is raised if it is possible to allow packages in "
 "that are not yet built on all architectures: No.  Just plainly no.  (Except "
 msgid ""
 "Sometimes, the question is raised if it is possible to allow packages in "
 "that are not yet built on all architectures: No.  Just plainly no.  (Except "


@@ -3136,91 +3213,93 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2342
+#: pkgs.dbk:2421

 msgid "Removals from testing"
 msgstr "テスト版からの削除"
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Removals from testing"
 msgstr "テスト版からの削除"
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2344
+#: pkgs.dbk:2423

 msgid ""
 "Sometimes, a package is removed to allow another package in: This happens "
 "only to allow <emphasis>another</emphasis> package to go in if it's ready in "
 msgid ""
 "Sometimes, a package is removed to allow another package in: This happens "
 "only to allow <emphasis>another</emphasis> package to go in if it's ready in "

-"every other sense.  Suppose e.g.  that <emphasis>a</emphasis> cannot be "
-"installed with the new version of <emphasis>b</emphasis>; then <emphasis>a</"
-"emphasis> may be removed to allow <emphasis>b</emphasis> in."
+"every other sense.  Suppose e.g.  that <literal>a</literal> cannot be "
+"installed with the new version of <literal>b</literal>; then <literal>a</"
+"literal> may be removed to allow <literal>b</literal> in."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2351
+#: pkgs.dbk:2430

 msgid ""
 msgid ""

-"Of course, there is another reason to remove a package from testing: It's "
-"just too buggy (and having a single RC-bug is enough to be in this state)."
+"Of course, there is another reason to remove a package from <literal>testing "
+"</literal>: It's just too buggy (and having a single RC-bug is enough to be "
+"in this state)."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2355
+#: pkgs.dbk:2435

 msgid ""
 msgid ""

-"Furthermore, if a package has been removed from unstable, and no package in "
-"testing depends on it any more, then it will automatically be removed."
+"Furthermore, if a package has been removed from <literal>unstable</literal>, "
+"and no package in <literal>testing</literal> depends on it any more, then it "
+"will automatically be removed."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2361
+#: pkgs.dbk:2442

 msgid "circular dependencies"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "circular dependencies"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2363
+#: pkgs.dbk:2444

 msgid ""
 "A situation which is not handled very well by britney is if package "
 msgid ""
 "A situation which is not handled very well by britney is if package "

-"<emphasis>a</emphasis> depends on the new version of package <emphasis>b</"
-"emphasis>, and vice versa."
+"<literal>a</literal> depends on the new version of package <literal>b</"
+"literal>, and vice versa."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2368
+#: pkgs.dbk:2449

 msgid "An example of this is:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "An example of this is:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2381
+#: pkgs.dbk:2462

 msgid "a"
 msgstr "a"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "a"
 msgstr "a"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2382
+#: pkgs.dbk:2463

 msgid "1; depends: b=1"
 msgstr "1; depends: b=1"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "1; depends: b=1"
 msgstr "1; depends: b=1"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2383
+#: pkgs.dbk:2464

 msgid "2; depends: b=2"
 msgstr "2; depends: b=2"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "2; depends: b=2"
 msgstr "2; depends: b=2"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2386
+#: pkgs.dbk:2467

 msgid "b"
 msgstr "b"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "b"
 msgstr "b"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2387
+#: pkgs.dbk:2468

 msgid "1; depends: a=1"
 msgstr "1; depends: a=1"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 msgid "1; depends: a=1"
 msgstr "1; depends: a=1"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>

-#: pkgs.dbk:2388
+#: pkgs.dbk:2469

 msgid "2; depends: a=2"
 msgstr "2; depends: a=2"
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "2; depends: a=2"
 msgstr "2; depends: a=2"
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2394
+#: pkgs.dbk:2475

 msgid ""
 msgid ""

-"Neither package <emphasis>a</emphasis> nor package <emphasis>b</emphasis> is "
+"Neither package <literal>a</literal> nor package <literal>b</literal> is "

 "considered for update."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 "considered for update."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2398
+#: pkgs.dbk:2479

 msgid ""
 "Currently, this requires some manual hinting from the release team.  Please "
 "contact them by sending mail to &email-debian-release; if this happens to "
 msgid ""
 "Currently, this requires some manual hinting from the release team.  Please "
 "contact them by sending mail to &email-debian-release; if this happens to "


@@ -3228,44 +3307,46 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2405
+#: pkgs.dbk:2486

 msgid "influence of package in testing"
 msgstr "テスト版パッケージへの影響"
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "influence of package in testing"
 msgstr "テスト版パッケージへの影響"
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2407
+#: pkgs.dbk:2488

 msgid ""
 msgid ""

-"Generally, there is nothing that the status of a package in testing means "
-"for transition of the next version from unstable to testing, with two "
-"exceptions: If the RC-bugginess of the package goes down, it may go in even "
-"if it is still RC-buggy.  The second exception is if the version of the "
-"package in testing is out of sync on the different arches: Then any arch "
+"Generally, there is nothing that the status of a package in <literal>testing "
+"</literal> means for transition of the next version from <literal>unstable </"
+"literal> to <literal>testing</literal>, with two exceptions: If the RC-"
+"bugginess of the package goes down, it may go in even if it is still RC-"
+"buggy.  The second exception is if the version of the package in <literal> "
+"testing</literal> is out of sync on the different arches: Then any arch "

 "might just upgrade to the version of the source package; however, this can "
 "happen only if the package was previously forced through, the arch is in "
 "fuckedarches, or there was no binary package of that arch present in "
 "might just upgrade to the version of the source package; however, this can "
 "happen only if the package was previously forced through, the arch is in "
 "fuckedarches, or there was no binary package of that arch present in "

-"unstable at all during the testing migration."
+"<literal>unstable </literal> at all during the <literal>testing</literal> "
+"migration."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2417
+#: pkgs.dbk:2500

 msgid ""
 msgid ""

-"In summary this means: The only influence that a package being in testing "
-"has on a new version of the same package is that the new version might go in "
-"easier."
+"In summary this means: The only influence that a package being in <literal> "
+"testing</literal> has on a new version of the same package is that the new "
+"version might go in easier."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2424
+#: pkgs.dbk:2507

 msgid "details"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "details"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2426
+#: pkgs.dbk:2509

 msgid "If you are interested in details, this is how britney works:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "If you are interested in details, this is how britney works:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2429
+#: pkgs.dbk:2512

 msgid ""
 "The packages are looked at to determine whether they are valid candidates.  "
 "This gives the update excuses.  The most common reasons why a package is not "
 msgid ""
 "The packages are looked at to determine whether they are valid candidates.  "
 "This gives the update excuses.  The most common reasons why a package is not "


@@ -3278,48 +3359,52 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2438
+#: pkgs.dbk:2521

 msgid ""
 msgid ""

-"Now, the more complex part happens: Britney tries to update testing with the "
-"valid candidates; first, each package alone, and then larger and even larger "
-"sets of packages together.  Each try is accepted if testing is not more "
-"uninstallable after the update than before.  (Before and after this part, "
-"some hints are processed; but as only release masters can hint, this is "
-"probably not so important for you.)"
+"Now, the more complex part happens: Britney tries to update <literal>testing "
+"</literal> with the valid candidates. For that, britney tries to add each "
+"valid candidate to the testing distribution. If the number of uninstallable "
+"packages in <literal>testing</literal> doesn't increase, the package is "
+"accepted. From that point on, the accepted package is considered to be part "
+"of <literal>testing</literal>, such that all subsequent installability tests "
+"include this package.  Hints from the release team are processed before or "
+"after this main run, depending on the exact type."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2446
+#: pkgs.dbk:2531

 msgid ""
 msgid ""

-"If you want to see more details, you can look it up on merkel:/org/&ftp-"
-"debian-org;/testing/update_out/ (or there in ~aba/testing/update_out to see "
-"a setup with a smaller packages file).  Via web, it's at <ulink url=\"http://"
-"&ftp-master-host;/testing/update_out_code/\"></ulink>"
+"If you want to see more details, you can look it up on <filename>merkel:/org/"
+"&ftp-debian-org;/testing/update_out/</filename> (or in <filename>merkel:~aba/"
+"testing/update_out</filename> to see a setup with a smaller packages file).  "
+"Via web, it's at <ulink url=\"http://&ftp-master-host;/testing/"
+"update_out_code/\"></ulink>"

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2453
+#: pkgs.dbk:2538

 msgid ""
 "The hints are available via <ulink url=\"http://&ftp-master-host;/testing/"
 "hints/\"></ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "The hints are available via <ulink url=\"http://&ftp-master-host;/testing/"
 "hints/\"></ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2461
+#: pkgs.dbk:2546

 msgid "Direct updates to testing"
 msgstr "直接テスト版を更新する"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Direct updates to testing"
 msgstr "直接テスト版を更新する"
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2463
+#: pkgs.dbk:2548

 msgid ""
 msgid ""

-"The testing distribution is fed with packages from unstable according to the "
-"rules explained above.  However, in some cases, it is necessary to upload "
-"packages built only for testing.  For that, you may want to upload to "
-"<emphasis>testing-proposed-updates</emphasis>."
+"The <literal>testing</literal> distribution is fed with packages from "
+"<literal>unstable</literal> according to the rules explained above.  "
+"However, in some cases, it is necessary to upload packages built only for "
+"<literal> testing</literal>.  For that, you may want to upload to <literal> "
+"testing-proposed-updates</literal>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2469
+#: pkgs.dbk:2555

 msgid ""
 "Keep in mind that packages uploaded there are not automatically processed, "
 "they have to go through the hands of the release manager.  So you'd better "
 msgid ""
 "Keep in mind that packages uploaded there are not automatically processed, "
 "they have to go through the hands of the release manager.  So you'd better "


@@ -3329,146 +3414,147 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2476
+#: pkgs.dbk:2562

 msgid ""
 msgid ""

-"You should not upload to <emphasis>testing-proposed-updates</emphasis> when "
-"you can update your packages through <emphasis>unstable</emphasis>.  If you "
+"You should not upload to <literal>testing-proposed-updates</literal> when "
+"you can update your packages through <literal>unstable</literal>.  If you "

 "can't (for example because you have a newer development version in "
 "can't (for example because you have a newer development version in "

-"unstable), you may use this facility, but it is recommended that you ask for "
-"authorization from the release manager first.  Even if a package is frozen, "
-"updates through unstable are possible, if the upload via unstable does not "
-"pull in any new dependencies."
+"<literal>unstable </literal>), you may use this facility, but it is "
+"recommended that you ask for authorization from the release manager first.  "
+"Even if a package is frozen, updates through <literal>unstable</literal> are "
+"possible, if the upload via <literal>unstable</literal> does not pull in any "
+"new dependencies."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2485
+#: pkgs.dbk:2571

 msgid ""
 msgid ""

-"Version numbers are usually selected by adding the codename of the testing "
-"distribution and a running number, like 1.2sarge1 for the first upload "
-"through testing-proposed-updates of package version 1.2."
+"Version numbers are usually selected by adding the codename of the "
+"<literal>testing</literal> distribution and a running number, like "
+"<literal>1.2sarge1</literal> for the first upload through <literal>testing-"
+"proposed-updates</literal> of package version <literal>1.2</literal>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: pkgs.dbk:2490
+#: pkgs.dbk:2578

 msgid "Please make sure you didn't miss any of these items in your upload:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Please make sure you didn't miss any of these items in your upload:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2495
+#: pkgs.dbk:2583

 msgid ""
 msgid ""

-"Make sure that your package really needs to go through <emphasis>testing-"
-"proposed-updates</emphasis>, and can't go through unstable;"
+"Make sure that your package really needs to go through <literal>testing-"
+"proposed-updates</literal>, and can't go through <literal> unstable</"
+"literal>;"

 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2501
+#: pkgs.dbk:2590

 msgid "Make sure that you included only the minimal amount of changes;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Make sure that you included only the minimal amount of changes;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2506
+#: pkgs.dbk:2595

 msgid ""
 "Make sure that you included an appropriate explanation in the changelog;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "Make sure that you included an appropriate explanation in the changelog;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2511
+#: pkgs.dbk:2600

 msgid ""
 msgid ""

-"Make sure that you've written <emphasis>testing</emphasis> or "
-"<emphasis>testing-proposed-updates</emphasis> into your target distribution;"
+"Make sure that you've written <literal>testing</literal> or <literal>testing-"
+"proposed-updates</literal> into your target distribution;"

 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2517
+#: pkgs.dbk:2606

 msgid ""
 msgid ""

-"Make sure that you've built and tested your package in <emphasis>testing</"
-"emphasis>, not in <emphasis>unstable</emphasis>;"
+"Make sure that you've built and tested your package in <literal>testing</"
+"literal>, not in <literal>unstable</literal>;"

 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2523
+#: pkgs.dbk:2612

 msgid ""
 "Make sure that your version number is higher than the version in "
 msgid ""
 "Make sure that your version number is higher than the version in "

-"<emphasis>testing</emphasis> and <emphasis>testing-proposed-updates</"
-"emphasis>, and lower than in <emphasis>unstable</emphasis>;"
+"<literal>testing</literal> and <literal>testing-proposed-updates</literal>, "
+"and lower than in <literal>unstable</literal>;"

 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: pkgs.dbk:2530
+#: pkgs.dbk:2619

 msgid ""
 "After uploading and successful build on all platforms, contact the release "
 "team at &email-debian-release; and ask them to approve your upload."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "After uploading and successful build on all platforms, contact the release "
 "team at &email-debian-release; and ask them to approve your upload."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: pkgs.dbk:2538
+#: pkgs.dbk:2627

 msgid "Frequently asked questions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgid "Frequently asked questions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2540
+#: pkgs.dbk:2629

 msgid "What are release-critical bugs, and how do they get counted?"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "What are release-critical bugs, and how do they get counted?"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2542
+#: pkgs.dbk:2631

 msgid ""
 "All bugs of some higher severities are by default considered release-"
 msgid ""
 "All bugs of some higher severities are by default considered release-"

-"critical; currently, these are critical, grave, and serious bugs."
+"critical; currently, these are <literal>critical</literal>, <literal>grave</"
+"literal> and <literal>serious</literal> bugs."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2546
+#: pkgs.dbk:2636

 msgid ""
 "Such bugs are presumed to have an impact on the chances that the package "
 msgid ""
 "Such bugs are presumed to have an impact on the chances that the package "

-"will be released with the stable release of Debian: in general, if a package "
-"has open release-critical bugs filed on it, it won't get into testing, and "
-"consequently won't be released in stable."
+"will be released with the <literal>stable</literal> release of Debian: in "
+"general, if a package has open release-critical bugs filed on it, it won't "
+"get into <literal>testing</literal>, and consequently won't be released in "
+"<literal> stable</literal>."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2552
+#: pkgs.dbk:2643

 msgid ""
 msgid ""

-"The unstable bug count are all release-critical bugs without either any "
-"release-tag (such as potato, woody) or with release-tag sid; also, only if "
-"they are neither fixed nor set to sarge-ignore.  The testing bug count for a "
-"package is considered to be roughly the bug count of unstable count at the "
-"last point when the testing version equalled the unstable version."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2559
-msgid ""
-"This will change post-sarge, as soon as we have versions in the bug tracking "
-"system."
+"The <literal>unstable</literal> bug count are all release-critical bugs "
+"which are marked to apply to <replaceable>package</replaceable>/"
+"<replaceable>version </replaceable> combinations that are available in "
+"unstable for a release architecture. The <literal>testing</literal> bug "
+"count is defined analogously."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>

-#: pkgs.dbk:2565
+#: pkgs.dbk:2651

 msgid ""
 msgid ""

-"How could installing a package into testing possibly break other packages?"
+"How could installing a package into <literal>testing</literal> possibly "
+"break other packages?"

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2567
+#: pkgs.dbk:2654

 msgid ""
 "The structure of the distribution archives is such that they can only "
 "contain one version of a package; a package is defined by its name.  So when "
 msgid ""
 "The structure of the distribution archives is such that they can only "
 "contain one version of a package; a package is defined by its name.  So when "

-"the source package acmefoo is installed into testing, along with its binary "
-"packages acme-foo-bin, acme-bar-bin, libacme-foo1 and libacme-foo-dev, the "
-"old version is removed."
+"the source package <literal>acmefoo</literal> is installed into "
+"<literal>testing</literal>, along with its binary packages <literal>acme-foo-"
+"bin</literal>, <literal> acme-bar-bin</literal>, <literal>libacme-foo1</"
+"literal> and <literal> libacme-foo-dev</literal>, the old version is removed."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2574
+#: pkgs.dbk:2662

 msgid ""
 "However, the old version may have provided a binary package with an old "
 msgid ""
 "However, the old version may have provided a binary package with an old "

-"soname of a library, such as libacme-foo0.  Removing the old acmefoo will "
-"remove libacme-foo0, which will break any packages which depend on it."
+"soname of a library, such as <literal>libacme-foo0</literal>.  Removing the "
+"old <literal>acmefoo</literal> will remove <literal>libacme-foo0</literal>, "
+"which will break any packages which depend on it."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2579
+#: pkgs.dbk:2668

 msgid ""
 "Evidently, this mainly affects packages which provide changing sets of "
 "binary packages in different versions (in turn, mainly libraries).  However, "
 msgid ""
 "Evidently, this mainly affects packages which provide changing sets of "
 "binary packages in different versions (in turn, mainly libraries).  However, "


@@ -3477,22 +3563,22 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2585
+#: pkgs.dbk:2674

 msgid ""
 "When the set of binary packages provided by a source package change in this "
 "way, all the packages that depended on the old binaries will have to be "
 "updated to depend on the new binaries instead.  Because installing such a "
 msgid ""
 "When the set of binary packages provided by a source package change in this "
 "way, all the packages that depended on the old binaries will have to be "
 "updated to depend on the new binaries instead.  Because installing such a "

-"source package into testing breaks all the packages that depended on it in "
-"testing, some care has to be taken now: all the depending packages must be "
-"updated and ready to be installed themselves so that they won't be broken, "
-"and, once everything is ready, manual intervention by the release manager or "
-"an assistant is normally required."
+"source package into <literal>testing</literal> breaks all the packages that "
+"depended on it in <literal>testing</literal>, some care has to be taken now: "
+"all the depending packages must be updated and ready to be installed "
+"themselves so that they won't be broken, and, once everything is ready, "
+"manual intervention by the release manager or an assistant is normally "
+"required."

 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>

-#: pkgs.dbk:2595
+#: pkgs.dbk:2685

 msgid ""
 "If you are having problems with complicated groups of packages like this, "
 msgid ""
 "If you are having problems with complicated groups of packages like this, "

-"contact debian-devel or debian-release for help."
+"contact &email-debian-devel; or &email-debian-release; for help."

 msgstr ""
 msgstr ""

-

diff --git a/po4a/ja/resources.po b/po4a/ja/resources.po
index 281fc10d87470bdaa629917794e01d4a3a5baa3f..15e9a3ca1602ffb56d3ff3ce5fde33a087a6185b 100644 (file)
--- a/po4a/ja/resources.po
+++ b/po4a/ja/resources.po
@@ -1,11 +1,11 @@
 # Debian Developer's Reference (Japanese)
 # Debian Developer's Reference (Japanese)

-# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2008.
+# (C) Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2008.

 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: developers-reference 3.3.9\n"
-"POT-Creation-Date: 2008-03-05 18:03+0900\n"
-"PO-Revision-Date: 2008-06-17 11:27+0200\n"
+"Project-Id-Version: developers-reference 3.4.0\n"
+"POT-Creation-Date: 2008-06-14 23:00+0900\n"
+"PO-Revision-Date: 2008-07-04 04:27+0900\n"

 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"
 "MIME-Version: 1.0\n"


@@ -79,9 +79,9 @@ msgid ""
 "As ever on the net, please trim down the quoting of articles you're replying "
 "to.  In general, please adhere to the usual conventions for posting messages."
 msgstr ""
 "As ever on the net, please trim down the quoting of articles you're replying "
 "to.  In general, please adhere to the usual conventions for posting messages."
 msgstr ""

-"クロスポスト (同じメッセージを複数のメーリングリストに投稿する) のはお止め下さい。"
-"ã\81\84ã\81¤ã\82\82ã\81®ã\83\8dã\83\83ã\83\88ä¸\8aã\81¨å\90\8cã\81\98æ§\98ã\81«ã\80\81è¿\94ä¿¡æ\96\87ã\81§ã\81¯å¼\95ç\94¨ã\82\92å\89\8aã\81£ã\81¦ä¸\8bã\81\95ã\81\84ã\80\82"
-"概して投稿するメッセージについては、通常の慣習をしっかりと守ってください。"
+"クロスポスト (同じメッセージを複数のメーリングリストに投稿する) のはお止め下"
+"ã\81\95ã\81\84ã\80\82ã\81\84ã\81¤ã\82\82ã\81®ã\83\8dã\83\83ã\83\88ä¸\8aã\81¨å\90\8cã\81\98æ§\98ã\81«ã\80\81è¿\94ä¿¡æ\96\87ã\81§ã\81¯å¼\95ç\94¨ã\82\92å\89\8aã\81£ã\81¦ä¸\8bã\81\95ã\81\84ã\80\82æ¦\82ã\81\97ã\81¦æ\8a\95稿ã\81\99"
+"るメッセージについては、通常の慣習をしっかりと守ってください。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:40
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:40


@@ -91,8 +91,8 @@ msgid ""
 "Community Guidelines</ulink> are also worth reading."
 msgstr ""
 "詳細については<ulink url=\"&url-debian-lists;#codeofconduct\">行動規範</"
 "Community Guidelines</ulink> are also worth reading."
 msgstr ""
 "詳細については<ulink url=\"&url-debian-lists;#codeofconduct\">行動規範</"

-"ulink>を参照してください。<ulink url=\"&url-dcg;\">Debian コミュニティ"
-"ã\82¬ã\82¤ã\83\89ã\83©ã\82¤ã\83³</ulink>ã\82\82読ã\82\80ã\81¨è\89¯ã\81\84ã\81§ã\81\97ã\82\87ã\81\86ã\80\82"
+"ulink>を参照してください。<ulink url=\"&url-dcg;\">Debian コミュニティガイド"
+"ライン</ulink>も読むと良いでしょう。"

 
 # type: Content of: <chapter><section><section><title>
 #: resources.dbk:48
 
 # type: Content of: <chapter><section><section><title>
 #: resources.dbk:48


@@ -161,19 +161,18 @@ msgid ""
 "is really necessary.  Moreover, do <emphasis>not</emphasis> forward email "
 "from that list to anyone.  Archives of this list are not available on the "
 "web for obvious reasons, but you can see them using your shell account on "
 "is really necessary.  Moreover, do <emphasis>not</emphasis> forward email "
 "from that list to anyone.  Archives of this list are not available on the "
 "web for obvious reasons, but you can see them using your shell account on "

-"<literal>&lists-host;</literal> and looking in the <filename>&file-debian-"
+"<literal>&master-host;</literal> and looking in the <filename>&file-debian-"

 "private-archive;</filename> directory."
 msgstr ""
 "private-archive;</filename> directory."
 msgstr ""

-"&email-debian-private; は Debian 開発者間でのプライベートな話し合い用に使う"
-"特別なメーリングリストです。つまり、理由がなんであれここに投稿された文章は公開"
-"するべきではないものであることを意味しています。"
-"このため、これは流量が少ないメーリングリストで、ユーザは本当に必要でない限りは "
-"&email-debian-private; を使わないように勧められています。"
-"さらに、このメーリングリストから誰かへメールを転送しては<emphasis>いけません"
-"</emphasis>。"
-"様々な理由からこのメーリングリストのアーカイブはウェブから見ることはできませんが、"
-"<literal>&lists-host;</literal> 上のシェルアカウントを使って <filename>&file-"
-"debian-private-archive;</filename> ディレクトリを参照することで確認できます。"
+"&email-debian-private; は Debian 開発者間でのプライベートな話し合い用に使う特"
+"別なメーリングリストです。つまり、理由がなんであれここに投稿された文章は公開"
+"するべきではないものであることを意味しています。このため、これは流量が少ない"
+"メーリングリストで、ユーザは本当に必要でない限りは &email-debian-private; を"
+"使わないように勧められています。さらに、このメーリングリストから誰かへメール"
+"を転送しては<emphasis>いけません</emphasis>。様々な理由からこのメーリングリス"
+"トのアーカイブはウェブから見ることはできませんが、<literal>master-host;</"
+"literal> 上のシェルアカウントを使って <filename>&file-debian-private-archive;"
+"</filename> ディレクトリを参照することで確認できます。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:100
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:100


@@ -184,9 +183,9 @@ msgid ""
 "to have the discussion archived somewhere."
 msgstr ""
 "&email-debian-email; は、特別なメーリングリストです。ライセンス、バグ、その他"
 "to have the discussion archived somewhere."
 msgstr ""
 "&email-debian-email; は、特別なメーリングリストです。ライセンス、バグ、その他"

-"について upstream の作者にコンタクトを取る、他の人とプロジェクトについて議論した"
-"内容をアーカイブしておくのに役立つ Debian に関するメールをまとめた「福袋」として"
-"使われています。"
+"について upstream の作者にコンタクトを取る、他の人とプロジェクトについて議論"
+"した内容をアーカイブしておくのに役立つ Debian に関するメールをまとめた「福"
+"袋」として使われています。"

 
 # type: Content of: <chapter><section><section><title>
 #: resources.dbk:108
 
 # type: Content of: <chapter><section><section><title>
 #: resources.dbk:108


@@ -243,34 +242,34 @@ msgstr ""
 # type: Content of: <chapter><section><para>
 #: resources.dbk:135
 msgid ""
 # type: Content of: <chapter><section><para>
 #: resources.dbk:135
 msgid ""

-"The main channel for Debian in general is <emphasis>#debian</emphasis>.  "
-"This is a large, general-purpose channel where users can find recent news in "
-"the topic and served by bots.  <emphasis>#debian</emphasis> is for English "
-"speakers; there are also <emphasis>#debian.de</emphasis>, <emphasis>#debian-"
-"fr</emphasis>, <emphasis>#debian-br</emphasis> and other similarly named "
-"channels for speakers of other languages."
+"The main channel for Debian in general is <literal>#debian</literal>.  This "
+"is a large, general-purpose channel where users can find recent news in the "
+"topic and served by bots.  <literal>#debian</literal> is for English "
+"speakers; there are also <literal>#debian.de</literal>, <literal>#debian-fr</"
+"literal>, <literal>#debian-br</literal> and other similarly named channels "
+"for speakers of other languages."

 msgstr ""
 msgstr ""

-"Debian 用のメインのチャンネルは一般的にいって <emphasis>#debian</emphasis> で"
-"ã\81\99ã\80\82ã\81\93ã\82\8cã\81¯å·¨å¤§ã\81ªã\80\81å¤\9aç\9b®ç\9a\84ã\81®ã\83\81ã\83£ã\83³ã\83\8dã\83«ã\81§ã\80\81ã\83¦ã\83¼ã\82¶ã\81¯トピックやボットによって提供"
-"される最近のニュースを見つけることができる場所です。<emphasis>#debian</"
-"emphasis> は英語を話す人たち用のもので、他の言語を話す人達のために同様なものには "
-"<emphasis>#debian.de</emphasis>、<emphasis>#debian-fr</emphasis>、"
-"<emphasis>#debian-br</emphasis> や他にも似通った名前のチャンネルがあります。"
+"Debian 用のメインのチャンネルは一般的にいって <literal>#debian</literal> に"
+"ã\81ªã\82\8aã\81¾ã\81\99ã\80\82ã\81\93ã\82\8cã\81¯å·¨å¤§ã\81ªã\80\81å¤\9aç\9b®ç\9a\84ã\81®ã\83\81ã\83£ã\83³ã\83\8dã\83«ã\81§ã\80\81ã\83¦ã\83¼ã\82¶ã\81\8cトピックやボットによって提供"
+"される最近のニュースを見つけることができる場所です。<literal>#debian</"
+"literal> は英語を話す人たち用のもので、他の言語を話す人達のために同様なもの"
+"には <literal>#debian.de</literal>、<literal>#debian-fr</literal>、"
+"<literal>#debian-br</literal> など他にも似通った名前のチャンネルがあります。"

 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:143
 msgid ""
 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:143
 msgid ""

-"The main channel for Debian development is <emphasis>#debian-devel</"
-"emphasis>.  It is a very active channel since usually over 150 people are "
+"The main channel for Debian development is <literal>#debian-devel</"
+"literal>.  It is a very active channel since usually over 150 people are "

 "always logged in.  It's a channel for people who work on Debian, it's not a "
 "always logged in.  It's a channel for people who work on Debian, it's not a "

-"support channel (there's <emphasis>#debian</emphasis> for that).  It is "
+"support channel (there's <literal>#debian</literal> for that).  It is "

 "however open to anyone who wants to lurk (and learn).  Its topic is commonly "
 "full of interesting information for developers."
 msgstr ""
 "however open to anyone who wants to lurk (and learn).  Its topic is commonly "
 "full of interesting information for developers."
 msgstr ""

-"Debian 開発での中心のチャンネルは <emphasis>#debian-devel</emphasis> です。こ"
+"Debian 開発での中心のチャンネルは <literal>#debian-devel</literal> です。こ"

 "れはとてもアクティブなチャンネルで、大抵 150 人以上が常にログインしています。"
 "このチャンネルは Debian で作業する人達のためのチャンネルであって、サポート用"
 "れはとてもアクティブなチャンネルで、大抵 150 人以上が常にログインしています。"
 "このチャンネルは Debian で作業する人達のためのチャンネルであって、サポート用"

-"のチャンネルではありません (そのためには <emphasis>#debian</emphasis> があり"
+"のチャンネルではありません (そのためには <literal>#debian</literal> があり"

 "ます)。このチャンネルは、こっそり覗いてみたい (そして学びたい) 人に対しても"
 "オープンでもあります。このチャンネルのトピックは、開発者にとって興味深い情報"
 "に大概溢れています。"
 "ます)。このチャンネルは、こっそり覗いてみたい (そして学びたい) 人に対しても"
 "オープンでもあります。このチャンネルのトピックは、開発者にとって興味深い情報"
 "に大概溢れています。"


@@ -278,54 +277,54 @@ msgstr ""
 # type: Content of: <chapter><section><para>
 #: resources.dbk:151
 msgid ""
 # type: Content of: <chapter><section><para>
 #: resources.dbk:151
 msgid ""

-"Since <emphasis>#debian-devel</emphasis> is an open channel, you should not "
+"Since <literal>#debian-devel</literal> is an open channel, you should not "

 "speak there of issues that are discussed in &email-debian-private;.  There's "
 "speak there of issues that are discussed in &email-debian-private;.  There's "

-"another channel for this purpose, it's called <emphasis>#debian-private</"
-"emphasis> and it's protected by a key.  This key is available in the "
-"archives of debian-private in <filename>master.debian.org:&file-debian-"
-"private-archive;</filename>, just <command>zgrep</command> for "
-"<emphasis>#debian-private</emphasis> in all the files."
+"another channel for this purpose, it's called <literal>#debian-private</"
+"literal> and it's protected by a key.  This key is available in the archives "
+"of debian-private in <filename>master.debian.org:&file-debian-private-"
+"archive;</filename>, just <command>zgrep</command> for <literal>#debian-"
+"private</literal> in all the files."

 msgstr ""
 msgstr ""

-"<emphasis>#debian-devel</emphasis> は公開チャンネルなので、&email-debian-"
+"<literal>#debian-devel</literal> は公開チャンネルなので、&email-debian-"

 "private; で話されている話題について触れるべきではありません。この目的の為に"
 "private; で話されている話題について触れるべきではありません。この目的の為に"

-"は、<emphasis>#debian-private</emphasis> という鍵で守られた他のチャンネルがあ"
+"は、<literal>#debian-private</literal> という鍵で守られた他のチャンネルがあ"

 "ります。この鍵は <filename>master.debian.org:&file-debian-private-archive;</"
 "filename> の debian-private のアーカイブ中にあります。全ファイルで "
 "ります。この鍵は <filename>master.debian.org:&file-debian-private-archive;</"
 "filename> の debian-private のアーカイブ中にあります。全ファイルで "

-"<emphasis>#debian-private</emphasis> を <command>zgrep</command> してくださ"
+"<literal>#debian-private</literal> を <command>zgrep</command> してくださ"

 "い。"
 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:161
 msgid ""
 "There are other additional channels dedicated to specific subjects.  "
 "い。"
 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:161
 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-kde</emphasis>, <emphasis>#debian-dpkg</emphasis>, "
-"<emphasis>#debian-jr</emphasis>, <emphasis>#debian-edu</emphasis>, "
-"<emphasis>#debian-oo</emphasis> (OpenOffice package) ..."
-msgstr ""
-"他にも、特定の話題について専用のチャンネルがあります。<emphasis>#debian-"
-"bugs</emphasis> は、バグ潰しパーティ (BSP) を開催するために使われます。"
-"<emphasis>#debian-boot</emphasis> は、debian-installer の作業を調整するのに利"
-"用されています。<emphasis>#debian-doc</emphasis> は、今あなたが読んでいるよう"
+"<literal>#debian-kde</literal>, <literal>#debian-dpkg</literal>, "
+"<literal>#debian-jr</literal>, <literal>#debian-edu</literal>, "
+"<literal>#debian-oo</literal> (OpenOffice package) ..."
+msgstr ""
+"他にも、特定の話題について専用のチャンネルがあります。<literal>#debian-"
+"bugs</literal> は、バグ潰しパーティ (BSP) を開催するために使われます。"
+"<literal>#debian-boot</literal> は、debian-installer の作業を調整するのに利"
+"用されています。<literal>#debian-doc</literal> は、今あなたが読んでいるよう"

 "な文章のドキュメント化について話すために時折使われています。アーキテクチャや"
 "パッケージ群について話すため、他にも専用チャンネルがあります："
 "な文章のドキュメント化について話すために時折使われています。アーキテクチャや"
 "パッケージ群について話すため、他にも専用チャンネルがあります："

-"<emphasis>#debian-kde</emphasis>、<emphasis>#debian-dpkg</emphasis>、"
-"<emphasis>#debian-jr</emphasis>、<emphasis>#debian-edu</emphasis>、"
-"<emphasis>#debian-oo</emphasis> (OpenOffice パッケージ) など…"
+"<literal>#debian-kde</literal>、<literal>#debian-dpkg</literal>、"
+"<literal>#debian-jr</literal>、<literal>#debian-edu</literal>、"
+"<literal>#debian-oo</literal> (OpenOffice パッケージ) など…"

 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:172
 msgid ""
 "Some non-English developers' channels exist as well, for example "
 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:172
 msgid ""
 "Some non-English developers' channels exist as well, for example "

-"<emphasis>#debian-devel-fr</emphasis> for French speaking people interested "
-"in Debian's development."
+"<literal>#debian-devel-fr</literal> for French speaking people interested in "
+"Debian's development."

 msgstr ""
 msgstr ""

-"同様に非英語圏の開発者のチャンネルも存在しています。例えば <emphasis>#debian-"
-"devel-fr</emphasis> は Debian の開発に興味があるフランス語を使う人々のための"
+"同様に非英語圏の開発者のチャンネルも存在しています。例えば <literal>#debian-"
+"devel-fr</literal> は Debian の開発に興味があるフランス語を使う人々のための"

 "チャンネルです。"
 
 # type: Content of: <chapter><section><para>
 "チャンネルです。"
 
 # type: Content of: <chapter><section><para>


@@ -351,14 +350,13 @@ msgid ""
 "freenode.net/faq.shtml#projectcloak\">Freenodes documentation</ulink> for "
 "more information about cloaks."
 msgstr ""
 "freenode.net/faq.shtml#projectcloak\">Freenodes documentation</ulink> for "
 "more information about cloaks."
 msgstr ""

-"freenode でクローク担当に手助けしてもらうには、Jörg Jaspert "
-"&lt;joerg@debian.org&gt; さんに対して、利用する nick (ニックネーム) を書いて "
-"GPG 署名したメールを送ります。メールの Subject: ヘッダのどこかに cloak の文字を"
-"入れてください。nick は登録をする必要があります："
-"<ulink url=\"http://freenode.net/faq.shtml#nicksetup\">ニックネームの設定の"
-"仕方を書いたページ</ulink>を参照下さい。メールは Debian keyring にある鍵でサイン"
-"されている必要があります。"
-"クローク担当についての詳細は <ulink url=\"http://freenode.net/faq."
+"freenode でクローク担当に手助けしてもらうには、Jörg Jaspert &lt;joerg@debian."
+"org&gt; さんに対して、利用する nick (ニックネーム) を書いて GPG 署名したメー"
+"ルを送ります。メールの Subject: ヘッダのどこかに cloak の文字を入れてくださ"
+"い。nick は登録をする必要があります：<ulink url=\"http://freenode.net/faq."
+"shtml#nicksetup\">ニックネームの設定の仕方を書いたページ</ulink>を参照下さ"
+"い。メールは Debian keyring にある鍵でサインされている必要があります。クロー"
+"ク担当についての詳細は <ulink url=\"http://freenode.net/faq."

 "shtml#projectcloak\">Freenode のドキュメント</ulink> を参照してください。"
 
 # type: Content of: <chapter><section><title>
 "shtml#projectcloak\">Freenode のドキュメント</ulink> を参照してください。"
 
 # type: Content of: <chapter><section><title>


@@ -403,8 +401,8 @@ msgid ""
 "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 ""

-"マシンのうち幾つかは、<ulink url=\"&url-dmup;\">Debian マシン利用ポリシー</ulink>"
-"で定められたルールに従う限り、個々の開発者の利用が可能となっています。"
+"マシンのうち幾つかは、<ulink url=\"&url-dmup;\">Debian マシン利用ポリシー</"
+"ulink>で定められたルールに従う限り、個々の開発者の利用が可能となっています。"

 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:217
 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:217


@@ -415,11 +413,10 @@ msgid ""
 "the approval of the system administrators.  Usually these machines are run "
 "by volunteers."
 msgstr ""
 "the approval of the system administrators.  Usually these machines are run "
 "by volunteers."
 msgstr ""

-"とにかく、これらのマシンをあなたが Debian 関連の目的に合うと思った"
-"ことに利用できます。システム管理者には丁寧に接し、システム管理者からの"
-"許可を最初に得ることなく、非常に大量のディスク容量／ネットワーク帯域／CPU を"
-"消費しないようにしてください。大抵これらのマシンはボランティアによって運用"
-"されています。"
+"とにかく、これらのマシンをあなたが Debian 関連の目的に合うと思ったことに利用"
+"できます。システム管理者には丁寧に接し、システム管理者からの許可を最初に得る"
+"ことなく、非常に大量のディスク容量／ネットワーク帯域／CPU を消費しないように"
+"してください。大抵これらのマシンはボランティアによって運用されています。"

 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:224
 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:224


@@ -463,12 +460,12 @@ msgid ""
 "\"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 ""
 "\"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 ""

-"Debian サーバでの作業について問題があり、システム管理者らに知らせる必要があると"
-"考えた場合は、<ulink url=\"&url-rt;\" /> にあるリクエストトラッカーの DSA キュー"
-"ã\81§å\85¬é\96\8bã\81\95ã\82\8cã\81¦ã\81\84ã\82\8bå\95\8fé¡\8cã\81®ã\83ªã\82¹ã\83\88ã\82\92確èª\8dã\81§ã\81\8dã\81¾ã\81\99 (\"guest\" ã\83¦ã\83¼ã\82¶ã\81¨ \"readonly\" "
-"パスワードでログインできます)。"
-"新たな問題を報告するには、単に &email-rt-dsa; にメールを送ってください。"
-"\"Debian RT\" をサブジェクトのどこかに入れるのを忘れずに。"
+"Debian サーバでの作業について問題があり、システム管理者らに知らせる必要がある"
+"と考えた場合は、<ulink url=\"&url-rt;\" /> にあるリクエストトラッカーの DSA "
+"ã\82­ã\83¥ã\83¼ã\81§å\85¬é\96\8bã\81\95ã\82\8cã\81¦ã\81\84ã\82\8bå\95\8fé¡\8cã\81®ã\83ªã\82¹ã\83\88ã\82\92確èª\8dã\81§ã\81\8dã\81¾ã\81\99 (\"guest\" ã\83¦ã\83¼ã\82¶ã\81¨ "
+"\"readonly\" パスワードでログインできます)。新たな問題を報告するには、単に "
+"&email-rt-dsa; にメールを送ってください。\"Debian RT\" をサブジェクトのどこか"
+"に入れるのを忘れずに。"

 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:247
 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:247


@@ -523,8 +520,8 @@ msgid ""
 "duplication of effort or wasted processing time."
 msgstr ""
 "Debian のバグについて定量的な分析や処理をするような計画がある場合、ここで行っ"
 "duplication of effort or wasted processing time."
 msgstr ""
 "Debian のバグについて定量的な分析や処理をするような計画がある場合、ここで行っ"

-"てください。ですが、不要な作業の重複や処理時間の浪費を減らすため、何であれ実装"
-"する前に &email-debian-devel; であなたの計画を説明してください。"
+"てください。ですが、不要な作業の重複や処理時間の浪費を減らすため、何であれ実"
+"装する前に &email-debian-devel; であなたの計画を説明してください。"

 
 # type: Content of: <chapter><section><section><title>
 #: resources.dbk:275
 
 # type: Content of: <chapter><section><section><title>
 #: resources.dbk:275


@@ -538,9 +535,9 @@ msgid ""
 "the Debian archive.  Generally, package uploads go to this server; see <xref "
 "linkend=\"upload\"/>."
 msgstr ""
 "the Debian archive.  Generally, package uploads go to this server; see <xref "
 "linkend=\"upload\"/>."
 msgstr ""

-"<literal>&ftp-master-host;</literal> サーバは、Debian アーカイブのコピーの中心"
-"位置を占めています。大抵の場合、パッケージはこのサーバにアップロードされます。"
-"<xref linkend=\"upload\"/> を参照してください。"
+"<literal>&ftp-master-host;</literal> サーバは、Debian アーカイブのコピーの中"
+"心位置を占めています。大抵の場合、パッケージはこのサーバにアップロードされま"
+"す。<xref linkend=\"upload\"/> を参照してください。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:285
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:285


@@ -615,12 +612,12 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:321
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:321

-#, fuzzy

 msgid ""
 "You should only use this particular location because it will be backed up, "
 "whereas on other hosts it won't."
 msgstr ""
 msgid ""
 "You should only use this particular location because it will be backed up, "
 "whereas on other hosts it won't."
 msgstr ""

-""
+"他のホストではバックアップされないのに対して、ここではバックアップされるので、"
+"これを使うのは特定の位置づけのものだけにするべきです。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:325
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:325


@@ -629,8 +626,9 @@ msgid ""
 "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 ""
 "materials subject to the U.S.  export restrictions, in which case you can "
 "use one of the other servers located outside the United States."
 msgstr ""

-"大抵の場合、他のホストを使う唯一の理由はアメリカの輸出制限に抵触する素材を公開する"
-"必要がある時です。その様な場合はアメリカ国外に位置する他のサーバのどれかを使えます。"
+"大抵の場合、他のホストを使う唯一の理由はアメリカの輸出制限に抵触する素材を公"
+"開する必要がある時です。その様な場合はアメリカ国外に位置する他のサーバのどれ"
+"かを使えます。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:330
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:330


@@ -655,15 +653,15 @@ msgid ""
 "repository. See <xref linkend=\"alioth\"/> for information on the services "
 "provided by Alioth."
 msgstr ""
 "repository. See <xref linkend=\"alioth\"/> for information on the services "
 "provided by Alioth."
 msgstr ""

-"あなたが行っている Debian に関連する作業にバージョン管理システムが必要であれば、"
-"Alioth にホストされている既存のリポジトリを使うことも新しいプロジェクトを作って、"
-"それにあなたが選んだ VCS のリポジトリを要求することも可能です。"
-"Alioth は CVS (alioth.debian.org)、Subversion (svn.debian.org)、Arch "
-"(tla/baz、共に arch.debian.org 上)、Bazaar (bzr.debian.org)、Darcs "
-"(darcs.debian.org)、Mercurial (hg.debian.org) そして Git (git.debian.org)"
-"ã\82\92ã\82µã\83\9dã\83¼ã\83\88ã\81\97ã\81¦ã\81\84ã\81¾ã\81\99ã\80\82ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\82\92 VCS ã\83ªã\83\9dã\82¸ã\83\88ã\83ªä¸\8aã\81§ã\83¡ã\83³ã\83\86ã\83\8aã\83³ã\82¹ã\81\99ã\82\8bäº\88å®\9aã\81§ã\81\82ã\82\8cã\81°ã\80\81"
-"Alioth で提供されているサービスについての詳細は <xref linkend=\"alioth\"/> を"
-"参照してください。"
+"あなたが行っている Debian に関連する作業にバージョン管理システムが必要であれ"
+"ば、Alioth にホストされている既存のリポジトリを使うことも新しいプロジェクトを"
+"作って、それにあなたが選んだ VCS のリポジトリを要求することも可能です。"
+"Alioth は CVS (alioth.debian.org)、Subversion (svn.debian.org)、Arch (tla/"
+"baz、共に arch.debian.org 上)、Bazaar (bzr.debian.org)、Darcs (darcs.debian."
+"org)、Mercurial (hg.debian.org) そして Git (git.debian.org)をサポートしていま"
+"ã\81\99ã\80\82ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\82\92 VCS ã\83ªã\83\9dã\82¸ã\83\88ã\83ªä¸\8aã\81§ã\83¡ã\83³ã\83\86ã\83\8aã\83³ã\82¹ã\81\99ã\82\8bäº\88å®\9aã\81§ã\81\82ã\82\8cã\81°ã\80\81Alioth ã\81§æ\8f\90"
+"供されているサービスについての詳細は <xref linkend=\"alioth\"/> を参照してく"
+"ださい。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:348
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:348


@@ -672,9 +670,9 @@ msgid ""
 "CVS repositories. But that service is deprecated in favor of Alioth.  Only a "
 "few projects are still using it."
 msgstr ""
 "CVS repositories. But that service is deprecated in favor of Alioth.  Only a "
 "few projects are still using it."
 msgstr ""

-"歴史的には Debian では、まず <literal>cvs.debian.org</literal> を CVS リポジトリ"
-"ã\81®æ\8f\90ä¾\9bã\81«ä½¿ã\81£ã\81¦ã\81\84ã\81¾ã\81\97ã\81\9fã\80\82ã\81\97ã\81\8bã\81\97ã\80\81ã\81\93ã\81®ã\82µã\83¼ã\83\93ã\82¹ã\81¯ Alioth ã\81«å\8f\96ã\81£ã\81¦ä»£ã\82\8fã\82\89ã\82\8cã\81¦ã\81\84ã\81¾ã\81\99ã\80\82"
-"極少数のプロジェクトだけが未だに使いつづけています。"
+"歴史的には Debian では、まず <literal>cvs.debian.org</literal> を CVS リポジ"
+"ã\83\88ã\83ªã\81®æ\8f\90ä¾\9bã\81«ä½¿ã\81£ã\81¦ã\81\84ã\81¾ã\81\97ã\81\9fã\80\82ã\81\97ã\81\8bã\81\97ã\80\81ã\81\93ã\81®ã\82µã\83¼ã\83\93ã\82¹ã\81¯ Alioth ã\81«å\8f\96ã\81£ã\81¦ä»£ã\82\8fã\82\89ã\82\8cã\81¦"
+"います。極少数のプロジェクトだけが未だに使いつづけています。"

 
 # type: Content of: <chapter><section><section><title>
 #: resources.dbk:355
 
 # type: Content of: <chapter><section><section><title>
 #: resources.dbk:355


@@ -709,9 +707,9 @@ msgid ""
 "find out which chroots are available via <literal>&url-devel-machines;</"
 "literal>."
 msgstr ""
 "find out which chroots are available via <literal>&url-devel-machines;</"
 "literal>."
 msgstr ""

-"全ての chroot 環境内で、一般ユーザの home ディレクトリが利用可能になっています。"
-"ã\81©ã\81® chroot ã\81\8cå\88©ç\94¨å\8f¯è\83½ã\81\8bã\81«ã\81¤ã\81\84ã\81¦ã\81¯ <ulink url=\"&url-devel-machines;\">"
-"&url-devel-machines;</ulink> にて確認ができます。"
+"全ての chroot 環境内で、一般ユーザの home ディレクトリが利用可能になっていま"
+"ã\81\99ã\80\82ã\81©ã\81® chroot ã\81\8cå\88©ç\94¨å\8f¯è\83½ã\81\8bã\81«ã\81¤ã\81\84ã\81¦ã\81¯ <ulink url=\"&url-devel-machines;"
+"\">&url-devel-machines;</ulink> にて確認ができます。"

 
 # type: Content of: <chapter><section><title>
 #: resources.dbk:374
 
 # type: Content of: <chapter><section><title>
 #: resources.dbk:374


@@ -727,11 +725,11 @@ msgid ""
 "is also available through the finger service on Debian servers, try "
 "<command>finger yourlogin@db.debian.org</command> to see what it reports."
 msgstr ""
 "is also available through the finger service on Debian servers, try "
 "<command>finger yourlogin@db.debian.org</command> to see what it reports."
 msgstr ""

-"<ulink url=\"&url-debian-db;\"></ulink> にある開発者データベースは、"
-"Debian 開発者のアトリビュートを操作する LDAP ディレクトリです。このリソースは"
-"Debian 開発者リストの検索に使えます。この情報の一部は Debian サーバの finger "
-"ã\82µã\83¼ã\83\93ã\82¹ã\82\92é\80\9aã\81\98ã\81¦ã\82\82å\88©ç\94¨å\8f¯è\83½ã\81«ã\81ªã\81£ã\81¦ã\81\84ã\81¾ã\81\99ã\80\82<command>finger "
-"yourlogin@db.debian.org</command> として何が返ってくるかを確認してみてください。"
+"<ulink url=\"&url-debian-db;\"></ulink> にある開発者データベースは、Debian 開"
+"発者のアトリビュートを操作する LDAP ディレクトリです。このリソースはDebian 開"
+"発者リストの検索に使えます。この情報の一部は Debian サーバの finger サービス"
+"ã\82\92é\80\9aã\81\98ã\81¦ã\82\82å\88©ç\94¨å\8f¯è\83½ã\81«ã\81ªã\81£ã\81¦ã\81\84ã\81¾ã\81\99ã\80\82<command>finger yourlogin@db.debian.org</"
+"command> として何が返ってくるかを確認してみてください。"

 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:384
 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:384


@@ -765,9 +763,9 @@ msgid ""
 "\">the world map of Debian developers</ulink>, phone and fax numbers, IRC "
 "nickname and web page"
 msgstr ""
 "\">the world map of Debian developers</ulink>, phone and fax numbers, IRC "
 "nickname and web page"
 msgstr ""

-"住所、国名、<ulink url=\"&url-worldmap;\">Debian 開発者世界地図</ulink>で"
-"使われている住んでいる地域の緯度経度、電話・ファックス番号、IRC でのニックネーム、"
-"そしてウェブページのアドレスなどの個人情報"
+"住所、国名、<ulink url=\"&url-worldmap;\">Debian 開発者世界地図</ulink>で使わ"
+"れている住んでいる地域の緯度経度、電話・ファックス番号、IRC でのニックネー"
+"ã\83 ã\80\81ã\81\9dã\81\97ã\81¦ã\82¦ã\82§ã\83\96ã\83\9aã\83¼ã\82¸ã\81®ã\82¢ã\83\89ã\83¬ã\82¹ã\81ªã\81©ã\81®å\80\8b人æ\83\85å ±"

 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #: resources.dbk:413
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #: resources.dbk:413


@@ -781,9 +779,9 @@ msgid ""
 "more information please read the online documentation that you can find at "
 "<ulink url=\"&url-debian-db-doc;\"></ulink>."
 msgstr ""
 "more information please read the online documentation that you can find at "
 "<ulink url=\"&url-debian-db-doc;\"></ulink>."
 msgstr ""

-"当然ですが、ほとんどの情報は外部からはアクセス可能にはなっていません。"
-"より詳細な情報については、<ulink url=\"&url-debian-db-doc;\"></ulink> で参照"
-"ã\81§ã\81\8dã\82\8bã\82ªã\83³ã\83©ã\82¤ã\83³ã\83\89ã\82­ã\83¥ã\83¡ã\83³ã\83\88ã\82\92読ã\82\93ã\81§ã\81\8fã\81 ã\81\95ã\81\84ã\80\82"
+"当然ですが、ほとんどの情報は外部からはアクセス可能にはなっていません。より詳"
+"細な情報については、<ulink url=\"&url-debian-db-doc;\"></ulink> で参照できる"
+"オンラインドキュメントを読んでください。"

 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:423
 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:423


@@ -793,9 +791,9 @@ msgid ""
 "Those features are documented at <ulink url=\"&url-debian-db-mail-gw;\"></"
 "ulink>."
 msgstr ""
 "Those features are documented at <ulink url=\"&url-debian-db-mail-gw;\"></"
 "ulink>."
 msgstr ""

-"開発者は公式 Debian マシンへの認証に使われる SSH 鍵を登録することもできますし、"
-"新たな *.debian.net の DNS エントリの追加すら可能です。これらの機能は <ulink "
-"url=\"&url-debian-db-mail-gw;\"></ulink> に記述されています。"
+"開発者は公式 Debian マシンへの認証に使われる SSH 鍵を登録することもできます"
+"し、新たな *.debian.net の DNS エントリの追加すら可能です。これらの機能は "
+"<ulink url=\"&url-debian-db-mail-gw;\"></ulink> に記述されています。"

 
 # type: Content of: <chapter><section><title>
 #: resources.dbk:431
 
 # type: Content of: <chapter><section><title>
 #: resources.dbk:431


@@ -809,8 +807,8 @@ msgid ""
 "deb</filename>'s, currently around &number-of-pkgs;) and a few additional "
 "files (such as documentation and installation disk images)."
 msgstr ""
 "deb</filename>'s, currently around &number-of-pkgs;) and a few additional "
 "files (such as documentation and installation disk images)."
 msgstr ""

-"&debian-formal; ディストリビューションは大量のパッケージ (<filename>.deb"
-"</filename> という名前で、現在約  &number-of-pkgs; 個) と幾つかの追加ファイル "
+"&debian-formal; ディストリビューションは大量のパッケージ (<filename>.deb</"
+"filename> という名前で、現在約  &number-of-pkgs; 個) と幾つかの追加ファイル "

 "(ドキュメントやインストール用ディスクイメージ) から成り立っています。"
 
 # type: Content of: <chapter><section><para>
 "(ドキュメントやインストール用ディスクイメージ) から成り立っています。"
 
 # type: Content of: <chapter><section><para>


@@ -825,26 +823,26 @@ msgid ""
 "<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 "
 "<filename>dists/</filename> and <filename>pool/</filename>.  The latter is a "
 "“pool” in which the packages actually are, and which is handled by the "
 "archive maintenance database and the accompanying programs.  The former "

-"contains the distributions, <emphasis>stable</emphasis>, <emphasis>testing</"
-"emphasis> and <emphasis>unstable</emphasis>.  The <filename>Packages</"
-"filename> and <filename>Sources</filename> files in the distribution "
-"subdirectories can reference files in the <filename>pool/</filename> "
-"directory.  The directory tree below each of the distributions is arranged "
-"in an identical manner.  What we describe below for <emphasis>stable</"
-"emphasis> is equally applicable to the <emphasis>unstable</emphasis> and "
-"<emphasis>testing</emphasis> distributions."
+"contains the distributions, <literal>stable</literal>, <literal>testing</"
+"literal> and <literal>unstable</literal>.  The <filename>Packages</filename> "
+"and <filename>Sources</filename> files in the distribution subdirectories "
+"can reference files in the <filename>pool/</filename> directory.  The "
+"directory tree below each of the distributions is arranged in an identical "
+"manner.  What we describe below for <literal>stable</literal> is equally "
+"applicable to the <literal>unstable</literal> and <literal>testing</literal> "
+"distributions."

 msgstr ""
 "見て分かるように、一番上のディレクトリは <filename>dists/</filename> と "
 msgstr ""
 "見て分かるように、一番上のディレクトリは <filename>dists/</filename> と "

-"<filename>pool/</filename> という 2 つのディレクトリを含んでいます。"
-"後者の “pool” はパッケージが実際に置かれており、アーカイブのメンテナンス"
-"ã\83\87ã\83¼ã\82¿ã\83\99ã\83¼ã\82¹ã\81¨é\96¢é\80£ã\81\99ã\82\8bã\83\97ã\83­ã\82°ã\83©ã\83 ã\81«ã\82\88ã\81£ã\81¦å\88©ç\94¨ã\81\95ã\82\8cã\81¾ã\81\99ã\80\82å\89\8dè\80\85ã\81«ã\81¯<emphasis>"
-"stable</emphasis>、<emphasis>testing</emphasis>、そして <emphasis>unstable"
-"</emphasis> というディストリビューションが含まれます。ディストリビューション"
-"ã\82µã\83\96ã\83\87ã\82£ã\83¬ã\82¯ã\83\88ã\83ªä¸­ã\81® <filename>Packages</filename> ã\81\8aã\82\88ã\81³ <filename>Sources"
-"</filename> ファイルは <filename>pool/</filename> ディレクトリ中のファイルを"
-"参照しています。以下の各ディストリビューションのディレクトリツリーは全く同じ"
-"å½¢å¼\8fã\81«ã\81ªã\81£ã\81¦ã\81\84ã\81¾ã\81\99ã\80\82以ä¸\8bã\81§ <emphasis>stable</emphasis> ã\81«ã\81¤ã\81\84ã\81¦è¿°ã\81¹ã\81¦ã\81\84ã\82\8bã\81\93ã\81¨ã\81¯ "
-"<emphasis>unstable</emphasis> や <emphasis>testing</emphasis> ディストリ"
+"<filename>pool/</filename> という 2 つのディレクトリを含んでいます。後者の "
+"“pool” はパッケージが実際に置かれており、アーカイブのメンテナンスデータベース"
+"ã\81¨é\96¢é\80£ã\81\99ã\82\8bã\83\97ã\83­ã\82°ã\83©ã\83 ã\81«ã\82\88ã\81£ã\81¦å\88©ç\94¨ã\81\95ã\82\8cã\81¾ã\81\99ã\80\82å\89\8dè\80\85ã\81«ã\81¯<literal>stable</"
+"literal>、<literal>testing</literal>、そして <literal>unstable</"
+"literal> というディストリビューションが含まれます。ディストリビューションサ"
+"ã\83\96ã\83\87ã\82£ã\83¬ã\82¯ã\83\88ã\83ªä¸­ã\81® <filename>Packages</filename> ã\81\8aã\82\88ã\81³ <filename>Sources</"
+"filename> ファイルは <filename>pool/</filename> ディレクトリ中のファイルを参"
+"照しています。以下の各ディストリビューションのディレクトリツリーは全く同じ形"
+"å¼\8fã\81«ã\81ªã\81£ã\81¦ã\81\84ã\81¾ã\81\99ã\80\82以ä¸\8bã\81§ <literal>stable</literal> ã\81«ã\81¤ã\81\84ã\81¦è¿°ã\81¹ã\81¦ã\81\84ã\82\8bã\81\93ã\81¨"
+"は <literal>unstable</literal> や <literal>testing</literal> ディストリ"

 "ビューションにも同様に当てはまります。"
 
 # type: Content of: <chapter><section><para>
 "ビューションにも同様に当てはまります。"
 
 # type: Content of: <chapter><section><para>


@@ -854,9 +852,9 @@ msgid ""
 "<filename>main</filename>, <filename>contrib</filename>, and <filename>non-"
 "free</filename>."
 msgstr ""
 "<filename>main</filename>, <filename>contrib</filename>, and <filename>non-"
 "free</filename>."
 msgstr ""

-"<filename>dists/stable</filename> は、<filename>main</filename>、<filename>"
-"contrib</filename>、<filename>non-free</filename> という名前の 3 つの"
-"ディレクトリを含んでいます。"
+"<filename>dists/stable</filename> は、<filename>main</filename>、"
+"<filename>contrib</filename>、<filename>non-free</filename> という名前の 3 つ"
+"ã\81®ã\83\87ã\82£ã\83¬ã\82¯ã\83\88ã\83ªã\82\92å\90«ã\82\93ã\81§ã\81\84ã\81¾ã\81\99ã\80\82"

 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:462
 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:462


@@ -866,9 +864,9 @@ msgid ""
 "architecture (<filename>binary-i386</filename>, <filename>binary-m68k</"
 "filename>, etc.)."
 msgstr ""
 "architecture (<filename>binary-i386</filename>, <filename>binary-m68k</"
 "filename>, etc.)."
 msgstr ""

-"それぞれ、source パッケージ (<filename>source</filename>) のディレクトリと"
-"ã\82µã\83\9dã\83¼ã\83\88ã\81\97ã\81¦ã\81\84ã\82\8bå\90\84ã\82¢ã\83¼ã\82­ã\83\86ã\82¯ã\83\81ã\83£ (<filename>binary-i386</filename>ã\80\81<filename>"
-"binary-m68k</filename> など) のディレクトリがあります。"
+"それぞれ、source パッケージ (<filename>source</filename>) のディレクトリとサ"
+"ã\83\9dã\83¼ã\83\88ã\81\97ã\81¦ã\81\84ã\82\8bå\90\84ã\82¢ã\83¼ã\82­ã\83\86ã\82¯ã\83\81ã\83£ (<filename>binary-i386</filename>ã\80\81"
+"<filename>binary-m68k</filename> など) のディレクトリがあります。"

 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:467
 
 # type: Content of: <chapter><section><para>
 #: resources.dbk:467


@@ -879,9 +877,9 @@ msgid ""
 "(<filename>disks-i386</filename>, <filename>disks-m68k</filename>, etc.)."
 msgstr ""
 "<filename>main</filename> はディスクイメージと特定のアーキテクチャで Debian "
 "(<filename>disks-i386</filename>, <filename>disks-m68k</filename>, etc.)."
 msgstr ""
 "<filename>main</filename> はディスクイメージと特定のアーキテクチャで Debian "

-"をインストールする際に必要となるドキュメントの基本部分が入っている追加ディレクトリ"
-"ã\82\92å\90«ã\82\93ã\81§ã\81\84ã\81¾ã\81\99 (<filename>disks-i386</filename>ã\80\81<filename>disks-m68k"
-"</filename> など)。"
+"をインストールする際に必要となるドキュメントの基本部分が入っている追加ディレ"
+"ã\82¯ã\83\88ã\83ªã\82\92å\90«ã\82\93ã\81§ã\81\84ã\81¾ã\81\99 (<filename>disks-i386</filename>ã\80\81<filename>disks-m68k</"
+"filename> など)。"

 
 # type: Content of: <chapter><section><section><title>
 #: resources.dbk:473
 
 # type: Content of: <chapter><section><section><title>
 #: resources.dbk:473


@@ -891,19 +889,19 @@ msgstr "セクション"
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:475
 msgid ""
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:475
 msgid ""

-"The <emphasis>main</emphasis> section of the Debian archive is what makes up "
+"The <literal>main</literal> section of the Debian archive is what makes up "

 "the <emphasis role=\"strong\">official &debian-formal; distribution</"
 "the <emphasis role=\"strong\">official &debian-formal; distribution</"

-"emphasis>.  The <emphasis>main</emphasis> section is official because it "
-"fully complies with all our guidelines.  The other two sections do not, to "
+"emphasis>.  The <literal>main</literal> section is official because it fully "
+"complies with all our guidelines.  The other two sections do not, to "

 "different degrees; as such, they are <emphasis role=\"strong\">not</"
 "emphasis> officially part of &debian-formal;."
 msgstr ""
 "different degrees; as such, they are <emphasis role=\"strong\">not</"
 "emphasis> officially part of &debian-formal;."
 msgstr ""

-"Debian アーカイブの <emphasis>main</emphasis> セクションは<emphasis "
-"role=\"strong\">公式な &debian-formal; ディストリビューション</emphasis>を構成"
-"ã\81\99ã\82\8bã\82\82ã\81®ã\81§ã\81\99ã\80\82<emphasis>main</emphasis> ã\82»ã\82¯ã\82·ã\83§ã\83³ã\81\8cå\85¬å¼\8fã\81ªã\81®ã\81¯ã\80\81æ\88\91ã\80\85ã\81®ã\82¬ã\82¤ã\83\89"
-"ã\83©ã\82¤ã\83³å\85¨ã\81¦ã\81«å\90\88è\87´ã\81\99ã\82\8bã\82\82ã\81®ã\81§ã\81\82ã\82\8bã\81\8bã\82\89ã\81§ã\81\99ã\80\82ä»\96ã\81® 2 ã\81¤ã\81®ã\82»ã\82¯ã\82·ã\83§ã\83³ã\81¯ã\81\9dã\81\86ã\81§ã\81¯ã\81ªã\81\8fã\80\81"
-"合致は異なる程度となっています…つまり、&debian-formal; の公式な一部では"
-"<emphasis role=\"strong\">ありません</emphasis>。"
+"Debian アーカイブの <literal>main</literal> セクションは<emphasis role="
+"\"strong\">公式な &debian-formal; ディストリビューション</emphasis>を構成する"
+"ã\82\82ã\81®ã\81§ã\81\99ã\80\82<literal>main</literal> ã\82»ã\82¯ã\82·ã\83§ã\83³ã\81\8cå\85¬å¼\8fã\81ªã\81®ã\81¯ã\80\81æ\88\91ã\80\85ã\81®ã\82¬ã\82¤ã\83\89ã\83©ã\82¤"
+"ã\83³å\85¨ã\81¦ã\81«å\90\88è\87´ã\81\99ã\82\8bã\82\82ã\81®ã\81§ã\81\82ã\82\8bã\81\8bã\82\89ã\81§ã\81\99ã\80\82ä»\96ã\81® 2 ã\81¤ã\81®ã\82»ã\82¯ã\82·ã\83§ã\83³ã\81¯ã\81\9dã\81\86ã\81§ã\81¯ã\81ªã\81\8fã\80\81å\90\88è\87´"
+"は異なる程度となっています…つまり、&debian-formal; の公式な一部では<emphasis "
+"role=\"strong\">ありません</emphasis>。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:483
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:483


@@ -914,37 +912,37 @@ msgid ""
 "policy;\">Debian Policy Manual</ulink>.  The DFSG is our definition of “free "
 "software.” Check out the Debian Policy Manual for details."
 msgstr ""
 "policy;\">Debian Policy Manual</ulink>.  The DFSG is our definition of “free "
 "software.” Check out the Debian Policy Manual for details."
 msgstr ""

-"main セクションにある全てのパッケージは、<ulink url=\"&url-dfsg;\">Debian フリー"
-"ã\82½ã\83\95ã\83\88ã\82¦ã\82§ã\82¢ã\82¬ã\82¤ã\83\89ã\83©ã\82¤ã\83³</ulink> (DFSG) å\8f\8aã\81³ <ulink url=\"&url-debian-policy;\">"
-"Debian ポリシーマニュアル</ulink>に記載されている他のポリシーの要求事項に完全に適合"
-"していなければなりません。DFSG は我々の定義する「フリーソフトウェア」です。詳細は "
-"Debian ポリシーマニュアルを確認してください。"
+"main セクションにある全てのパッケージは、<ulink url=\"&url-dfsg;\">Debian フ"
+"ã\83ªã\83¼ã\82½ã\83\95ã\83\88ã\82¦ã\82§ã\82¢ã\82¬ã\82¤ã\83\89ã\83©ã\82¤ã\83³</ulink> (DFSG) å\8f\8aã\81³ <ulink url=\"&url-debian-"
+"policy;\">Debian ポリシーマニュアル</ulink>に記載されている他のポリシーの要求"
+"事項に完全に適合していなければなりません。DFSG は我々の定義する「フリーソフト"
+"ウェア」です。詳細は Debian ポリシーマニュアルを確認してください。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:491
 msgid ""
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:491
 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 ""

-"<emphasis>contrib</emphasis> セクションにあるパッケージは DFSG に適合している"
-"å¿\85è¦\81ã\81\8cã\81\82ã\82\8aã\81¾ã\81\99ã\81\8cã\80\81ä»\96ã\81®è¦\81æ±\82äº\8bé \85ã\81¯æº\80ã\81\9fã\81\9bã\81¦ã\81\84ã\81ªã\81\84ã\81\8bã\82\82ã\81\97ã\82\8cã\81¾ã\81\9bã\82\93。例えば、non-free "
+"<literal>contrib</literal> セクションにあるパッケージは DFSG に適合している"
+"å¿\85è¦\81ã\81\8cã\81\82ã\82\8aã\81¾ã\81\99ã\81\8cã\80\81ä»\96ã\81®è¦\81æ±\82äº\8bé \85ã\82\92æº\80ã\81\9fã\81\9bã\81¦ã\81¯ã\81\84ã\81ªã\81\84ã\81\93ã\81¨ã\81§ã\81\97ã\82\87ã\81\86。例えば、non-free "

 "パッケージに依存している、などです。"
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:496
 msgid ""
 "パッケージに依存している、などです。"
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:496
 msgid ""

-"Packages which do not conform to the DFSG are placed in the <emphasis>non-"
-"free</emphasis> section.  These packages are not considered as part of the "
+"Packages which do not conform to the DFSG are placed in the <literal>non-"
+"free</literal> section.  These packages are not considered as part of the "

 "Debian distribution, though we support their use, and we provide "
 "infrastructure (such as our bug-tracking system and mailing lists) for non-"
 "free software packages."
 msgstr ""
 "Debian distribution, though we support their use, and we provide "
 "infrastructure (such as our bug-tracking system and mailing lists) for non-"
 "free software packages."
 msgstr ""

-"DFSG を満たさないパッケージは <emphasis>non-free</emphasis> セクションに配置され"
-"ã\81¾ã\81\99ã\80\82ã\81\93ã\82\8cã\82\89ã\81®ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81¯ Debian ã\83\87ã\82£ã\82¹ã\83\88ã\83ªã\83\93ã\83¥ã\83¼ã\82·ã\83§ã\83³ã\81®ä¸\80é\83¨ã\81¨ã\81\97ã\81¦ã\81¯è\80\83ã\81\88ã\82\89ã\82\8cã\81¦ã\81¯"
-"ã\81\84ã\81¾ã\81\9bã\82\93ã\81\8cã\80\81æ\88\91ã\80\85ã\81¯å\88©ç\94¨ã\81«ã\81¤ã\81\84ã\81¦ã\82µã\83\9dã\83¼ã\83\88ã\82\92è¡\8cã\81£ã\81¦ã\81\8aã\82\8aã\80\81non-free ã\82½ã\83\95ã\83\88ã\82¦ã\82§ã\82¢ã\81®ã\83\91ã\83\83ã\82±"
-"ã\83¼ã\82¸ã\81«ã\81¤ã\81\84ã\81¦ (ã\83\90ã\82°è¿½è·¡ã\82·ã\82¹ã\83\86ã\83 ã\82\84ã\83¡ã\83¼ã\83ªã\83³ã\82°ã\83ªã\82¹ã\83\88ã\81ªã\81©ã\81®) ã\82¤ã\83³ã\83\95ã\83©ã\82¹ã\83\88ã\83©ã\82¯ã\83\81ã\83£ã\82\92æ\8f\90ä¾\9b"
-"しています。"
+"DFSG を満たさないパッケージは <literal>non-free</literal> セクションに配置"
+"ã\81\95ã\82\8cã\81¾ã\81\99ã\80\82ã\81\93ã\82\8cã\82\89ã\81®ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81¯ Debian ã\83\87ã\82£ã\82¹ã\83\88ã\83ªã\83\93ã\83¥ã\83¼ã\82·ã\83§ã\83³ã\81®ä¸\80é\83¨ã\81¨ã\81\97ã\81¦ã\81¯è\80\83"
+"ã\81\88ã\82\89ã\82\8cã\81¦ã\81¯ã\81\84ã\81¾ã\81\9bã\82\93ã\81\8cã\80\81æ\88\91ã\80\85ã\81¯å\88©ç\94¨ã\81«ã\81¤ã\81\84ã\81¦ã\82µã\83\9dã\83¼ã\83\88ã\82\92è¡\8cã\81£ã\81¦ã\81\8aã\82\8aã\80\81non-free ã\82½ã\83\95ã\83\88"
+"ã\82¦ã\82§ã\82¢ã\81®ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81«ã\81¤ã\81\84ã\81¦ (ã\83\90ã\82°è¿½è·¡ã\82·ã\82¹ã\83\86ã\83 ã\82\84ã\83¡ã\83¼ã\83ªã\83³ã\82°ã\83ªã\82¹ã\83\88ã\81ªã\81©ã\81®) ã\82¤ã\83³ã\83\95"
+"ã\83©ã\82¹ã\83\88ã\83©ã\82¯ã\83\81ã\83£ã\82\92æ\8f\90ä¾\9bã\81\97ã\81¦ã\81\84ã\81¾ã\81\99ã\80\82"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:503
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:503


@@ -953,8 +951,9 @@ msgid ""
 "a more exact definition of the three sections.  The above discussion is just "
 "an introduction."
 msgstr ""
 "a more exact definition of the three sections.  The above discussion is just "
 "an introduction."
 msgstr ""

-"<ulink url=\"&url-debian-policy;\">Debian ポリシーマニュアル</ulink> は 3 つの"
-"セクションについてより正確な定義を含んでいます。上記の説明はほんの触りに過ぎません。"
+"<ulink url=\"&url-debian-policy;\">Debian ポリシーマニュアル</ulink> は 3 つ"
+"のセクションについてより正確な定義を含んでいます。上記の説明はほんの触りに過"
+"ぎません。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:508
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:508


@@ -962,45 +961,46 @@ 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 "
 "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 ""

-"アーカイブの最上位階層で 3 つのセクションに別れていることは、インターネット上の "
-"FTP サーバ経由であれ、CD-ROM であれ、Debian を配布したいと考える人にとって大事な"
-"ことです…その様な人は <emphasis>main</emphasis> セクションと <emphasis>contrib"
-"</emphasis> セクションのみを配布することで、法的なリスクを回避できます。例えば、"
-"<emphasis>non-free</emphasis> セクションにあるパッケージのいくつかは商的な配布"
-"を許可していません。"
+"アーカイブの最上位階層で 3 つのセクションに別れていることは、インターネット上"
+"の FTP サーバ経由であれ、CD-ROM であれ、Debian を配布したいと考える人にとって"
+"大事なことです…その様な人は <literal>main</literal> セクションと "
+"<literal>contrib</literal> セクションのみを配布することで、法的なリスクを回"
+"避できます。例えば、<literal>non-free</literal> セクションにあるパッケージ"
+"ã\81®ã\81\84ã\81\8fã\81¤ã\81\8bã\81¯å\95\86ç\9a\84ã\81ªé\85\8då¸\83ã\82\92許å\8f¯ã\81\97ã\81¦ã\81\84ã\81¾ã\81\9bã\82\93ã\80\82"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:516
 msgid ""
 "On the other hand, a CD-ROM vendor could easily check the individual package "
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:516
 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 ""

-"その一方で、CD-ROMベンダは <emphasis>non-free</emphasis> 内のパッケージ群の"
-"個々のパッケージライセンスを簡単に確認でき、問題が無ければその多くを CD-ROM に"
-"含めることが出来ます。(これはベンダによって大いに異なるので、この作業は Debian "
-"開発者にはできません)。"
+"その一方で、CD-ROMベンダは <literal>non-free</literal> 内のパッケージ群の"
+"個々のパッケージライセンスを簡単に確認でき、問題が無ければその多くを CD-ROM "
+"に含めることが出来ます。(これはベンダによって大いに異なるので、この作業は "
+"Debian 開発者にはできません)。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:522
 msgid ""
 "Note that the term section is also used to refer to categories which "
 "simplify the organization and browsing of available packages, e.g.  "
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:522
 msgid ""
 "Note that the term section is also used to refer to categories which "
 "simplify the organization and browsing of available packages, e.g.  "

-"<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."
-msgstr ""
-"セクションという用語は、利用可能なパッケージの構成や参照を簡単にしているカテゴリ"
-"を指すことにも使われている点に注意ください。例えば、<emphasis>admin</emphasis>、"
-"<emphasis>net</emphasis>、<emphasis>utils</emphasis> などです。昔々、これらの"
-"セクション (むしろサブセクション) はDebian アーカイブ内のサブディレクトリとして"
-"存在していました。最近では、これらはパッケージのセクションヘッダにのみ存在しています。"
+"<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 ""
+"セクションという用語は、利用可能なパッケージの構成や参照を簡単にしているカテ"
+"ゴリを指すことにも使われている点に注意ください。例えば、<literal>admin</"
+"literal>、<literal>net</literal>、<literal>utils</literal> などです。"
+"昔々、これらのセクション (むしろサブセクション) はDebian アーカイブ内のサブ"
+"ディレクトリとして存在していました。最近では、これらはパッケージのセクション"
+"ヘッダにのみ存在しています。"

 
 # type: Content of: <chapter>port<section><section><title>
 #: resources.dbk:532
 
 # type: Content of: <chapter>port<section><section><title>
 #: resources.dbk:532


@@ -1014,9 +1014,9 @@ msgid ""
 "greater) platforms, and so was Debian.  But as Linux became more and more "
 "popular, the kernel was ported to other architectures, too."
 msgstr ""
 "greater) platforms, and so was Debian.  But as Linux became more and more "
 "popular, the kernel was ported to other architectures, too."
 msgstr ""

-"はじめのうちは、Linux カーネルは Intel i386 (またはそれ以上) プラットフォー"
-"ム用のみが利用可能で、Debian も同様でした。しかし、Linux は日に日に広まり、"
-"ã\82«ã\83¼ã\83\8dã\83«ã\82\82ä»\96ã\81®ã\82¢ã\83¼ã\82­ã\83\86ã\82¯ã\83\81ã\83£ã\81¸ã\81¨ç§»æ¤\8dã\81\95ã\82\8cã\81\9fã\81®ã\81§ã\81\99ã\80\82"
+"はじめのうちは、Linux カーネルは Intel i386 (またはそれ以上) プラットフォーム"
+"用のみが利用可能で、Debian も同様でした。しかし、Linux は日に日に広まり、カー"
+"ネルも他のアーキテクチャへと移植されたのです。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:539
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:539


@@ -1026,50 +1026,49 @@ msgid ""
 "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 "
 "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."
-msgstr ""
-"Linux 2.0 カーネルは Intel x86、DEC Alpha、SPARC、Motorola 680x0 (Atari、Amiga、"
-"そして Macintosh など)、MIPS、PowerPC をサポートしました。Linux 2.2 カーネルでは "
-"ARM や UltraSPARC を含め、さらに多くのアーキテクチャをサポートすることになりました。"
-"Linux がこれらのプラットフォームをサポートしているので、Debian も同様にすることを"
-"決めたのです。そのため、Debian は移植作業を進めています：実際に、Linux 以外の"
-"カーネルへの移植も進行中です。<emphasis>i386</emphasis> (我々の間での Intel x86 "
-"の呼び方) 以外にも、これを書いている時点で <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>、そして <emphasis>sh</emphasis> "
-"があります。"
+"to non-Linux kernels.  Aside from <literal>i386</literal> (our name for "
+"Intel x86), there is <literal>m68k</literal>, <literal>alpha</literal>, "
+"<literal>powerpc</literal>, <literal>sparc</literal>, <literal>hurd-i386</"
+"literal>, <literal>arm</literal>, <literal>ia64</literal>, <literal>hppa</"
+"literal>, <literal>s390</literal>, <literal>mips</literal>, <literal>mipsel</"
+"literal> and <literal>sh</literal> as of this writing."
+msgstr ""
+"Linux 2.0 カーネルは Intel x86、DEC Alpha、SPARC、Motorola 680x0 (Atari、"
+"Amiga、そして Macintosh など)、MIPS、PowerPC をサポートしました。Linux 2.2 "
+"カーネルでは ARM や UltraSPARC を含め、さらに多くのアーキテクチャをサポートす"
+"ることになりました。Linux がこれらのプラットフォームをサポートしているので、"
+"Debian も同様にすることを決めたのです。そのため、Debian は移植作業を進めてい"
+"ます：実際に、Linux 以外のカーネルへの移植も進行中です。<literal>i386</"
+"literal> (我々の間での Intel x86 の呼び方) 以外にも、これを書いている時点で "
+"<literal>m68k</literal>、<literal>alpha</literal>、<literal>powerpc</"
+"literal>、<literal>sparc</literal>、<literal>hurd-i386</literal>、"
+"<literal>arm</literal>、<literal>ia64</literal>、<literal>hppa</"
+"literal>、<literal>s390</literal>、<literal>mips</literal>、"
+"<literal>mipsel</literal>、そして <literal>sh</literal> があります。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:553
 msgid ""
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:553
 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 ""
-"&debian-formal; 1.3 では <emphasis>i386</emphasis> のみが利用可能でした。"
-"Debian 2.0 では、<emphasis>i386</emphasis> と <emphasis>m68k</emphasis> "
-"ã\82¢ã\83¼ã\82­ã\83\86ã\82¯ã\83\81ã\83£ã\81\8cã\83ªã\83ªã\83¼ã\82¹ã\81\95ã\82\8cã\81¾ã\81\97ã\81\9fã\80\82"
-"Debian 2.1 では、<emphasis>i386</emphasis>、<emphasis>m68k</emphasis>、"
-"<emphasis>alpha</emphasis>、そして <emphasis>sparc</emphasis> アーキテクチャが"
-"ã\83ªã\83ªã\83¼ã\82¹ã\81\95ã\82\8cã\81¾ã\81\97ã\81\9fã\80\82Debian 2.2 ã\81§ã\81¯ <emphasis>powerpc</emphasis> ã\81\8aã\82\88ã\81³ "
-"<emphasis>arm</emphasis> アーキテクチャへのサポートが追加されました。"
-"Debian 3.0 は、新たに 5 つのアーキテクチャへのサポートが追加されました："
-"<emphasis>ia64</emphasis>、<emphasis>hppa</emphasis>、<emphasis>s390"
-"</emphasis>、<emphasis>mips</emphasis> そして <emphasis>mipsel</emphasis> です。"
+"&debian-formal; 1.3 is only available as <literal>i386</literal>.  Debian "
+"2.0 shipped for <literal>i386</literal> and <literal>m68k</literal> "
+"architectures.  Debian 2.1 ships for the <literal>i386</literal>, "
+"<literal>m68k</literal>, <literal>alpha</literal>, and <literal>sparc</"
+"literal> architectures.  Debian 2.2 added support for the <literal>powerpc</"
+"literal> and <literal>arm</literal> architectures.  Debian 3.0 added support "
+"of five new architectures: <literal>ia64</literal>, <literal>hppa</literal>, "
+"<literal>s390</literal>, <literal>mips</literal> and <literal>mipsel</"
+"literal>."
+msgstr ""
+"&debian-formal; 1.3 では <literal>i386</literal> のみが利用可能でした。"
+"Debian 2.0 では、<literal>i386</literal> と <literal>m68k</literal> アー"
+"ã\82­ã\83\86ã\82¯ã\83\81ã\83£ã\81\8cã\83ªã\83ªã\83¼ã\82¹ã\81\95ã\82\8cã\81¾ã\81\97ã\81\9fã\80\82Debian 2.1 ã\81§ã\81¯ã\80\81<literal>i386</literal>ã\80\81"
+"<literal>m68k</literal>、<literal>alpha</literal>、そして "
+"<literal>sparc</literal> アーキテクチャがリリースされました。Debian 2.2 で"
+"ã\81¯ <literal>powerpc</literal> ã\81\8aã\82\88ã\81³ <literal>arm</literal> ã\82¢ã\83¼ã\82­ã\83\86ã\82¯"
+"チャへのサポートが追加されました。Debian 3.0 は、新たに 5 つのアーキテクチャ"
+"へのサポートが追加されました：<literal>ia64</literal>、<literal>hppa</"
+"literal>、<literal>s390</literal>、<literal>mips</literal> そして "
+"<literal>mipsel</literal> です。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:564
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:564


@@ -1077,8 +1076,8 @@ 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 ""
 "Information for developers and users about the specific ports are available "
 "at the <ulink url=\"&url-debian-ports;\">Debian Ports web pages</ulink>."
 msgstr ""

-"特定の移植版についての開発者／ユーザへの情報は <ulink url=\"&url-debian-ports;\">"
-"Debian Ports web pages</ulink> で入手可能です。"
+"特定の移植版についての開発者／ユーザへの情報は <ulink url=\"&url-debian-"
+"ports;\">Debian 移植版のウェブページ</ulink>で入手可能です。"

 
 # type: Content of: <chapter><section><section><title>
 #: resources.dbk:570
 
 # type: Content of: <chapter><section><section><title>
 #: resources.dbk:570


@@ -1088,11 +1087,11 @@ msgstr "パッケージ"
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:572
 msgid ""
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:572
 msgid ""

-"There are two types of Debian packages, namely <emphasis>source</emphasis> "
-"and <emphasis>binary</emphasis> packages."
+"There are two types of Debian packages, namely <literal>source</literal> and "
+"<literal>binary</literal> packages."

 msgstr ""
 msgstr ""

-"Debian パッケージには２種類あります。<emphasis>ソース</emphasis>パッケージと"
-"<emphasis>バイナリ</emphasis>パッケージです。"
+"Debian パッケージには２種類あります。<literal>ソース</literal>パッケージと"
+"<literal>バイナリ</literal>パッケージです。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:576
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:576


@@ -1113,17 +1112,17 @@ msgid ""
 "outside of Debian, there is just one <filename>.tar.gz</filename> file which "
 "contains the sources of the program.  If a package is distributed elsewhere "
 "too, the <filename>.orig.tar.gz</filename> file stores the so-called "
 "outside of Debian, there is just one <filename>.tar.gz</filename> file which "
 "contains the sources of the program.  If a package is distributed elsewhere "
 "too, the <filename>.orig.tar.gz</filename> file stores the so-called "

-"<emphasis>upstream source code</emphasis>, that is the source code that's "
-"distributed by the <emphasis>upstream maintainer</emphasis> (often the "
-"author of the software).  In this case, the <filename>.diff.gz</filename> "
-"contains the changes made by the Debian maintainer."
+"<literal>upstream source code</literal>, that is the source code that's "
+"distributed by the <literal>upstream maintainer</literal> (often the author "
+"of the software).  In this case, the <filename>.diff.gz</filename> contains "
+"the changes made by the Debian maintainer."

 msgstr ""
 "パッケージが特に Debian 用に作られていて Debian 以外で利用されていない場合"
 "は、プログラムのソースを含んだ単純な 1 つの <filename>.tar.gz</filename> ファ"
 "イルがあるだけです。パッケージが他でも利用されている場合は、<filename>.orig."
 msgstr ""
 "パッケージが特に Debian 用に作られていて Debian 以外で利用されていない場合"
 "は、プログラムのソースを含んだ単純な 1 つの <filename>.tar.gz</filename> ファ"
 "イルがあるだけです。パッケージが他でも利用されている場合は、<filename>.orig."

-"tar.gz</filename> は <emphasis>upstream ソースコード</emphasis>と呼ばれるもの"
-"を保持しています。<emphasis>upstream ソースコード</emphasis>は "
-"<emphasis>upstream メンテナ</emphasis> (大抵の場合はソフトウェアの作者) に"
+"tar.gz</filename> は <literal>upstream ソースコード</literal>と呼ばれるもの"
+"を保持しています。<literal>upstream ソースコード</literal>は "
+"<literal>upstream メンテナ</literal> (大抵の場合はソフトウェアの作者) に"

 "よって配布されているソースコードです。この場合、<filename>.diff.gz</"
 "filename> はDebian パッケージメンテナによって加えられた変更を含んでいます。"
 
 "よって配布されているソースコードです。この場合、<filename>.diff.gz</"
 "filename> はDebian パッケージメンテナによって加えられた変更を含んでいます。"
 


@@ -1147,14 +1146,14 @@ msgstr "ディストリビューション"
 #: resources.dbk:601
 msgid ""
 "The directory system described in the previous chapter is itself contained "
 #: resources.dbk:601
 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 ""

-"前章で説明したディレクトリシステムは、それ自体が<emphasis>ディストリビューション"
-"ã\83\87ã\82£ã\83¬ã\82¯ã\83\88ã\83ª</emphasis>å\86\85ã\81«å\90«ã\81¾ã\82\8cã\81¦ã\81\84ã\81¾ã\81\99ã\80\82ã\81\9dã\82\8cã\81\9eã\82\8cã\81®ã\83\87ã\82£ã\82¹ã\83\88ã\83ªã\83\93ã\83¥ã\83¼ã\82·ã\83§ã\83³ã\81¯ã\80\81"
-"実際には Debian アーカイブ自体の最上位階層の <filename>pool</filename> ディレクトリ"
-"に含まれています。"
+"前章で説明したディレクトリシステムは、それ自体が<literal>ディストリビュー"
+"ã\82·ã\83§ã\83³ã\83\87ã\82£ã\83¬ã\82¯ã\83\88ã\83ª</literal>å\86\85ã\81«å\90«ã\81¾ã\82\8cã\81¦ã\81\84ã\81¾ã\81\99ã\80\82ã\81\9dã\82\8cã\81\9eã\82\8cã\81®ã\83\87ã\82£ã\82¹ã\83\88ã\83ªã\83\93ã\83¥ã\83¼"
+"ションは、実際には Debian アーカイブ自体の最上位階層の <filename>pool</"
+"filename> ディレクトリに含まれています。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:607
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:607


@@ -1165,11 +1164,11 @@ msgid ""
 "debian\">/debian</ulink>, which is a common location (another is <filename>/"
 "pub/debian</filename>)."
 msgstr ""
 "debian\">/debian</ulink>, which is a common location (another is <filename>/"
 "pub/debian</filename>)."
 msgstr ""

-"簡単にまとめると、Debian アーカイブは FTP サーバのルートディレクトリを持っています。"
-"例えば、ミラーサイトでいうと <literal>ftp.us.debian.org</literal> では Debian "
-"ã\82¢ã\83¼ã\82«ã\82¤ã\83\96ã\81\9dã\81®ã\82\82ã\81®ã\81¯ <ulink url=\"ftp://ftp.us.debian.org/debian\">/debian</ulink> "
-"に含まれており、これは共通した配置となっています (他には <filename>"
-"/pub/debian</filename> があります)。"
+"簡単にまとめると、Debian アーカイブは FTP サーバのルートディレクトリを持って"
+"います。例えば、ミラーサイトでいうと <literal>ftp.us.debian.org</literal> で"
+"ã\81¯ Debian ã\82¢ã\83¼ã\82«ã\82¤ã\83\96ã\81\9dã\81®ã\82\82ã\81®ã\81¯ <ulink url=\"ftp://ftp.us.debian.org/debian"
+"\">/debian</ulink> に含まれており、これは共通した配置となっています (他には "
+"<filename>/pub/debian</filename> があります)。"

 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:614
 
 # type: Content of: <chapter><section><section><para>
 #: resources.dbk:614


@@ -1181,11 +1180,12 @@ msgid ""
 "latter are kept in the <filename>dists/</filename> directory of the archive "
 "(for backwards compatibility)."
 msgstr ""
 "latter are kept in the <filename>dists/</filename> directory of the archive "
 "(for backwards compatibility)."
 msgstr ""

-"ディストリビューションは Debian ソースパッケージとバイナリパッケージと、これに対応"
-"した <filename>Sources</filename> と <filename>Packages</filename> のインデック"
-"スファイル (これら全てのパッケージのヘッダ情報を含む) から構成されています。"
-"前者は <filename>pool/</filename> ディレクトリに、そして後者はアーカイブの "
-"<filename>dists/</filename> ディレクトリに含まれています (後方互換性のため)。"
+"ディストリビューションは Debian ソースパッケージとバイナリパッケージと、これ"
+"に対応した <filename>Sources</filename> と <filename>Packages</filename> のイ"
+"ンデックスファイル (これら全てのパッケージのヘッダ情報を含む) から構成されて"
+"います。前者は <filename>pool/</filename> ディレクトリに、そして後者はアーカ"
+"イブの <filename>dists/</filename> ディレクトリに含まれています (後方互換性の"
+"ため)。"

 
 # type: Content of: <chapter><section><section><section><title>
 #: resources.dbk:622
 
 # type: Content of: <chapter><section><section><section><title>
 #: resources.dbk:622


@@ -1195,119 +1195,154 @@ msgstr "安定版 (stable)、テスト版 (testing)、不安定版 (unstable)"
 # type: Content of: <chapter><section><section><section><para>
 #: resources.dbk:624
 msgid ""
 # type: Content of: <chapter><section><section><section><para>
 #: resources.dbk:624
 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 ""

-"常に <emphasis>安定版 (stable)</emphasis> (<filename>dists/stable</filename> "
-"に属します)、<emphasis>テスト晩 (testing)</emphasis> (<filename>dists/testing"
-"</filename> に属します)、<emphasis>不安定版 (unstable)</emphasis> (<filename>"
-"dists/unstable</filename> に属します) と呼ばれるディストリビューションが存在して"
-"います。これは Debian プロジェクトでの開発プロセスを反映しています。"
+"常に <literal>安定版 (stable)</literal> (<filename>dists/stable</filename> "
+"に属します)、<literal>テスト晩 (testing)</literal> (<filename>dists/"
+"testing</filename> に属します)、<literal>不安定版 (unstable)</literal> "
+"(<filename>dists/unstable</filename> に属します) と呼ばれるディストリビュー"
+"ションが存在しています。これは Debian プロジェクトでの開発プロセスを反映して"
+"います。"

 
 # type: Content of: <chapter><section><section><section><para>
 #: resources.dbk:631
 msgid ""
 
 # type: Content of: <chapter><section><section><section><para>
 #: resources.dbk:631
 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 ""

-"活発な開発が<emphasis>不安定版 (unstable)</emphasis> ディストリビューションで"
-"行われています (これが、何故このディストリビューションが<emphasis>開発ディストリ"
-"ã\83\93ã\83¥ã\83¼ã\82·ã\83§ã\83³</emphasis>ã\81¨å\91¼ã\81°ã\82\8cã\82\8bã\81\93ã\81¨ã\81\8cã\81\82ã\82\8bã\81\8bã\81¨ã\81\84ã\81\86ç\90\86ç\94±ã\81§ã\81\99)ã\80\82å\85¨ã\81¦ã\81® Debian "
-"開発者は、このディストリビューション内の自分のパッケージを何時でも更新できます。"
-"つまり、このディストリビューションの内容は日々変化しているのです。"
-"このディストリビューションの全てが正しく動作するかを保証することについては特別な"
-"努力は払われていないので、時には文字通り不安定 (unstable) となります。"
+"活発な開発が<literal>不安定版 (unstable)</literal> ディストリビューションで"
+"行われています (これが、何故このディストリビューションが<literal>開発ディス"
+"ã\83\88ã\83ªã\83\93ã\83¥ã\83¼ã\82·ã\83§ã\83³</literal>ã\81¨å\91¼ã\81°ã\82\8cã\82\8bã\81\93ã\81¨ã\81\8cã\81\82ã\82\8bã\81\8bã\81¨ã\81\84ã\81\86ç\90\86ç\94±ã\81§ã\81\99)ã\80\82å\85¨ã\81¦ã\81® "
+"Debian 開発者は、このディストリビューション内の自分のパッケージを何時でも更新"
+"ã\81§ã\81\8dã\81¾ã\81\99ã\80\82ã\81¤ã\81¾ã\82\8aã\80\81ã\81\93ã\81®ã\83\87ã\82£ã\82¹ã\83\88ã\83ªã\83\93ã\83¥ã\83¼ã\82·ã\83§ã\83³ã\81®å\86\85容ã\81¯æ\97¥ã\80\85å¤\89å\8c\96ã\81\97ã\81¦ã\81\84ã\82\8bã\81®ã\81§ã\81\99ã\80\82"
+"このディストリビューションの全てが正しく動作するかを保証することについては特"
+"å\88¥ã\81ªå\8aªå\8a\9bã\81¯æ\89\95ã\82\8fã\82\8cã\81¦ã\81\84ã\81ªã\81\84ã\81®ã\81§ã\80\81æ\99\82ã\81«ã\81¯æ\96\87å­\97é\80\9aã\82\8aä¸\8då®\89å®\9a (unstable) ã\81¨ã\81ªã\82\8aã\81¾ã\81\99ã\80\82"

 
 # type: Content of: <chapter><section><section><section><para>
 #: resources.dbk:640
 msgid ""
 "The <link linkend=\"testing\">testing</link> distribution is generated "
 
 # type: Content of: <chapter><section><section><section><para>
 #: resources.dbk:640
 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\"/> ."
-msgstr ""
-"<link linkend=\"testing\">テスト版 (testing)</link> ディストリビューションは、"
-"パッケージが特定の判定規準を満たした際に不安定版から自動的に移動されることで生成"
-"されています。この判定規準はテスト版に含まれるパッケージとして十分な品質であること"
-"を保証する必要があります。テスト版への更新は、新しいパッケージがインストールされた"
-"後で毎日実施されています。<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 ""
+"<link linkend=\"testing\">テスト版 (testing)</link> ディストリビューション"
+"は、パッケージが特定の判定規準を満たした際に<literal>不安定版</literal>から"
+"自動的に移動されることで生成されています。この判定規準は<literal>テスト版</literal>"
+"に含まれるパッケージとして十分な品質であることを保証する必要があります。<literal>"
+"テスト版</literal>への更新は、新しいパッケージがインストールされた後、毎日 2 回"
+"実施されています。<xref linkend=\"testing\"/> を参照してください。"

 
 # type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:647
+#: resources.dbk:648

 msgid ""
 "After a period of development, once the release manager deems fit, the "
 msgid ""
 "After a period of development, once the release manager deems fit, the "

-"<emphasis>testing</emphasis> distribution is frozen, meaning that the "
-"policies which control how packages move from <emphasis>unstable</emphasis> "
-"to <emphasis>testing</emphasis> are tightened.  Packages which are too buggy "
-"are removed.  No changes are allowed into <emphasis>testing</emphasis> "
-"except for bug fixes.  After some time has elapsed, depending on progress, "
-"the <emphasis>testing</emphasis> distribution is frozen even further.  "
-"Details of the handling of the testing distribution are published by the "
-"Release Team on debian-devel-announce.  After the open issues are solved to "
-"the satisfaction of the Release Team, the distribution is released.  "
-"Releasing means that <emphasis>testing</emphasis> is renamed to "
-"<emphasis>stable</emphasis>, and a new copy is created for the new "
-"<emphasis>testing</emphasis>, and the previous <emphasis>stable</emphasis> "
-"is renamed to <emphasis>oldstable</emphasis> and stays there until it is "
-"finally archived.  On archiving, the contents are moved to <literal>&archive-"
-"host;</literal>)."
-msgstr ""
+"<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>テスト版 "
+"(testing)</literal> ディストリビューションはフリーズされます。これは、"
+"<literal>不安定版 (unstable)</literal> から<literal>テスト版 (testing)</literal> "
+"へのパッケージ移動をどのように行うかのポリシーがきつくなることを意味しています。"
+"バグが多すぎるパッケージは削除されます。バグ修正以外の変更が<literal>テスト版 "
+"(testing)</literal> に入ることは許可されません。いくらかの時間経過後、進行状況に"
+"応じて<literal>テスト版 (testing)</literal> ディストリビューションはより一層"
+"フリーズされます。テスト版ディストリビューションの取扱い詳細については "
+"debian-devel-announce にてリリースチームが発表します。リリースチームが満足する"
+"程度に残っていた問題が修正された後、ディストリビューションがリリースされます。"
+"リリースは、<literal>テスト版 (testing)</literal> が<literal>安定版 (stable)"
+"</literal> へとリネームされる事を意味しており、<literal>テスト版 (testing)"
+"</literal> 用の新しいコピーが作成され、以前の<literal>安定版 (stable)</literal> "
+"は<literal>旧安定版 (oldstable)</literal> にリネームされ、最終的にアーカイブされる"
+"まで存在しています。アーカイブ作業では、コンテンツは <literal>&archive-host;"
+"</literal> へと移動されます。"

 
 # type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:664
+#: resources.dbk:665

 msgid ""
 "This development cycle is based on the assumption that the "
 msgid ""
 "This development cycle is based on the assumption that the "

-"<emphasis>unstable</emphasis> distribution becomes <emphasis>stable</"
-"emphasis> after passing a period of being in <emphasis>testing</emphasis>.  "
-"Even once a distribution is considered stable, a few bugs inevitably remain "
-"— that's why the stable distribution is updated every now and then.  "
-"However, these updates are tested very carefully and have to be introduced "
-"into the archive individually to reduce the risk of introducing new bugs.  "
-"You can find proposed additions to <emphasis>stable</emphasis> in the "
-"<filename>proposed-updates</filename> directory.  Those packages in "
-"<filename>proposed-updates</filename> that pass muster are periodically "
-"moved as a batch into the stable distribution and the revision level of the "
-"stable distribution is incremented (e.g., ‘3.0’ becomes ‘3.0r1’, ‘2.2r4’ "
-"becomes ‘2.2r5’, and so forth).  Please refer to <link linkend=\"upload-"
-"stable\">uploads to the <emphasis>stable</emphasis> distribution</link> for "
-"details."
-msgstr ""
+"<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 ""
+"この開発サイクルは、<literal>不安定版 (unstable)</literal> ディストリビューション"
+"が、一定期間<literal>テスト版 (testing)</literal>を過ごした後で<literal>安定版 "
+"(stable)</literal>になる仮定に基づいています。一旦ディストリビューションが安定した"
+"と考えられたとしても、必然的にいくつかのバグは残っています — これが安定版ディストリ"
+"ビューションが時折更新されている理由です。しかし、これらの更新はとても注意深くテスト"
+"されており、新たなバグを招き入れるリスクを避けるためにそれぞれ個々にアーカイブに収録"
+"されるようになっています。<literal>安定版 (stable)</literal> への追加提案は、"
+"<filename>proposed-updates</filename> ディレクトリにて参照可能です。<filename>"
+"proposed-updates</filename> にある合格したこれらのパッケージは、定期的にまとめて"
+"安定版ディストリビューションに移動され、安定版ディストリビューションのリビジョン"
+"レベルが 1 つ増えることになります (例: ‘3.0’ は ‘3.0r1’ に、‘2.2r4’ は ‘2.2r5’ "
+"になり、以下同様)。詳細に付いては、<link linkend=\"upload-stable\"><literal>"
+"安定版 (stable)</literal> ディストリビューションへのアップロード</link>を参照して"
+"ください。"

 
 # type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:681
+#: resources.dbk:682

 msgid ""
 msgid ""

-"Note that development under <emphasis>unstable</emphasis> continues during "
-"the freeze period, since the <emphasis>unstable</emphasis> distribution "
-"remains in place in parallel with <emphasis>testing</emphasis>."
+"Note that development under <literal>unstable</literal> continues during the "
+"freeze period, since the <literal>unstable</literal> distribution remains in "
+"place in parallel with <literal>testing</literal>."

 msgstr ""
 msgstr ""

-"<emphasis>不安定版 (unstable)</emphasis>での開発はフリーズ期間中も続けられている"
-"ã\81\93ã\81¨ã\81«æ³¨æ\84\8fã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84ã\80\82<emphasis>ä¸\8då®\89å®\9aç\89\88 (unstable)</emphasis> ã\83\87ã\82£ã\82¹ã\83\88ã\83ªã\83\93ã\83¥ã\83¼"
-"ã\82·ã\83§ã\83³ã\81¯<emphasis>ã\83\86ã\82¹ã\83\88ç\89\88 (testing)</emphasis> ã\81¨ã\81¯å¹³è¡\8cã\81\97ã\81\9få ´æ\89\80ã\81§ã\81\82ã\82\8aã\81¤ã\81¥ã\81\91ã\81¦"
-"いるからです。"
+"<literal>不安定版 (unstable)</literal>での開発はフリーズ期間中も続けられて"
+"ã\81\84ã\82\8bã\81\93ã\81¨ã\81«æ³¨æ\84\8fã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84ã\80\82<literal>ä¸\8då®\89å®\9aç\89\88 (unstable)</literal> ã\83\87ã\82£ã\82¹ã\83\88"
+"ã\83ªã\83\93ã\83¥ã\83¼ã\82·ã\83§ã\83³ã\81¯<literal>ã\83\86ã\82¹ã\83\88ç\89\88 (testing)</literal> ã\81¨ã\81¯å¹³è¡\8cã\81\97ã\81\9fç\8a¶æ\85\8bã\81§ã\81\82"
+"ã\82\8aã\81¤ã\81¥ã\81\91ã\81¦ã\81\84ã\82\8bã\81\8bã\82\89ã\81§ã\81\99ã\80\82"

 
 # type: Content of: <chapter><section><section><section><title>
 
 # type: Content of: <chapter><section><section><section><title>

-#: resources.dbk:688
+#: resources.dbk:689

 msgid "More information about the testing distribution"
 msgstr "テスト版ディストリビューションについてのさらなる情報"
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "More information about the testing distribution"
 msgstr "テスト版ディストリビューションについてのさらなる情報"
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:690
+#: resources.dbk:691

 msgid ""
 msgid ""

-"Packages are usually installed into the `testing' distribution after they "
-"have undergone some degree of testing in unstable."
+"Packages are usually installed into the <literal>testing</literal> "
+"distribution after they have undergone some degree of testing in "
+"<literal>unstable</literal>."

 msgstr ""
 msgstr ""

+"パッケージは通常、<literal>不安定版 (unstable)</literal> におけるテスト版"
+"への移行基準を満たした後で<literal>テスト版 (testing)</literal> ディストリビュー"
+"ションへとインストールされます。"

 
 # type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:694
+#: resources.dbk:695

 msgid ""
 "For more details, please see the <link linkend=\"testing\">information about "
 "the testing distribution</link>."
 msgid ""
 "For more details, please see the <link linkend=\"testing\">information about "
 "the testing distribution</link>."


@@ -1316,48 +1351,48 @@ msgstr ""
 "についての情報</link>を参照してください。"
 
 # type: Content of: <chapter><section><section><section><title>
 "についての情報</link>を参照してください。"
 
 # type: Content of: <chapter><section><section><section><title>

-#: resources.dbk:700
+#: resources.dbk:701

 msgid "Experimental"
 msgstr "試験版 (experimental)"
 
 # type: Content of: <chapter><section><section><section><para>
 msgid "Experimental"
 msgstr "試験版 (experimental)"
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:702
-msgid ""
-"The <emphasis>experimental</emphasis> distribution is a special "
-"distribution.  It is not a full distribution in the same sense as `stable' "
-"and `unstable' are.  Instead, it is meant to be a temporary staging area for "
-"highly experimental software where there's a good chance that the software "
-"could break your system, or software that's just too unstable even for the "
-"<emphasis>unstable</emphasis> distribution (but there is a reason to package "
-"it nevertheless).  Users who download and install packages from "
-"<emphasis>experimental</emphasis> are expected to have been duly warned.  In "
-"short, all bets are off for the <emphasis>experimental</emphasis> "
-"distribution."
-msgstr ""
-"<emphasis>試験版 (experimental) </emphasis> は特殊なディストリビューションです。"
-"ã\81\93ã\82\8cã\81¯ã\80\81`å®\89å®\9aç\89\88' ã\82\84 `ä¸\8då®\89å®\9aç\89\88' ã\81¨å\90\8cã\81\98æ\84\8få\91³ã\81§ã\81®å®\8cå\85¨ã\81ªã\83\87ã\82£ã\82¹ã\83\88ã\83ªã\83\93ã\83¥ã\83¼ã\82·ã\83§ã\83³ã\81§ã\81¯ã\81\82ã\82\8aã\81¾ã\81\9bã\82\93ã\80\82"
-"ã\81\9dã\81®ä»£ã\82\8fã\82\8aã\80\81ã\82½ã\83\95ã\83\88ã\82¦ã\82§ã\82¢ã\81\8cã\82·ã\82¹ã\83\86ã\83 ã\82\92ç ´å£\8aã\81\99ã\82\8bå\8f¯è\83½æ\80§ã\81\8cã\81\82ã\82\8bã\80\81ã\81\82ã\82\8bã\81\84ã\81¯<emphasis>"
-"不安定版</emphasis>ディストリビューションに導入することですら不安定過ぎる "
-"(ã\81 ã\81\8cã\80\81ã\81\9dã\82\8cã\81«ã\82\82ã\81\8bã\81\8bã\82\8fã\82\89ã\81\9aã\80\81ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81«ã\81\99ã\82\8bç\90\86ç\94±ã\81¯ã\81\82ã\82\8b) ã\82\82ã\81®ã\81§ã\81\82ã\82\8bã\82\88ã\81\86ã\81ªã\80\81ã\81¨ã\81¦ã\82\82"
-"実験的な要素を含むソフトウェアの一時的な置き場であることを意味しています。"
-"<emphasis>試é¨\93ç\89\88 (experimental)</emphasis> ã\81\8bã\82\89ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\82\92ã\83\80ã\82¦ã\83³ã\83­ã\83¼ã\83\89ã\81\97ã\81¦"
-"ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«ã\81\99ã\82\8bã\83¦ã\83¼ã\82¶ã\81¯ã\80\81å\8d\81å\88\86ã\81«æ³¨æ\84\8fã\82\92å\8f\97ã\81\91ã\81¦ã\81\84ã\82\8bã\81®ã\82\92æ\9c\9få¾\85ã\81\95ã\82\8cã\81¦ã\81\84ã\81¾ã\81\99ã\80\82è¦\81ã\81\99ã\82\8bã\81«ã\80\81"
-"<emphasis>試験版 (experimental)</emphasis> ディストリビューションを利用すると、"
-"どのようになるかは全くわからないということです。"
+#: resources.dbk:703
+msgid ""
+"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 ""
+"<literal>試験版 (experimental) </literal> は特殊なディストリビューションで"
+"ã\81\99ã\80\82ã\81\93ã\82\8cã\81¯ã\80\81`å®\89å®\9aç\89\88' ã\82\84 `ä¸\8då®\89å®\9aç\89\88' ã\81¨å\90\8cã\81\98æ\84\8få\91³ã\81§ã\81®å®\8cå\85¨ã\81ªã\83\87ã\82£ã\82¹ã\83\88ã\83ªã\83\93ã\83¥ã\83¼ã\82·ã\83§ã\83³"
+"ã\81§ã\81¯ã\81\82ã\82\8aã\81¾ã\81\9bã\82\93ã\80\82ã\81\9dã\81®ä»£ã\82\8fã\82\8aã\80\81ã\82½ã\83\95ã\83\88ã\82¦ã\82§ã\82¢ã\81\8cã\82·ã\82¹ã\83\86ã\83 ã\82\92ç ´å£\8aã\81\99ã\82\8bå\8f¯è\83½æ\80§ã\81\8cã\81\82ã\82\8bã\80\81ã\81\82"
+"るいは<literal>不安定版</literal>ディストリビューションに導入することですら"
+"ä¸\8då®\89å®\9aé\81\8eã\81\8eã\82\8b (ã\81 ã\81\8cã\80\81ã\81\9dã\82\8cã\81«ã\82\82ã\81\8bã\81\8bã\82\8fã\82\89ã\81\9aã\80\81ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81«ã\81\99ã\82\8bç\90\86ç\94±ã\81¯ã\81\82ã\82\8b) ã\82\82ã\81®ã\81§ã\81\82"
+"るような、とても実験的な要素を含むソフトウェアの一時的な置き場であることを意"
+"å\91³ã\81\97ã\81¦ã\81\84ã\81¾ã\81\99ã\80\82<literal>試é¨\93ç\89\88 (experimental)</literal> ã\81\8bã\82\89ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\82\92ã\83\80ã\82¦"
+"ã\83³ã\83­ã\83¼ã\83\89ã\81\97ã\81¦ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«ã\81\99ã\82\8bã\83¦ã\83¼ã\82¶ã\81¯ã\80\81å\8d\81å\88\86ã\81«æ³¨æ\84\8fã\82\92å\8f\97ã\81\91ã\81¦ã\81\84ã\82\8bã\81®ã\82\92æ\9c\9få¾\85ã\81\95ã\82\8cã\81¦ã\81\84"
+"ます。要するに、<literal>試験版 (experimental)</literal> ディストリビュー"
+"ã\82·ã\83§ã\83³ã\82\92å\88©ç\94¨ã\81\99ã\82\8bã\81¨ã\80\81ã\81©ã\81®ã\82\88ã\81\86ã\81«ã\81ªã\82\8bã\81\8bã\81¯å\85¨ã\81\8fã\82\8fã\81\8bã\82\89ã\81ªã\81\84ã\81¨ã\81\84ã\81\86ã\81\93ã\81¨ã\81§ã\81\99ã\80\82"

 
 # type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:713
+#: resources.dbk:715

 msgid ""
 "These are the <citerefentry> <refentrytitle>sources.list</refentrytitle> "
 msgid ""
 "These are the <citerefentry> <refentrytitle>sources.list</refentrytitle> "

-"<manvolnum>5</manvolnum> </citerefentry> lines for <emphasis>experimental</"
-"emphasis>:"
+"<manvolnum>5</manvolnum> </citerefentry> lines for <literal>experimental</"
+"literal>:"

 msgstr ""
 msgstr ""

-"<emphasis>試験版 (experimental)</emphasis> 用の <citerefentry> <refentrytitle>"
-"sources.list</refentrytitle> は <manvolnum>5</manvolnum> </citerefentry>"
-"行あります:"
+"以下が、<literal>試験版 (experimental)</literal> 用の <citerefentry> "
+"<refentrytitle>sources.list</refentrytitle> <manvolnum>5</manvolnum> "
+"</citerefentry>です:"

 
 # type: Content of: <chapter><section><section><section><programlisting>
 
 # type: Content of: <chapter><section><section><section><programlisting>

-#: resources.dbk:717
+#: resources.dbk:719

 #, no-wrap
 msgid ""
 "\n"
 #, no-wrap
 msgid ""
 "\n"


@@ -1369,176 +1404,197 @@ msgstr ""
 "deb-src http://ftp.<replaceable>jp</replaceable>.debian.org/debian/ experimental main\n"
 
 # type: Content of: <chapter><section><section><section><para>
 "deb-src http://ftp.<replaceable>jp</replaceable>.debian.org/debian/ experimental main\n"
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:722
+#: resources.dbk:724

 msgid ""
 "If there is a chance that the software could do grave damage to a system, it "
 msgid ""
 "If there is a chance that the software could do grave damage to a system, it "

-"is likely to be better to put it into <emphasis>experimental</emphasis>.  "
-"For instance, an experimental compressed file system should probably go into "
-"<emphasis>experimental</emphasis>."
+"is likely to be better to put it into <literal>experimental</literal>.  For "
+"instance, an experimental compressed file system should probably go into "
+"<literal>experimental</literal>."

 msgstr ""
 msgstr ""

-"ソフトウェアがシステムに多大なダメージを与える可能性がある場合、<emphasis>"
-"試験版 (experimental)</emphasis> へ配置する方が良いでしょう。例えば、実験的な"
-"圧縮ファイルシステムは恐らく<emphasis>試験版 (experimental)</emphasis> に"
-"行くことになるでしょう。"
+"ソフトウェアがシステムに多大なダメージを与える可能性がある場合、<literal>試"
+"験版 (experimental)</literal> へ配置する方が良いでしょう。例えば、実験的な圧"
+"縮ファイルシステムは恐らく<literal>試験版 (experimental)</literal> に行くこ"
+"とになるでしょう。"

 
 # type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:728
+#: resources.dbk:730

 msgid ""
 "Whenever there is a new upstream version of a package that introduces new "
 "features but breaks a lot of old ones, it should either not be uploaded, or "
 msgid ""
 "Whenever there is a new upstream version of a package that introduces new "
 "features but breaks a lot of old ones, it should either not be uploaded, or "

-"be uploaded to <emphasis>experimental</emphasis>.  A new, beta, version of "
+"be uploaded to <literal>experimental</literal>.  A new, beta, version of "

 "some software which uses a completely different configuration can go into "
 "some software which uses a completely different configuration can go into "

-"<emphasis>experimental</emphasis>, at the maintainer's discretion.  If you "
-"are working on an incompatible or complex upgrade situation, you can also "
-"use <emphasis>experimental</emphasis> as a staging area, so that testers can "
-"get early access."
-msgstr ""
-"パッケージの新しい上流バージョンが新しい機能を導入するが多くの古い機能を壊して"
-"ã\81\97ã\81¾ã\81\86å ´å\90\88ã\81¯ä½\95æ\99\82ã\81§ã\82\82ã\80\81ã\82¢ã\83\83ã\83\97ã\83­ã\83¼ã\83\89ã\81\97ã\81ªã\81\84ã\81§ã\81\8aã\81\8fã\80\81ã\81\82ã\82\8bã\81\84ã\81¯ <emphasis>試験版 "
-"(experimental)</emphasis> へアップロードするかしましょう。"
-"新しいバージョン、ベータ版などで、利用する設定が完全に変わっているソフトウェアは、"
-"メンテナの配慮に従って<emphasis>試験版 (experimental)</emphasis> へ入れること"
-"ã\81\8cã\81§ã\81\8dã\81¾ã\81\99ã\80\82ã\82\82ã\81\97ã\82\82é\9d\9eäº\92æ\8f\9bæ\80§ã\82\84è¤\87é\9b\91ã\81ªã\82¢ã\83\83ã\83\97ã\82°ã\83¬ã\83¼ã\83\89対å¿\9cã\81«ã\81¤ã\81\84ã\81¦ä½\9c業ã\81\97ã\81¦ã\81\84ã\82\8bå ´å\90\88ã\81ªã\81©ã\81¯ã\80\81"
-"<emphasis>試験版 (experimental)</emphasis> をステージングエリアとして利用する"
-"ことができるのです。その結果、テストユーザは早期に新しいバージョンの利用が可能に"
-"なります。"
+"<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 ""
+"パッケージの新しい上流バージョンが新しい機能を導入するが多くの古い機能を壊し"
+"ã\81¦ã\81\97ã\81¾ã\81\86å ´å\90\88ã\81§ã\81\82ã\82\8cã\81°ã\80\81ã\82¢ã\83\83ã\83\97ã\83­ã\83¼ã\83\89ã\81\97ã\81ªã\81\84ã\81§ã\81\8aã\81\8fã\81\8b<literal>試験版 "
+"(experimental)</literal> へアップロードするかしましょう。新しいバージョン、"
+"ベータ版などで、利用する設定が完全に変わっているソフトウェアは、メンテナの配"
+"慮に従って<literal>試験版 (experimental)</literal> へ入れることができます。"
+"もしも非互換性や複雑なアップグレード対応について作業している場合などは、"
+"<literal>試験版 (experimental)</literal> をステージングエリアとして利用する"
+"ことができるのです。その結果、テストユーザは早期に新しいバージョンの利用が可"
+"能になります。"

 
 # type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:738

 # propagate
 # propagate

+#: resources.dbk:740

 msgid ""
 msgid ""

-"Some experimental software can still go into <emphasis>unstable</emphasis>, "
+"Some experimental software can still go into <literal>unstable</literal>, "

 "with a few warnings in the description, but that isn't recommended because "
 "with a few warnings in the description, but that isn't recommended because "

-"packages from <emphasis>unstable</emphasis> are expected to propagate to "
-"<emphasis>testing</emphasis> and thus to <emphasis>stable</emphasis>.  You "
-"should not be afraid to use <emphasis>experimental</emphasis> since it does "
+"packages from <literal>unstable</literal> are expected to propagate to "
+"<literal>testing</literal> and thus to <literal>stable</literal>.  You "
+"should not be afraid to use <literal>experimental</literal> since it does "

 "not cause any pain to the ftpmasters, the experimental packages are "
 "not cause any pain to the ftpmasters, the experimental packages are "

-"automatically removed once you upload the package in <emphasis>unstable</"
-"emphasis> with a higher version number."
-msgstr ""
-"試験版 (experimental) のソフトウェアは<emphasis>不安定版 (unstable)</emphasis> "
-"へ説明文に幾つかの警告を加えた上で入れることも可能ではありますが、お勧めはできません。"
-"ã\81\9dã\82\8cã\81¯ã\80\81<emphasis>ä¸\8då®\89å®\9aç\89\88 (unstable)</emphasis> ã\81®ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81¯<emphasis>ã\83\86ã\82¹ã\83\88ç\89\88"
-" (testing)</emphasis> へ移行し、そして<emphasis>安定版 (stable)</emphasis> に"
-"なることが期待されているからです。"
-"<emphasis>試験版 (experimental)</emphasis> を使うのをためらうべきではありません。"
-"何故なら ftpmaster には何の苦痛も与えませんし、試験版 (experimental) のパッケージ"
-"は一旦<emphasis>不安定版 (unstable)</emphasis> により大きなバージョン番号でアップ"
+"automatically removed once you upload the package in <literal>unstable</"
+"literal> with a higher version number."
+msgstr ""
+"試験版 (experimental) のソフトウェアは<literal>不安定版 (unstable)</"
+"literal> へ説明文に幾つかの警告を加えた上で入れることも可能ではありますが、"
+"ã\81\8aå\8b§ã\82\81ã\81¯ã\81§ã\81\8dã\81¾ã\81\9bã\82\93ã\80\82ã\81\9dã\82\8cã\81¯ã\80\81<literal>ä¸\8då®\89å®\9aç\89\88 (unstable)</literal> ã\81®ã\83\91ã\83\83"
+"ケージは<literal>テスト版 (testing)</literal> へ移行し、そして<literal>安"
+"定版 (stable)</literal> になることが期待されているからです。<literal>試験"
+"版 (experimental)</literal> を使うのをためらうべきではありません。何故なら "
+"ftpmaster には何の苦痛も与えませんし、試験版 (experimental) のパッケージは一"
+"旦<literal>不安定版 (unstable)</literal> により大きなバージョン番号でアップ"

 "ロードされると自動的に削除されるからです。"
 
 # type: Content of: <chapter><section><section><section><para>
 "ロードされると自動的に削除されるからです。"
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:748
+#: resources.dbk:750

 msgid ""
 "New software which isn't likely to damage your system can go directly into "
 msgid ""
 "New software which isn't likely to damage your system can go directly into "

-"<emphasis>unstable</emphasis>."
+"<literal>unstable</literal>."

 msgstr ""
 msgstr ""

-"システムにダメージを与えないような新しいソフトウェアは直接<emphasis>不安定版 "
-"(unstable)</emphasis> へ入れることが可能です。"
+"システムにダメージを与えないような新しいソフトウェアは直接<literal>不安定版 "
+"(unstable)</literal> へ入れることが可能です。"

 
 # type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:752
+#: resources.dbk:754

 msgid ""
 msgid ""

-"An alternative to <emphasis>experimental</emphasis> is to use your personal "
+"An alternative to <literal>experimental</literal> is to use your personal "

 "web space on <literal>people.debian.org</literal>."
 msgstr ""
 "web space on <literal>people.debian.org</literal>."
 msgstr ""

-"<emphasis>試験版 (experimental)</emphasis> の代わりとなる方法は、<literal>"
-"people.debian.org</literal> 上の個人的な web ページを使うことです。"
+"<literal>試験版 (experimental)</literal> の代わりとなる方法は、"
+"<literal>people.debian.org</literal> 上の個人的な web ページを使うことです。"

 
 # type: Content of: <chapter><section><section><section><para>
 
 # type: Content of: <chapter><section><section><section><para>

-#: resources.dbk:756
+#: resources.dbk:758

 msgid ""
 msgid ""

-"When uploading to unstable a package which had bugs fixed in experimental, "
-"please consider using the option <literal>-v</literal> to <command>dpkg-"
-"buildpackage</command> to finally get them closed."
+"When uploading to <literal>unstable</literal> a package which had bugs fixed "
+"in <literal>experimental</literal>, please consider using the option "
+"<literal>-v</literal> to <command>dpkg-buildpackage</command> to finally get "
+"them closed."

 msgstr ""
 msgstr ""

-"試験版 (experimental) のバグを修正したパッケージを不安定版 (unstable) に"
-"アップロードする際、最終的にバグをクローズするために <command>dpkg-buildpackage"
-"</command> で <literal>-v</literal> オプションを使うことを検討してください。"
+"<literal>試験版 (experimental)</literal> のバグを修正したパッケージを<literal>"
+"不安定版 (unstable)</literal> にアップロードする際、最終的にバグをクローズするために"
+" <command>dpkg-buildpackage</command> で <literal>-v</literal> オプションの利用"
+"を検討してください。"

 
 # type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:765
+#: resources.dbk:768

 msgid "Release code names"
 msgstr "リリースのコードネーム"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Release code names"
 msgstr "リリースのコードネーム"
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:767
-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."
-msgstr ""
-"リリースされた Debian ディストリビューションは全て<emphasis>コードネーム</"
-"emphasis>を持っています： Debian 1.1 は `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' "
-"です。`sid' と呼ばれる「擬似ディストリビューション」もあり、これは現在の `unstable' "
-"ディストリビューションを指します。パッケージは安定に近づくと `unstable' から "
-"`testing' へと移動されるので、`sid' そのものは決してリリースされません。通常"
-"の Debian ディストリビューションの内容同様に、`sid' は Debian ではまだ公式に"
-"サポートあるいはリリースされていないアーキテクチャのパッケージを含んでいま"
-"す。これらのアーキテクチャは、いつか主流ディストリビューションに統合される予"
-"定です。"
-
-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:779
-#, fuzzy
+#: resources.dbk:770
+msgid ""
+"Every released Debian distribution has a <literal>code name</literal>: "
+"Debian 1.1 is called <literal>buzz</literal>; Debian 1.2, <literal>rex</"
+"literal>; Debian 1.3, <literal>bo</literal>; Debian 2.0, <literal>hamm</"
+"literal>; Debian 2.1, <literal>slink</literal>; Debian 2.2, <literal>potato</"
+"literal>; Debian 3.0, <literal>woody</literal>; Debian 3.1, <literal>sarge</"
+"literal>; Debian 4.0, <literal>etch</literal> and Debian 5.0 will be called "
+"<literal> lenny</literal>.  There is also a ``pseudo-distribution'', called "
+"<literal>sid</literal>, which is the current <literal>unstable</literal> "
+"distribution; since packages are moved from <literal>unstable</literal> to "
+"<literal>testing</literal> as they approach stability, <literal>sid</"
+"literal> itself is never released.  As well as the usual contents of a "
+"Debian distribution, <literal>sid</literal> contains packages for "
+"architectures which are not yet officially supported or released by Debian.  "
+"These architectures are planned to be integrated into the mainstream "
+"distribution at some future date."
+msgstr ""
+"リリースされた Debian ディストリビューションは全て<literal>コードネーム</literal>"
+"を持っています： Debian 1.1 は <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> です。"
+"<literal>sid</literal> と呼ばれる「擬似ディストリビューション」もあり、これは現在の "
+"<literal>unstable</literal> ディストリビューションを指します。パッケージは安定に"
+"近づくと <literal>unstable</literal> から <literal>testing</literal> へと移動"
+"されるので、<literal>sid</literal> そのものは決してリリースされません。通常の Debian "
+"ディストリビューションの内容同様に、<literal>sid</literal> は Debian ではまだ公式に"
+"サポートあるいはリリースされていないアーキテクチャのパッケージを含んで"
+"います。これらのアーキテクチャは、いつか主流ディストリビューションに統合される予定です。"
+
+# type: Content of: <chapter><section><section><para>
+#: resources.dbk:787

 msgid ""
 "Since Debian has an open development model (i.e., everyone can participate "
 msgid ""
 "Since Debian has an open development model (i.e., everyone can participate "

-"and follow the development) even the `unstable' and `testing' distributions "
-"are distributed to the Internet through the Debian FTP and HTTP server "
-"network.  Thus, if we had called the directory which contains the release "
-"candidate version `testing', then we would have to rename it to `stable' "
-"when the version is released, which would cause all FTP mirrors to re-"
-"retrieve the whole distribution (which is quite large)."
-msgstr ""
-"Debian はオープンな開発体制 (つまり、誰もが開発を"
-"追いかけられる) たとえ `unstable' および `testing' ディストリビューションが"
-"Debian の FTP および HTTP サーバネットワークを通じてインターネットに提供されている"
-"つまり、"
-
-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:788
-#, fuzzy
-msgid ""
-"On the other hand, if we called the distribution directories "
-"<emphasis>Debian-x.y</emphasis> from the beginning, people would think that "
-"Debian release <emphasis>x.y</emphasis> is available.  (This happened in the "
-"past, where a CD-ROM vendor built a Debian 1.0 CD-ROM based on a pre-1.0 "
-"development version.  That's the reason why the first official Debian "
-"release was 1.1, and not 1.0.)"
-msgstr ""
-"一方、最初からディストリビューションディレクトリ <emphasis>Debian-x.y</emphasis>"
-"Debian リリース <emphasis>x.y</emphasis> が利用可能になっていると考えるでしょう。"
-"(これは過去にあったことで、CD-ROM ベンダが Debian 1.0 の CD-ROM を pre-1.0 開発版を元に作成したことによります。これが。何故最初の公式 Debian のリリース版が 1.0 ではなく 1.1 であったかという理由です)。 、"
-
-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:796
+"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 ""
+"Debian はオープンな開発体制 (つまり、誰もが開発について参加／追いかけが可能) と"
+"なっており、<literal>不安定版 (unstable)</literal> および <literal>テスト版 "
+"(testing)</literal> ディストリビューションすら Debian の FTP および HTTP サーバ"
+"ネットワークを通じてインターネットへ提供されています。従って、リリース候補版を含む"
+"ディレクトリを<literal>テスト版 (testing)</literal> と呼んだ場合、このバージョン"
+"がリリースされる際に<literal>安定版 (stable)</literal> へとリネームする必要がある"
+"ということを意味しており、すべての FTP ミラーがディストリビューションすべて (とても"
+"巨大です) を再回収することになります。"
+
+# type: Content of: <chapter><section><section><para>
+#: resources.dbk:797
+msgid ""
+"On the other hand, if we called the distribution directories <literal>Debian-"
+"x.y</literal> from the beginning, people would think that Debian release "
+"<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 ""
+"一方、最初からディストリビューションディレクトリを <literal>Debian-x.y</literal> "
+"と呼んでいた場合、皆 Debian リリース <literal>x.y</literal> が利用可能になっている"
+"と考えるでしょう。(これは過去にあったことで、CD-ROM ベンダが Debian 1.0 の CD-ROM "
+"を pre-1.0 開発版を元に作成したことによります。これが。何故最初の公式 Debian の"
+"リリース版が 1.0 ではなく 1.1 であったかという理由です)。 "
+
+# type: Content of: <chapter><section><section><para>
+#: resources.dbk:805

 msgid ""
 "Thus, the names of the distribution directories in the archive are "
 "determined by their code names and not their release status (e.g., "
 "`slink').  These names stay the same during the development period and after "
 "the release; symbolic links, which can be changed easily, indicate the "
 "currently released stable distribution.  That's why the real distribution "
 msgid ""
 "Thus, the names of the distribution directories in the archive are "
 "determined by their code names and not their release status (e.g., "
 "`slink').  These names stay the same during the development period and after "
 "the release; symbolic links, which can be changed easily, indicate the "
 "currently released stable distribution.  That's why the real distribution "

-"directories use the <emphasis>code names</emphasis>, while symbolic links "
-"for <emphasis>stable</emphasis>, <emphasis>testing</emphasis>, and "
-"<emphasis>unstable</emphasis> point to the appropriate release directories."
-msgstr ""
+"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 ""
+"従って、アーカイブ内のディストリビューションディレクトリの名前はリリースの状態では"
+"なくコードネームで決定されます (例えば `slink' など)。これらの名称は開発期間中と"
+"リリース後も同じものであり続けます。そして、簡単に変更可能なシンボリックリンクに"
+"よって、現在の安定版リリースディストリビューションを示すことになります。これが、"
+"<literal>stable</literal>、<literal>testing</literal>、<literal>unstable"
+"</literal> へのシンボリックリンクがそれぞれ相応しいリリースディレクトリを指して"
+"いるのに対して、実際のディストリビューションディレクトリでは<literal>コードネーム"
+"</literal>を使っている理由です。"

 
 # type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>

-#: resources.dbk:810
+#: resources.dbk:819

 msgid "Debian mirrors"
 msgstr "Debian ミラーサーバ"
 
 # type: Content of: <chapter><section><para>
 msgid "Debian mirrors"
 msgstr "Debian ミラーサーバ"
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:812
+#: resources.dbk:821

 msgid ""
 "The various download archives and the web site have several mirrors "
 "available in order to relieve our canonical servers from heavy load.  In "
 msgid ""
 "The various download archives and the web site have several mirrors "
 "available in order to relieve our canonical servers from heavy load.  In "


@@ -1552,7 +1608,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:823
+#: resources.dbk:832

 msgid ""
 "All the information on Debian mirrors, including a list of the available "
 "public FTP/HTTP servers, can be found at <ulink url=\"&url-debian-mirrors;"
 msgid ""
 "All the information on Debian mirrors, including a list of the available "
 "public FTP/HTTP servers, can be found at <ulink url=\"&url-debian-mirrors;"


@@ -1560,29 +1616,29 @@ msgid ""
 "be helpful if you are interested in setting up your own mirror, either for "
 "internal or public access."
 msgstr ""
 "be helpful if you are interested in setting up your own mirror, either for "
 "internal or public access."
 msgstr ""

-"利用可能な公開 FTP/HTTP サーバのリストを含む、Debian ミラーサーバについての全ての"
-"情報が <ulink url=\"&url-debian-mirrors;\"></ulink> から入手可能です。"
-"ã\81\93ã\81®å½¹ç«\8bã\81¤ã\83\9aã\83¼ã\82¸ã\81«ã\81¯ã\80\81å\86\85é\83¨ç\9a\84ã\81ªã\82\82ã\81®ã\81§ã\81\82ã\82\8cå\85¬é\96\8bã\81\95ã\82\8cã\82\8bã\82\82ã\81®ã\81§ã\81\82ã\82\8cã\80\81è\87ªå\88\86ã\81®ã\83\9fã\83©ã\83¼ã\82\92設å®\9aã\81\99ã\82\8b"
-"ことに興味を持った場合に役立つ情報とツールも含まれています。"
+"利用可能な公開 FTP/HTTP サーバのリストを含む、Debian ミラーサーバについての全"
+"ての情報が <ulink url=\"&url-debian-mirrors;\"></ulink> から入手可能です。こ"
+"ã\81®å½¹ç«\8bã\81¤ã\83\9aã\83¼ã\82¸ã\81«ã\81¯ã\80\81å\86\85é\83¨ç\9a\84ã\81ªã\82\82ã\81®ã\81§ã\81\82ã\82\8cå\85¬é\96\8bã\81\95ã\82\8cã\82\8bã\82\82ã\81®ã\81§ã\81\82ã\82\8cã\80\81è\87ªå\88\86ã\81®ã\83\9fã\83©ã\83¼ã\82\92設"
+"定することに興味を持った場合に役立つ情報とツールも含まれています。"

 
 # type: Content of: <chapter><section><para>
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:830
+#: resources.dbk:839

 msgid ""
 "Note that mirrors are generally run by third-parties who are interested in "
 "helping Debian.  As such, developers generally do not have accounts on these "
 "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 ""

-"注意してほしいのは、ミラーは大抵 Debian の支援に興味を抱いてくれた第三者によって"
-"運用されていることです。そのため、開発者は通常これらのマシン上にはアカウントを"
-"持ってはいません。"
+"注意してほしいのは、ミラーは大抵 Debian の支援に興味を抱いてくれた第三者に"
+"よって運用されていることです。そのため、開発者は通常これらのマシン上にはアカ"
+"ウントを持ってはいません。"

 
 # type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>

-#: resources.dbk:837
+#: resources.dbk:846

 msgid "The Incoming system"
 msgstr "Incoming システム"
 
 # type: Content of: <chapter><section><para>
 msgid "The Incoming system"
 msgstr "Incoming システム"
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:839
+#: resources.dbk:848

 msgid ""
 "The Incoming system is responsible for collecting updated packages and "
 "installing them in the Debian archive.  It consists of a set of directories "
 msgid ""
 "The Incoming system is responsible for collecting updated packages and "
 "installing them in the Debian archive.  It consists of a set of directories "


@@ -1590,7 +1646,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:844
+#: resources.dbk:853

 msgid ""
 "Packages are uploaded by all the maintainers into a directory called "
 "<filename>UploadQueue</filename>.  This directory is scanned every few "
 msgid ""
 "Packages are uploaded by all the maintainers into a directory called "
 "<filename>UploadQueue</filename>.  This directory is scanned every few "


@@ -1613,7 +1669,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:863
+#: resources.dbk:872

 msgid ""
 "Once the package is accepted, the system sends a confirmation mail to the "
 "maintainer and closes all the bugs marked as fixed by the upload, and the "
 msgid ""
 "Once the package is accepted, the system sends a confirmation mail to the "
 "maintainer and closes all the bugs marked as fixed by the upload, and the "


@@ -1629,36 +1685,41 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:875
+#: resources.dbk:884

 msgid ""
 "The archive maintenance software will also send the OpenPGP/GnuPG signed "
 "<filename>.changes</filename> file that you uploaded to the appropriate "
 "mailing lists.  If a package is released with the <literal>Distribution:</"
 msgid ""
 "The archive maintenance software will also send the OpenPGP/GnuPG signed "
 "<filename>.changes</filename> file that you uploaded to the appropriate "
 "mailing lists.  If a package is released with the <literal>Distribution:</"

-"literal> set to `stable', the announcement is sent to &email-debian-"
-"changes;.  If a package is released with <literal>Distribution:</literal> "
-"set to `unstable' or `experimental', the announcement will be posted to "
-"&email-debian-devel-changes; instead."
+"literal> set to <literal>stable</literal>, the announcement is sent to "
+"&email-debian-changes;.  If a package is released with <literal>Distribution:"
+"</literal> set to <literal>unstable</literal> or <literal>experimental</"
+"literal>, the announcement will be posted to &email-debian-devel-changes; "
+"instead."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:885
+#: resources.dbk:894

 msgid ""
 "Though ftp-master is restricted, a copy of the installation is available to "
 "all developers on <literal>&ftp-master-mirror;</literal>."
 msgstr ""
 msgid ""
 "Though ftp-master is restricted, a copy of the installation is available to "
 "all developers on <literal>&ftp-master-mirror;</literal>."
 msgstr ""

+"ftp-master は利用が制限されているサーバなので、インストールされたもののコピーは "
+"<literal>&ftp-master-mirror;</literal> 上で全ての開発者が利用できるようになって"
+"います。"
+

 
 # type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>

-#: resources.dbk:948
+#: resources.dbk:957

 msgid "Package information"
 msgstr "パッケージ情報"
 
 # type: Content of: <chapter><section><section><title>
 msgid "Package information"
 msgstr "パッケージ情報"
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:950
+#: resources.dbk:959

 msgid "On the web"
 msgid "On the web"

-msgstr ""
+msgstr "ウェブ上から"

 
 # type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:952
+#: resources.dbk:961

 msgid ""
 "Each package has several dedicated web pages.  <literal>http://&packages-"
 "host;/<replaceable>package-name</replaceable></literal> displays each "
 msgid ""
 "Each package has several dedicated web pages.  <literal>http://&packages-"
 "host;/<replaceable>package-name</replaceable></literal> displays each "


@@ -1666,65 +1727,94 @@ msgid ""
 "links to a page which provides information, including the package "
 "description, the dependencies, and package download links."
 msgstr ""
 "links to a page which provides information, including the package "
 "description, the dependencies, and package download links."
 msgstr ""

+"パッケージはそれぞれ複数の目的別のウェブページを持っています。<literal>"
+"http://&packages-host;/<replaceable>package-name</replaceable></literal> は"
+"各ディストリビューション中でそれぞれ利用可能なパッケージバージョンを表示します。"
+"バージョン毎のリンク先のページはパッケージの説明、依存関係、ダウンロードへのリンク"
+"を含んだ情報を提供しています。"

 
 # type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:959
+#: resources.dbk:968

 msgid ""
 "The bug tracking system tracks bugs for each package.  You can view the bugs "
 "of a given package at the URL <literal>http://&bugs-host;/"
 "<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 ""

+"バグ追跡システムは個々のパッケージのバグを記録していきます。"
+"<literal>http://&bugs-host;/<replaceable>package-name</replaceable></literal> "
+"というような URL で与えたパッケージ名のバグを閲覧できます。"

 
 # type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:966
-msgid "The <command>madison</command> utility"
-msgstr "<command>madison</command> ユーティリティ"
+#: resources.dbk:975
+msgid "The <command>dak ls</command> utility"
+msgstr "<command>dak ls</command> ユーティリティ"

 
 # type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:968
+#: resources.dbk:977

 msgid ""
 msgid ""

-"<command>madison</command> is a command-line utility that is available on "
-"<literal>&ftp-master-host;</literal>, and on the mirror on <literal>&ftp-"
-"master-mirror;</literal>.  It uses a single argument corresponding to a "
-"package name.  In result it displays which version of the package is "
-"available for each architecture and distribution combination.  An example "
-"will explain it better."
+"<command>dak ls</command> is part of the dak suite of tools, listing "
+"available package versions for all known distributions and architectures.  "
+"The <command>dak</command> tool is available on <literal>&ftp-master-host; "
+"</literal>, and on the mirror on <literal>&ftp-master-mirror;</literal>.  It "
+"uses a single argument corresponding to a package name. An example will "
+"explain it better:"

 msgstr ""
 msgstr ""

+"<command>dak ls</command> は dak ツールスイートの一部で、全ディストリビューション"
+"およびアーキテクチャの中から利用可能なパッケージバージョンをリストアップします。"
+"<command>dak</command> ツールは <literal>&ftp-master-host;</literal> 上と、"
+"<literal>&ftp-master-mirror;</literal> 上のミラーにて利用できます。パッケージ名に"
+"対応する一つの引数を使います。実際に例を挙げた方が分かりやすいでしょう:"

 
 # type: Content of: <chapter><section><section><screen>
 
 # type: Content of: <chapter><section><section><screen>

-#: resources.dbk:975
+#: resources.dbk:984

 #, no-wrap
 msgid ""
 "\n"
 #, no-wrap
 msgid ""
 "\n"

-"$ madison libdbd-mysql-perl\n"
-"libdbd-mysql-perl |   1.2202-4 |        stable | source, alpha, arm, i386, m68k, powerpc, sparc\n"
-"libdbd-mysql-perl |   1.2216-2 |       testing | source, arm, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"
-"libdbd-mysql-perl | 1.2216-2.0.1 |       testing | alpha\n"
-"libdbd-mysql-perl |   1.2219-1 |      unstable | source, alpha, arm, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"
+"$ dak ls evince\n"
+"evince | 0.1.5-2sarge1 |     oldstable | source, alpha, arm, hppa, i386, "
+"ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"
+"evince |    0.4.0-5 |     etch-m68k | source, m68k\n"
+"evince |    0.4.0-5 |        stable | source, alpha, amd64, arm, hppa, i386, "
+"ia64, mips, mipsel, powerpc, s390, sparc\n"
+"evince |   2.20.2-1 |       testing | source\n"
+"evince | 2.20.2-1+b1 |       testing | alpha, amd64, arm, armel, hppa, i386, "
+"ia64, mips, mipsel, powerpc, s390, sparc\n"
+"evince |   2.22.2-1 |      unstable | source, alpha, amd64, arm, armel, "
+"hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"

 msgstr ""
 "\n"
 msgstr ""
 "\n"

-"$ madison libdbd-mysql-perl\n"
-"libdbd-mysql-perl |   1.2202-4 |        stable | source, alpha, arm, i386, m68k, powerpc, sparc\n"
-"libdbd-mysql-perl |   1.2216-2 |       testing | source, arm, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"
-"libdbd-mysql-perl | 1.2216-2.0.1 |       testing | alpha\n"
-"libdbd-mysql-perl |   1.2219-1 |      unstable | source, alpha, arm, hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"
-
-# type: Content of: <chapter><section><section><para>
-#: resources.dbk:983
-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."
-msgstr ""
+"$ dak ls evince\n"
+"evince | 0.1.5-2sarge1 |     oldstable | source, alpha, arm, hppa, i386, "
+"ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"
+"evince |    0.4.0-5 |     etch-m68k | source, m68k\n"
+"evince |    0.4.0-5 |        stable | source, alpha, amd64, arm, hppa, i386, "
+"ia64, mips, mipsel, powerpc, s390, sparc\n"
+"evince |   2.20.2-1 |       testing | source\n"
+"evince | 2.20.2-1+b1 |       testing | alpha, amd64, arm, armel, hppa, i386, "
+"ia64, mips, mipsel, powerpc, s390, sparc\n"
+"evince |   2.22.2-1 |      unstable | source, alpha, amd64, arm, armel, "
+"hppa, i386, ia64, m68k, mips, mipsel, powerpc, s390, sparc\n"
+
+# type: Content of: <chapter><section><section><para>
+#: resources.dbk:994
+msgid ""
+"In this example, you can see that the version in <literal>unstable</literal> "
+"differs from the version in <literal>testing</literal> and that there has "
+"been a binary-only NMU of the package for all architectures.  Each version "
+"of the package has been recompiled on all architectures."
+msgstr ""
+"この例では、<literal>不安定版 (unstable)</literal> でのバージョンは <literal>"
+"テスト版 (testing)</literal> のバージョンと違っており、テスト版のパッケージは全"
+"アーキテクチャについて、binary-only NMU されたパッケージになっています。それぞれ"
+"のバージョンのパッケージは、全アーキテクチャ上で再コンパイルされています。"

 
 # type: Content of: <chapter><section><title>
 
 # type: Content of: <chapter><section><title>

-#: resources.dbk:993
+#: resources.dbk:1004

 msgid "The Package Tracking System"
 msgstr "パッケージ追跡システム"
 
 # type: Content of: <chapter><section><para>
 msgid "The Package Tracking System"
 msgstr "パッケージ追跡システム"
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:995
+#: resources.dbk:1006

 msgid ""
 "The Package Tracking System (PTS) is an email-based tool to track the "
 "activity of a source package.  This really means that you can get the same "
 msgid ""
 "The Package Tracking System (PTS) is an email-based tool to track the "
 "activity of a source package.  This really means that you can get the same "


@@ -1733,70 +1823,70 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:1000
+#: resources.dbk:1011

 msgid ""
 "Each email sent through the PTS is classified under one of the keywords "
 "listed below.  This will let you select the mails that you want to receive."
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgid ""
 "Each email sent through the PTS is classified under one of the keywords "
 "listed below.  This will let you select the mails that you want to receive."
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:1004
+#: resources.dbk:1015

 msgid "By default you will get:"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgid "By default you will get:"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1008
+#: resources.dbk:1019

 msgid "<literal>bts</literal>"
 msgstr "<literal>bts</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>bts</literal>"
 msgstr "<literal>bts</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1011
+#: resources.dbk:1022

 msgid "All the bug reports and following discussions."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgid "All the bug reports and following discussions."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1016
+#: resources.dbk:1027

 msgid "<literal>bts-control</literal>"
 msgstr "<literal>bts-control</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>bts-control</literal>"
 msgstr "<literal>bts-control</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1019
+#: resources.dbk:1030

 msgid ""
 "The email notifications from <email>control@&bugs-host;</email> about bug "
 "report status changes."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgid ""
 "The email notifications from <email>control@&bugs-host;</email> about bug "
 "report status changes."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1025
+#: resources.dbk:1036

 msgid "<literal>upload-source</literal>"
 msgstr "<literal>upload-source</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>upload-source</literal>"
 msgstr "<literal>upload-source</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1028
+#: resources.dbk:1039

 msgid ""
 "The email notification from <command>katie</command> when an uploaded source "
 "package is accepted."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgid ""
 "The email notification from <command>katie</command> when an uploaded source "
 "package is accepted."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1034
+#: resources.dbk:1045

 msgid "<literal>katie-other</literal>"
 msgstr "<literal>katie-other</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>katie-other</literal>"
 msgstr "<literal>katie-other</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1037
+#: resources.dbk:1048

 msgid ""
 "Other warning and error emails from <command>katie</command> (such as an "
 "override disparity for the section and/or the priority field)."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgid ""
 "Other warning and error emails from <command>katie</command> (such as an "
 "override disparity for the section and/or the priority field)."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1043
+#: resources.dbk:1054

 msgid "<literal>default</literal>"
 msgstr "<literal>default</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>default</literal>"
 msgstr "<literal>default</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1046
+#: resources.dbk:1057

 msgid ""
 "Any non-automatic email sent to the PTS by people who wanted to contact the "
 "subscribers of the package.  This can be done by sending mail to "
 msgid ""
 "Any non-automatic email sent to the PTS by people who wanted to contact the "
 "subscribers of the package.  This can be done by sending mail to "


@@ -1806,40 +1896,40 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1055
+#: resources.dbk:1066

 msgid "<literal>contact</literal>"
 msgstr "<literal>contact</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>contact</literal>"
 msgstr "<literal>contact</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1058
+#: resources.dbk:1069

 msgid ""
 "Mails sent to the maintainer through the *@packages.debian.org email aliases."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgid ""
 "Mails sent to the maintainer through the *@packages.debian.org email aliases."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1064
+#: resources.dbk:1075

 msgid "<literal>summary</literal>"
 msgstr "<literal>summary</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>summary</literal>"
 msgstr "<literal>summary</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1067
+#: resources.dbk:1078

 msgid ""
 "Regular summary emails about the package's status.  Currently, only "
 msgid ""
 "Regular summary emails about the package's status.  Currently, only "

-"progression in <emphasis>testing</emphasis> is sent."
+"progression in <literal>testing</literal> is sent."

 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:1074
+#: resources.dbk:1085

 msgid "You can also decide to receive additional information:"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgid "You can also decide to receive additional information:"
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1078
+#: resources.dbk:1089

 msgid "<literal>upload-binary</literal>"
 msgstr "<literal>upload-binary</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>upload-binary</literal>"
 msgstr "<literal>upload-binary</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1081
+#: resources.dbk:1092

 msgid ""
 "The email notification from <command>katie</command> when an uploaded binary "
 "package is accepted.  In other words, whenever a build daemon or a porter "
 msgid ""
 "The email notification from <command>katie</command> when an uploaded binary "
 "package is accepted.  In other words, whenever a build daemon or a porter "


@@ -1848,12 +1938,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1089
+#: resources.dbk:1100

 msgid "<literal>cvs</literal>"
 msgstr "<literal>cvs</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>cvs</literal>"
 msgstr "<literal>cvs</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1092
+#: resources.dbk:1103

 msgid ""
 "VCS commit notifications, if the package has a VCS repository and the "
 "maintainer has set up forwarding of commit notifications to the PTS. The "
 msgid ""
 "VCS commit notifications, if the package has a VCS repository and the "
 "maintainer has set up forwarding of commit notifications to the PTS. The "


@@ -1862,48 +1952,48 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1100
+#: resources.dbk:1111

 msgid "<literal>ddtp</literal>"
 msgstr "<literal>ddtp</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>ddtp</literal>"
 msgstr "<literal>ddtp</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1103
+#: resources.dbk:1114

 msgid ""
 "Translations of descriptions or debconf templates submitted to the Debian "
 "Description Translation Project."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 msgid ""
 "Translations of descriptions or debconf templates submitted to the Debian "
 "Description Translation Project."
 msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>

-#: resources.dbk:1109
+#: resources.dbk:1120

 msgid "<literal>derivatives</literal>"
 msgstr "<literal>derivatives</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>derivatives</literal>"
 msgstr "<literal>derivatives</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1112
+#: resources.dbk:1123

 msgid ""
 "Information about changes made to the package in derivative distributions "
 "(for example Ubuntu)."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "Information about changes made to the package in derivative distributions "
 "(for example Ubuntu)."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:1119
+#: resources.dbk:1130

 msgid "The PTS email interface"
 msgstr "PTS メールインターフェイス"
 
 # type: Content of: <chapter><section><section><para>
 msgid "The PTS email interface"
 msgstr "PTS メールインターフェイス"
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1121
+#: resources.dbk:1132

 msgid ""
 "You can control your subscription(s) to the PTS by sending various commands "
 "to <email>pts@qa.debian.org</email>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 msgid ""
 "You can control your subscription(s) to the PTS by sending various commands "
 "to <email>pts@qa.debian.org</email>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1126
+#: resources.dbk:1137

 msgid "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1129
+#: resources.dbk:1140

 msgid ""
 "Subscribes <replaceable>email</replaceable> to communications related to the "
 "source package <replaceable>sourcepackage</replaceable>.  Sender address is "
 msgid ""
 "Subscribes <replaceable>email</replaceable> to communications related to the "
 "source package <replaceable>sourcepackage</replaceable>.  Sender address is "


@@ -1914,12 +2004,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1139
+#: resources.dbk:1150

 msgid "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1142
+#: resources.dbk:1153

 msgid ""
 "Removes a previous subscription to the source package "
 "<replaceable>sourcepackage</replaceable> using the specified email address "
 msgid ""
 "Removes a previous subscription to the source package "
 "<replaceable>sourcepackage</replaceable> using the specified email address "


@@ -1927,36 +2017,36 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1149
+#: resources.dbk:1160

 msgid "<literal>unsubscribeall [&lt;email&gt;]</literal>"
 msgstr "<literal>unsubscribeall [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>unsubscribeall [&lt;email&gt;]</literal>"
 msgstr "<literal>unsubscribeall [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1152
+#: resources.dbk:1163

 msgid ""
 "Removes all subscriptions of the specified email address or the sender "
 "address if the second argument is left out."
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 msgid ""
 "Removes all subscriptions of the specified email address or the sender "
 "address if the second argument is left out."
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1158
+#: resources.dbk:1169

 msgid "<literal>which [&lt;email&gt;]</literal>"
 msgstr "<literal>which [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>which [&lt;email&gt;]</literal>"
 msgstr "<literal>which [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1161
+#: resources.dbk:1172

 msgid ""
 "Lists all subscriptions for the sender or the email address optionally "
 "specified."
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 msgid ""
 "Lists all subscriptions for the sender or the email address optionally "
 "specified."
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1167
+#: resources.dbk:1178

 msgid "<literal>keyword [&lt;email&gt;]</literal>"
 msgstr "<literal>keyword [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>keyword [&lt;email&gt;]</literal>"
 msgstr "<literal>keyword [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1170
+#: resources.dbk:1181

 msgid ""
 "Tells you the keywords that you are accepting.  For an explanation of "
 "keywords, <link linkend=\"pkg-tracking-system\">see above</link>.  Here's a "
 msgid ""
 "Tells you the keywords that you are accepting.  For an explanation of "
 "keywords, <link linkend=\"pkg-tracking-system\">see above</link>.  Here's a "


@@ -1964,98 +2054,98 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1177
+#: resources.dbk:1188

 msgid ""
 "<literal>bts</literal>: mails coming from the Debian Bug Tracking System"
 msgstr "<literal>bts</literal>: Debian バグ追跡システムからのメール"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid ""
 "<literal>bts</literal>: mails coming from the Debian Bug Tracking System"
 msgstr "<literal>bts</literal>: Debian バグ追跡システムからのメール"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1182
+#: resources.dbk:1193

 msgid ""
 "<literal>bts-control</literal>: reply to mails sent to &email-bts-control;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid ""
 "<literal>bts-control</literal>: reply to mails sent to &email-bts-control;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1188
+#: resources.dbk:1199

 msgid ""
 "<literal>summary</literal>: automatic summary mails about the state of a "
 "package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid ""
 "<literal>summary</literal>: automatic summary mails about the state of a "
 "package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1194
+#: resources.dbk:1205

 msgid ""
 "<literal>contact</literal>: mails sent to the maintainer through the "
 "*@packages.debian.org aliases"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid ""
 "<literal>contact</literal>: mails sent to the maintainer through the "
 "*@packages.debian.org aliases"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1200
+#: resources.dbk:1211

 msgid "<literal>cvs</literal>: notification of VCS commits"
 msgstr "<literal>cvs</literal>: VCS へのコミットを知らせます"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid "<literal>cvs</literal>: notification of VCS commits"
 msgstr "<literal>cvs</literal>: VCS へのコミットを知らせます"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1205
+#: resources.dbk:1216

 msgid ""
 "<literal>ddtp</literal>: translations of descriptions and debconf templates"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid ""
 "<literal>ddtp</literal>: translations of descriptions and debconf templates"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1210
+#: resources.dbk:1221

 msgid ""
 "<literal>derivatives</literal>: changes made on the package by derivative "
 "distributions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid ""
 "<literal>derivatives</literal>: changes made on the package by derivative "
 "distributions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1216
+#: resources.dbk:1227

 msgid ""
 "<literal>upload-source</literal>: announce of a new source upload that has "
 "been accepted"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid ""
 "<literal>upload-source</literal>: announce of a new source upload that has "
 "been accepted"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1222
+#: resources.dbk:1233

 msgid ""
 "<literal>upload-binary</literal>: announce of a new binary-only upload "
 "(porting)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid ""
 "<literal>upload-binary</literal>: announce of a new binary-only upload "
 "(porting)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1228
+#: resources.dbk:1239

 msgid ""
 "<literal>katie-other</literal>: other mails from ftpmasters (override "
 "disparity, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 msgid ""
 "<literal>katie-other</literal>: other mails from ftpmasters (override "
 "disparity, etc.)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>

-#: resources.dbk:1234
+#: resources.dbk:1245

 msgid ""
 "<literal>default</literal>: all the other mails (those which aren't "
 "automatic)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 msgid ""
 "<literal>default</literal>: all the other mails (those which aren't "
 "automatic)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1241
+#: resources.dbk:1252

 msgid "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1244
+#: resources.dbk:1255

 msgid ""
 "Same as the previous item but for the given source package, since you may "
 "select a different set of keywords for each source package."
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 msgid ""
 "Same as the previous item but for the given source package, since you may "
 "select a different set of keywords for each source package."
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1250
+#: resources.dbk:1261

 msgid ""
 "<literal>keyword [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</literal>"
 msgstr ""
 "<literal>keyword [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid ""
 "<literal>keyword [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</literal>"
 msgstr ""
 "<literal>keyword [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1253
+#: resources.dbk:1264

 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the default set of "
 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the default set of "


@@ -2063,7 +2153,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1260
+#: resources.dbk:1271

 msgid ""
 "<literal>keywordall [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</"
 "literal>"
 msgid ""
 "<literal>keywordall [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</"
 "literal>"


@@ -2072,7 +2162,7 @@ msgstr ""
 "literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 "literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1263
+#: resources.dbk:1274

 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the set of accepted "
 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the set of accepted "


@@ -2080,7 +2170,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1270
+#: resources.dbk:1281

 msgid ""
 "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;] {+|-|=} &lt;list of "
 "keywords&gt;</literal>"
 msgid ""
 "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;] {+|-|=} &lt;list of "
 "keywords&gt;</literal>"


@@ -2089,24 +2179,24 @@ msgstr ""
 "keywords&gt;</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 "keywords&gt;</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1273
+#: resources.dbk:1284

 msgid ""
 "Same as previous item but overrides the keywords list for the indicated "
 "source package."
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 msgid ""
 "Same as previous item but overrides the keywords list for the indicated "
 "source package."
 msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>

-#: resources.dbk:1279
+#: resources.dbk:1290

 msgid "<literal>quit | thanks | --</literal>"
 msgstr "<literal>quit | thanks | --</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 msgid "<literal>quit | thanks | --</literal>"
 msgstr "<literal>quit | thanks | --</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>

-#: resources.dbk:1282
+#: resources.dbk:1293

 msgid "Stops processing commands.  All following lines are ignored by the bot."
 msgid "Stops processing commands.  All following lines are ignored by the bot."

-msgstr ""
+msgstr "コマンド処理を終了します。これ以下の全ての行は bot からは無視されます。"

 
 # type: Content of: <chapter><section><section><para>
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1288
+#: resources.dbk:1299

 msgid ""
 "The <command>pts-subscribe</command> command-line utility (from the "
 "<systemitem role=\"package\">devscripts</systemitem> package) can be handy "
 msgid ""
 "The <command>pts-subscribe</command> command-line utility (from the "
 "<systemitem role=\"package\">devscripts</systemitem> package) can be handy "


@@ -2115,12 +2205,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:1296
+#: resources.dbk:1307

 msgid "Filtering PTS mails"
 msgstr "PTS からのメールを振り分ける"
 
 # type: Content of: <chapter><section><section><para>
 msgid "Filtering PTS mails"
 msgstr "PTS からのメールを振り分ける"
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1298
+#: resources.dbk:1309

 msgid ""
 "Once you are subscribed to a package, you will get the mails sent to "
 "<literal><replaceable>sourcepackage</replaceable>@&pts-host;</literal>.  "
 msgid ""
 "Once you are subscribed to a package, you will get the mails sent to "
 "<literal><replaceable>sourcepackage</replaceable>@&pts-host;</literal>.  "


@@ -2131,14 +2221,14 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1306
+#: resources.dbk:1317

 msgid ""
 "Here is an example of added headers for a source upload notification on the "
 "<systemitem role=\"package\">dpkg</systemitem> package:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgid ""
 "Here is an example of added headers for a source upload notification on the "
 "<systemitem role=\"package\">dpkg</systemitem> package:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

-#: resources.dbk:1309
+#: resources.dbk:1320

 #, no-wrap
 msgid ""
 "\n"
 #, no-wrap
 msgid ""
 "\n"


@@ -2154,12 +2244,12 @@ msgstr ""
 "List-Unsubscribe: &lt;mailto:pts@qa.debian.org?body=unsubscribe+dpkg&gt;\n"
 
 # type: Content of: <chapter><section><section><title>
 "List-Unsubscribe: &lt;mailto:pts@qa.debian.org?body=unsubscribe+dpkg&gt;\n"
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:1318
+#: resources.dbk:1329

 msgid "Forwarding VCS commits in the PTS"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "Forwarding VCS commits in the PTS"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1320
+#: resources.dbk:1331

 msgid ""
 "If you use a publicly accessible VCS repository for maintaining your Debian "
 "package, you may want to forward the commit notification to the PTS so that "
 msgid ""
 "If you use a publicly accessible VCS repository for maintaining your Debian "
 "package, you may want to forward the commit notification to the PTS so that "


@@ -2168,31 +2258,31 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1326
+#: resources.dbk:1337

 msgid ""
 "Once you set up the VCS repository to generate commit notifications, you "
 "just have to make sure it sends a copy of those mails to "
 "<literal><replaceable>sourcepackage</replaceable>_cvs@&pts-host;</literal>.  "
 msgid ""
 "Once you set up the VCS repository to generate commit notifications, you "
 "just have to make sure it sends a copy of those mails to "
 "<literal><replaceable>sourcepackage</replaceable>_cvs@&pts-host;</literal>.  "

-"Only the people who accept the <emphasis>cvs</emphasis> keyword will receive "
+"Only the people who accept the <literal>cvs</literal> keyword will receive "

 "these notifications. Note that the mail need to be sent from a "
 "<literal>debian.org</literal> machine, otherwise you'll have to add the "
 "<literal>X-PTS-Approved: 1</literal> header."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 "these notifications. Note that the mail need to be sent from a "
 "<literal>debian.org</literal> machine, otherwise you'll have to add the "
 "<literal>X-PTS-Approved: 1</literal> header."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1335
+#: resources.dbk:1346

 msgid ""
 "For Subversion repositories, the usage of svnmailer is recommended.  See "
 "<ulink url=\"&url-alioth-pkg;\" /> for an example on how to do it."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 msgid ""
 "For Subversion repositories, the usage of svnmailer is recommended.  See "
 "<ulink url=\"&url-alioth-pkg;\" /> for an example on how to do it."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:1341
+#: resources.dbk:1352

 msgid "The PTS web interface"
 msgstr "PTS ウェブインターフェイス"
 
 # type: Content of: <chapter><section><section><para>
 msgid "The PTS web interface"
 msgstr "PTS ウェブインターフェイス"
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1343
+#: resources.dbk:1354

 msgid ""
 "The PTS has a web interface at <ulink url=\"http://&pts-host;/\"></ulink> "
 "that puts together a lot of information about each source package.  It "
 msgid ""
 "The PTS has a web interface at <ulink url=\"http://&pts-host;/\"></ulink> "
 "that puts together a lot of information about each source package.  It "


@@ -2205,7 +2295,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1353
+#: resources.dbk:1364

 msgid ""
 "You can jump directly to the web page concerning a specific source package "
 "with a URL like <literal>http://&pts-host;/<replaceable>sourcepackage</"
 msgid ""
 "You can jump directly to the web page concerning a specific source package "
 "with a URL like <literal>http://&pts-host;/<replaceable>sourcepackage</"


@@ -2213,7 +2303,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1358
+#: resources.dbk:1369

 msgid ""
 "This web interface has been designed like a portal for the development of "
 "packages: you can add custom content on your packages' pages.  You can add "
 msgid ""
 "This web interface has been designed like a portal for the development of "
 "packages: you can add custom content on your packages' pages.  You can add "


@@ -2222,83 +2312,83 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1364
+#: resources.dbk:1375

 msgid "Static news items can be used to indicate:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Static news items can be used to indicate:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1369
+#: resources.dbk:1380

 msgid ""
 "the availability of a project hosted on <link linkend=\"alioth\">Alioth</"
 "link> for co-maintaining the package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "the availability of a project hosted on <link linkend=\"alioth\">Alioth</"
 "link> for co-maintaining the package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1375
+#: resources.dbk:1386

 msgid "a link to the upstream web site"
 msgstr "upstream のウェブサイトへのリンク"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "a link to the upstream web site"
 msgstr "upstream のウェブサイトへのリンク"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1380
+#: resources.dbk:1391

 msgid "a link to the upstream bug tracker"
 msgstr "upstream のバグ追跡システムへのリンク"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "a link to the upstream bug tracker"
 msgstr "upstream のバグ追跡システムへのリンク"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1385
+#: resources.dbk:1396

 #, fuzzy
 msgid "the existence of an IRC channel dedicated to the software"
 msgstr "ソフトウェア専用 IRC チャンネルの存在"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid "the existence of an IRC channel dedicated to the software"
 msgstr "ソフトウェア専用 IRC チャンネルの存在"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1390
+#: resources.dbk:1401

 msgid ""
 "any other available resource that could be useful in the maintenance of the "
 "package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid ""
 "any other available resource that could be useful in the maintenance of the "
 "package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1396
+#: resources.dbk:1407

 msgid "Usual news items may be used to announce that:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "Usual news items may be used to announce that:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1401
+#: resources.dbk:1412

 msgid "beta packages are available for testing"
 msgstr "テスト用にベータ版パッケージが準備できたこと"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "beta packages are available for testing"
 msgstr "テスト用にベータ版パッケージが準備できたこと"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1406
+#: resources.dbk:1417

 msgid "final packages are expected for next week"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "final packages are expected for next week"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1411
+#: resources.dbk:1422

 msgid "the packaging is about to be redone from scratch"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "the packaging is about to be redone from scratch"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1416
+#: resources.dbk:1427

 msgid "backports are available"
 msgstr "バックポート版が準備できたこと"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "backports are available"
 msgstr "バックポート版が準備できたこと"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1421
+#: resources.dbk:1432

 msgid ""
 "the maintainer is on vacation (if they wish to publish this information)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid ""
 "the maintainer is on vacation (if they wish to publish this information)"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1426
+#: resources.dbk:1437

 msgid "a NMU is being worked on"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 msgid "a NMU is being worked on"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>

-#: resources.dbk:1431
+#: resources.dbk:1442

 msgid "something important will affect the package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgid "something important will affect the package"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1436
+#: resources.dbk:1447

 msgid ""
 "Both kinds of news are generated in a similar manner: you just have to send "
 "an email either to <email>pts-static-news@qa.debian.org</email> or to "
 msgid ""
 "Both kinds of news are generated in a similar manner: you just have to send "
 "an email either to <email>pts-static-news@qa.debian.org</email> or to "


@@ -2312,7 +2402,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1447
+#: resources.dbk:1458

 msgid ""
 "Here are a few examples of valid mails used to generate news items in the "
 "PTS.  The first one adds a link to the cvsweb interface of debian-cd in the "
 msgid ""
 "Here are a few examples of valid mails used to generate news items in the "
 "PTS.  The first one adds a link to the cvsweb interface of debian-cd in the "


@@ -2320,7 +2410,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

-#: resources.dbk:1451
+#: resources.dbk:1462

 #, no-wrap
 msgid ""
 "\n"
 #, no-wrap
 msgid ""
 "\n"


@@ -2340,7 +2430,7 @@ msgstr ""
 "Url: http://svn.debian.org/viewsvn/debian-cd/trunk/\n"
 
 # type: Content of: <chapter><section><section><para>
 "Url: http://svn.debian.org/viewsvn/debian-cd/trunk/\n"
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1460
+#: resources.dbk:1471

 msgid ""
 "The second one is an announcement sent to a mailing list which is also sent "
 "to the PTS so that it is published on the PTS web page of the package.  Note "
 msgid ""
 "The second one is an announcement sent to a mailing list which is also sent "
 "to the PTS so that it is published on the PTS web page of the package.  Note "


@@ -2348,7 +2438,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>

-#: resources.dbk:1464
+#: resources.dbk:1475

 #, no-wrap
 msgid ""
 "\n"
 #, no-wrap
 msgid ""
 "\n"


@@ -2378,7 +2468,7 @@ msgstr ""
 "...\n"
 
 # type: Content of: <chapter><section><section><para>
 "...\n"
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1478
+#: resources.dbk:1489

 msgid ""
 "Think twice before adding a news item to the PTS because you won't be able "
 "to remove it later and you won't be able to edit it either.  The only thing "
 msgid ""
 "Think twice before adding a news item to the PTS because you won't be able "
 "to remove it later and you won't be able to edit it either.  The only thing "


@@ -2387,12 +2477,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: resources.dbk:1488
+#: resources.dbk:1499

 msgid "Developer's packages overview"
 msgstr "Developer's packages overview"
 
 # type: Content of: <chapter><section><para>
 msgid "Developer's packages overview"
 msgstr "Developer's packages overview"
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:1490
+#: resources.dbk:1501

 msgid ""
 "A QA (quality assurance) web portal is available at <ulink url=\"&url-ddpo;"
 "\"></ulink> which displays a table listing all the packages of a single "
 msgid ""
 "A QA (quality assurance) web portal is available at <ulink url=\"&url-ddpo;"
 "\"></ulink> which displays a table listing all the packages of a single "


@@ -2403,7 +2493,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:1499
+#: resources.dbk:1510

 msgid ""
 "It is a good idea to look up your own data regularly so that you don't "
 "forget any open bugs, and so that you don't forget which packages are your "
 msgid ""
 "It is a good idea to look up your own data regularly so that you don't "
 "forget any open bugs, and so that you don't forget which packages are your "


@@ -2411,12 +2501,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 msgstr ""
 
 # type: Content of: <chapter><section><title>

-#: resources.dbk:1506
+#: resources.dbk:1517

 msgid "Debian's GForge installation: Alioth"
 msgstr "Debian での GForge の導入例: Alioth"
 
 # type: Content of: <chapter><section><para>
 msgid "Debian's GForge installation: Alioth"
 msgstr "Debian での GForge の導入例: Alioth"
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:1508
+#: resources.dbk:1519

 msgid ""
 "Alioth is a Debian service based on a slightly modified version of the "
 "GForge software (which evolved from SourceForge). This software offers "
 msgid ""
 "Alioth is a Debian service based on a slightly modified version of the "
 "GForge software (which evolved from SourceForge). This software offers "


@@ -2426,7 +2516,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:1515
+#: resources.dbk:1526

 msgid ""
 "It is intended to provide facilities to free software projects backed or led "
 "by Debian, facilitate contributions from external developers to projects "
 msgid ""
 "It is intended to provide facilities to free software projects backed or led "
 "by Debian, facilitate contributions from external developers to projects "


@@ -2436,7 +2526,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:1522
+#: resources.dbk:1533

 msgid ""
 "All Debian developers automatically have an account on Alioth.  They can "
 "activate it by using the recover password facility.  External developers can "
 msgid ""
 "All Debian developers automatically have an account on Alioth.  They can "
 "activate it by using the recover password facility.  External developers can "


@@ -2444,44 +2534,42 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 msgstr ""
 
 # type: Content of: <chapter><section><para>

-#: resources.dbk:1527
+#: resources.dbk:1538

 msgid "For more information please visit the following links:"
 msgid "For more information please visit the following links:"

-msgstr ""
-"詳細な情報については、以下のリンクを参照下さい："
+msgstr "詳細な情報については、以下のリンクを参照下さい："

 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:1530
+#: resources.dbk:1541

 msgid "<ulink url=\"&url-alioth-wiki;\" />"
 msgstr "<ulink url=\"&url-alioth-wiki;\" />"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"&url-alioth-wiki;\" />"
 msgstr "<ulink url=\"&url-alioth-wiki;\" />"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:1531
+#: resources.dbk:1542

 msgid "<ulink url=\"&url-alioth-faq;\" />"
 msgstr "<ulink url=\"&url-alioth-faq;\" />"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"&url-alioth-faq;\" />"
 msgstr "<ulink url=\"&url-alioth-faq;\" />"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:1532
+#: resources.dbk:1543

 msgid "<ulink url=\"&url-alioth-pkg;\" />"
 msgstr "<ulink url=\"&url-alioth-pkg;\" />"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 msgid "<ulink url=\"&url-alioth-pkg;\" />"
 msgstr "<ulink url=\"&url-alioth-pkg;\" />"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>

-#: resources.dbk:1533
+#: resources.dbk:1544

 msgid "<ulink url=\"&url-alioth;\" />"
 msgstr "<ulink url=\"&url-alioth;\" />"
 
 # type: Content of: <chapter><section><title>
 msgid "<ulink url=\"&url-alioth;\" />"
 msgstr "<ulink url=\"&url-alioth;\" />"
 
 # type: Content of: <chapter><section><title>

-#: resources.dbk:1538
-#, fuzzy
+#: resources.dbk:1549

 msgid "Goodies for Developers"
 msgid "Goodies for Developers"

-msgstr "開発者への"
+msgstr "開発者への特典"

 
 # type: Content of: <chapter><section><section><title>
 
 # type: Content of: <chapter><section><section><title>

-#: resources.dbk:1540
+#: resources.dbk:1551

 msgid "LWN Subscriptions"
 msgstr "LWN の購読"
 
 # type: Content of: <chapter><section><section><para>
 msgid "LWN Subscriptions"
 msgstr "LWN の購読"
 
 # type: Content of: <chapter><section><section><para>

-#: resources.dbk:1542
+#: resources.dbk:1553

 #, fuzzy
 msgid ""
 "Since October of 2002, HP has sponsored a subscription to LWN for all "
 #, fuzzy
 msgid ""
 "Since October of 2002, HP has sponsored a subscription to LWN for all "


@@ -2491,4 +2579,3 @@ msgid ""
 msgstr ""
 "2002 年 10 月より、HP は LWN の購読権を興味のあるすべての Debian Developer に"
 "ついて"
 msgstr ""
 "2002 年 10 月より、HP は LWN の購読権を興味のあるすべての Debian Developer に"
 "ついて"

-

diff --git a/po4a/ja/scope.po b/po4a/ja/scope.po
index 431bd78de25564bd0c3ff9b9f37c879b4ad1662c..1b214e7e5a7326fca8f12acc63f2dea89a920006 100644 (file)
--- a/po4a/ja/scope.po
+++ b/po4a/ja/scope.po
@@ -1,6 +1,6 @@
 # Debian Developer's Reference (Japanese)
 # Debian Developer's Reference (Japanese)

-# 遠藤 美純, 1999
-# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2007.
+# (C) 遠藤 美純, 1999
+# (C) Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2007.

 # 
 msgid ""
 msgstr ""
 # 
 msgid ""
 msgstr ""

diff --git a/po4a/ja/tools.po b/po4a/ja/tools.po
index 3956dab8ec4660aa6a3e1bc609ada92d4090b91c..e8912143e95a181fbc7c314d647beb087b5df881 100644 (file)
--- a/po4a/ja/tools.po
+++ b/po4a/ja/tools.po
@@ -1,18 +1,16 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Debian Developer's Reference (Japanese)
+# (C) Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2008.

 #
 #

-#, fuzzy

 msgid ""
 msgstr ""
 msgid ""
 msgstr ""

-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-03-05 18:04+0900\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"
+"Project-Id-Version: developers-reference 3.4.1\n"
+"POT-Creation-Date: 2008-06-14 23:00+0900\n"
+"PO-Revision-Date: 2008-07-04 04:27+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Language-Team: Debian JP Project <debian-doc@debian.or.jp>\n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8bit\n"

 
 # type: Content of: <appendix><title>
 #: tools.dbk:7
 
 # type: Content of: <appendix><title>
 #: tools.dbk:7


@@ -158,10 +156,10 @@ msgstr ""
 #: tools.dbk:97
 msgid ""
 "You should periodically get the newest <systemitem role=\"package\">lintian</"
 #: tools.dbk:97
 msgid ""
 "You should periodically get the newest <systemitem role=\"package\">lintian</"

-"systemitem> from `unstable' and check over all your packages.  Notice that "
-"the <literal>-i</literal> option provides detailed explanations of what each "
-"error or warning means, what its basis in Policy is, and commonly how you "
-"can fix the problem."
+"systemitem> from <literal>unstable</literal> and check over all your "
+"packages.  Notice that the <literal>-i</literal> option provides detailed "
+"explanations of what each error or warning means, what its basis in Policy "
+"is, and commonly how you can fix the problem."

 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>


@@ -177,29 +175,16 @@ msgid ""
 "You can also see a summary of all problems reported by Lintian on your "
 "packages at <ulink url=\"&url-lintian;\"></ulink>.  These reports contain "
 "the latest <command>lintian</command> output for the whole development "
 "You can also see a summary of all problems reported by Lintian on your "
 "packages at <ulink url=\"&url-lintian;\"></ulink>.  These reports contain "
 "the latest <command>lintian</command> output for the whole development "

-"distribution (unstable)."
+"distribution (<literal>unstable</literal>)."

 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #: tools.dbk:116
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 #: tools.dbk:116

-msgid "<systemitem role=\"package\">linda</systemitem>"
-msgstr ""
-
-# type: Content of: <appendix><section><section><para>
-#: tools.dbk:118
-msgid ""
-"<systemitem role=\"package\">linda</systemitem> is another package linter.  "
-"It is similar to <systemitem role=\"package\">lintian</systemitem> but has a "
-"different set of checks.  Its written in Python rather than Perl."
-msgstr ""
-
-# type: Content of: <appendix><section><section><title>
-#: tools.dbk:125

 msgid "<systemitem role=\"package\">debdiff</systemitem>"
 msgid "<systemitem role=\"package\">debdiff</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">debdiff</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:127
+#: tools.dbk:118

 msgid ""
 "<command>debdiff</command> (from the <systemitem role=\"package"
 "\">devscripts</systemitem> package, <xref linkend=\"devscripts\"/> )  "
 msgid ""
 "<command>debdiff</command> (from the <systemitem role=\"package"
 "\">devscripts</systemitem> package, <xref linkend=\"devscripts\"/> )  "


@@ -211,25 +196,27 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:136
+#: tools.dbk:127

 msgid "You can run it over a pair of binary packages:"
 msgstr ""
 
 # type: Content of: <appendix><section><section><screen>
 msgid "You can run it over a pair of binary packages:"
 msgstr ""
 
 # type: Content of: <appendix><section><section><screen>

-#: tools.dbk:138
+#: tools.dbk:129

 #, no-wrap
 msgid ""
 "\n"
 "debdiff package_1-1_arch.deb package_2-1_arch.deb\n"
 msgstr ""
 #, no-wrap
 msgid ""
 "\n"
 "debdiff package_1-1_arch.deb package_2-1_arch.deb\n"
 msgstr ""

+"\n"
+"debdiff package_1-1_arch.deb package_2-1_arch.deb\n"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:142
+#: tools.dbk:133

 msgid "Or even a pair of changes files:"
 msgstr ""
 
 # type: Content of: <appendix><section><section><screen>
 msgid "Or even a pair of changes files:"
 msgstr ""
 
 # type: Content of: <appendix><section><section><screen>

-#: tools.dbk:144
+#: tools.dbk:135

 #, no-wrap
 msgid ""
 "\n"
 #, no-wrap
 msgid ""
 "\n"


@@ -237,19 +224,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:148
+#: tools.dbk:139

 msgid ""
 "For more information please see <citerefentry> <refentrytitle>debdiff</"
 "refentrytitle> <manvolnum>1</manvolnum> </citerefentry>."
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgid ""
 "For more information please see <citerefentry> <refentrytitle>debdiff</"
 "refentrytitle> <manvolnum>1</manvolnum> </citerefentry>."
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:157
+#: tools.dbk:148

 msgid "Helpers for <filename>debian/rules</filename>"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Helpers for <filename>debian/rules</filename>"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:159
+#: tools.dbk:150

 msgid ""
 "Package building tools make the process of writing <filename>debian/rules</"
 "filename> files easier.  See <xref linkend=\"helper-scripts\"/> for more "
 msgid ""
 "Package building tools make the process of writing <filename>debian/rules</"
 "filename> files easier.  See <xref linkend=\"helper-scripts\"/> for more "


@@ -257,12 +244,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:165
+#: tools.dbk:156

 msgid "<systemitem role=\"package\">debhelper</systemitem>"
 msgid "<systemitem role=\"package\">debhelper</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">debhelper</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:167
+#: tools.dbk:158

 msgid ""
 "<systemitem role=\"package\">debhelper</systemitem> is a collection of "
 "programs which can be used in <filename>debian/rules</filename> to automate "
 msgid ""
 "<systemitem role=\"package\">debhelper</systemitem> is a collection of "
 "programs which can be used in <filename>debian/rules</filename> to automate "


@@ -273,7 +260,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:175
+#: tools.dbk:166

 msgid ""
 "Unlike some approaches, <systemitem role=\"package\">debhelper</systemitem> "
 "is broken into several small, simple commands which act in a consistent "
 msgid ""
 "Unlike some approaches, <systemitem role=\"package\">debhelper</systemitem> "
 "is broken into several small, simple commands which act in a consistent "


@@ -282,7 +269,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:181
+#: tools.dbk:172

 msgid ""
 "There are a number of little <systemitem role=\"package\">debhelper</"
 "systemitem> add-on packages, too transient to document.  You can see the "
 msgid ""
 "There are a number of little <systemitem role=\"package\">debhelper</"
 "systemitem> add-on packages, too transient to document.  You can see the "


@@ -290,12 +277,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:188
+#: tools.dbk:179

 msgid "<systemitem role=\"package\">debmake</systemitem>"
 msgid "<systemitem role=\"package\">debmake</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">debmake</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:190
+#: tools.dbk:181

 msgid ""
 "<systemitem role=\"package\">debmake</systemitem>, a precursor to "
 "<systemitem role=\"package\">debhelper</systemitem>, is a more coarse-"
 msgid ""
 "<systemitem role=\"package\">debmake</systemitem>, a precursor to "
 "<systemitem role=\"package\">debhelper</systemitem>, is a more coarse-"


@@ -308,7 +295,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:200
+#: tools.dbk:191

 msgid ""
 "The consensus is that <systemitem role=\"package\">debmake</systemitem> is "
 "now deprecated in favor of <systemitem role=\"package\">debhelper</"
 msgid ""
 "The consensus is that <systemitem role=\"package\">debmake</systemitem> is "
 "now deprecated in favor of <systemitem role=\"package\">debhelper</"


@@ -318,12 +305,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:209
+#: tools.dbk:200

 msgid "<systemitem role=\"package\">dh-make</systemitem>"
 msgid "<systemitem role=\"package\">dh-make</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">dh-make</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:211
+#: tools.dbk:202

 msgid ""
 "The <systemitem role=\"package\">dh-make</systemitem> package contains "
 "<command>dh_make</command>, a program that creates a skeleton of files "
 msgid ""
 "The <systemitem role=\"package\">dh-make</systemitem> package contains "
 "<command>dh_make</command>, a program that creates a skeleton of files "


@@ -334,7 +321,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:219
+#: tools.dbk:210

 msgid ""
 "While the rules files generated by <command>dh_make</command> are in general "
 "a sufficient basis for a working package, they are still just the "
 msgid ""
 "While the rules files generated by <command>dh_make</command> are in general "
 "a sufficient basis for a working package, they are still just the "


@@ -344,12 +331,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:227
+#: tools.dbk:218

 msgid "<systemitem role=\"package\">yada</systemitem>"
 msgid "<systemitem role=\"package\">yada</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">yada</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:229
+#: tools.dbk:220

 msgid ""
 "<systemitem role=\"package\">yada</systemitem> is another packaging helper "
 "tool.  It uses a <filename>debian/packages</filename> file to auto-generate "
 msgid ""
 "<systemitem role=\"package\">yada</systemitem> is another packaging helper "
 "tool.  It uses a <filename>debian/packages</filename> file to auto-generate "


@@ -362,19 +349,19 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:239
+#: tools.dbk:230

 msgid ""
 "For more informations see <literal><ulink url=\"http://yada.alioth.debian."
 "org/\">YADA site</ulink></literal>."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgid ""
 "For more informations see <literal><ulink url=\"http://yada.alioth.debian."
 "org/\">YADA site</ulink></literal>."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:245
+#: tools.dbk:236

 msgid "<systemitem role=\"package\">equivs</systemitem>"
 msgid "<systemitem role=\"package\">equivs</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">equivs</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:247
+#: tools.dbk:238

 msgid ""
 "<systemitem role=\"package\">equivs</systemitem> is another package for "
 "making packages.  It is often suggested for local use if you need to make a "
 msgid ""
 "<systemitem role=\"package\">equivs</systemitem> is another package for "
 "making packages.  It is often suggested for local use if you need to make a "


@@ -384,12 +371,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:258
+#: tools.dbk:249

 msgid "Package builders"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Package builders"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:260
+#: tools.dbk:251

 msgid ""
 "The following packages help with the package building process, general "
 "driving <command>dpkg-buildpackage</command> as well as handling supporting "
 msgid ""
 "The following packages help with the package building process, general "
 "driving <command>dpkg-buildpackage</command> as well as handling supporting "


@@ -397,12 +384,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:264
+#: tools.dbk:255

 msgid "<systemitem role=\"package\">cvs-buildpackage</systemitem>"
 msgid "<systemitem role=\"package\">cvs-buildpackage</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">cvs-buildpackage</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:266
+#: tools.dbk:257

 msgid ""
 "<systemitem role=\"package\">cvs-buildpackage</systemitem> provides the "
 "capability to inject or import Debian source packages into a CVS repository, "
 msgid ""
 "<systemitem role=\"package\">cvs-buildpackage</systemitem> provides the "
 "capability to inject or import Debian source packages into a CVS repository, "


@@ -411,22 +398,22 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:272
+#: tools.dbk:263

 msgid ""
 "These utilities provide an infrastructure to facilitate the use of CVS by "
 "Debian maintainers.  This allows one to keep separate CVS branches of a "
 msgid ""
 "These utilities provide an infrastructure to facilitate the use of CVS by "
 "Debian maintainers.  This allows one to keep separate CVS branches of a "

-"package for <emphasis>stable</emphasis>, <emphasis>unstable</emphasis> and "
-"possibly <emphasis>experimental</emphasis> distributions, along with the "
-"other benefits of a version control system."
+"package for <literal>stable</literal>, <literal>unstable</literal> and "
+"possibly <literal>experimental</literal> distributions, along with the other "
+"benefits of a version control system."

 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:281
+#: tools.dbk:272

 msgid "<systemitem role=\"package\">debootstrap</systemitem>"
 msgid "<systemitem role=\"package\">debootstrap</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">debootstrap</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:283
+#: tools.dbk:274

 msgid ""
 "The <systemitem role=\"package\">debootstrap</systemitem> package and script "
 "allows you to bootstrap a Debian base system into any part of your "
 msgid ""
 "The <systemitem role=\"package\">debootstrap</systemitem> package and script "
 "allows you to bootstrap a Debian base system into any part of your "


@@ -435,7 +422,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:289
+#: tools.dbk:280

 msgid ""
 "Having a system like this can be useful in many ways.  For instance, you can "
 "<command>chroot</command> into it if you want to test your build "
 msgid ""
 "Having a system like this can be useful in many ways.  For instance, you can "
 "<command>chroot</command> into it if you want to test your build "


@@ -444,12 +431,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:297
+#: tools.dbk:288

 msgid "<systemitem role=\"package\">pbuilder</systemitem>"
 msgid "<systemitem role=\"package\">pbuilder</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">pbuilder</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:299
+#: tools.dbk:290

 msgid ""
 "<systemitem role=\"package\">pbuilder</systemitem> constructs a chrooted "
 "system, and builds a package inside the chroot.  It is very useful to check "
 msgid ""
 "<systemitem role=\"package\">pbuilder</systemitem> constructs a chrooted "
 "system, and builds a package inside the chroot.  It is very useful to check "


@@ -459,7 +446,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:305
+#: tools.dbk:296

 msgid ""
 "A related package is <systemitem role=\"package\">pbuilder-uml</systemitem>, "
 "which goes even further by doing the build within a User Mode Linux "
 msgid ""
 "A related package is <systemitem role=\"package\">pbuilder-uml</systemitem>, "
 "which goes even further by doing the build within a User Mode Linux "


@@ -467,41 +454,41 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:312
+#: tools.dbk:303

 msgid "<systemitem role=\"package\">sbuild</systemitem>"
 msgid "<systemitem role=\"package\">sbuild</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">sbuild</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:314
+#: tools.dbk:305

 msgid ""
 "<systemitem role=\"package\">sbuild</systemitem> is another automated "
 "builder.  It can use chrooted environments as well.  It can be used stand-"
 "alone, or as part of a networked, distributed build environment.  As the "
 "latter, it is part of the system used by porters to build binary packages "
 msgid ""
 "<systemitem role=\"package\">sbuild</systemitem> is another automated "
 "builder.  It can use chrooted environments as well.  It can be used stand-"
 "alone, or as part of a networked, distributed build environment.  As the "
 "latter, it is part of the system used by porters to build binary packages "

-"for all the available architectures.  See <xref linkend=\"buildd\"/> for "
-"more information, and <ulink url=\"&url-buildd;\"></ulink> to see the system "
-"in action."
+"for all the available architectures.  See <xref linkend=\"wanna-build\"/> "
+"for more information, and <ulink url=\"&url-buildd;\"></ulink> to see the "
+"system in action."

 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:326
+#: tools.dbk:317

 msgid "Package uploaders"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Package uploaders"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:328
+#: tools.dbk:319

 msgid ""
 "The following packages help automate or simplify the process of uploading "
 "packages into the official archive."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgid ""
 "The following packages help automate or simplify the process of uploading "
 "packages into the official archive."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:332
+#: tools.dbk:323

 msgid "<systemitem role=\"package\">dupload</systemitem>"
 msgid "<systemitem role=\"package\">dupload</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">dupload</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:334
+#: tools.dbk:325

 msgid ""
 "<systemitem role=\"package\">dupload</systemitem> is a package and a script "
 "to automatically upload Debian packages to the Debian archive, to log the "
 msgid ""
 "<systemitem role=\"package\">dupload</systemitem> is a package and a script "
 "to automatically upload Debian packages to the Debian archive, to log the "


@@ -510,12 +497,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:342
+#: tools.dbk:333

 msgid "<systemitem role=\"package\">dput</systemitem>"
 msgid "<systemitem role=\"package\">dput</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">dput</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:344
+#: tools.dbk:335

 msgid ""
 "The <systemitem role=\"package\">dput</systemitem> package and script does "
 "much the same thing as <systemitem role=\"package\">dupload</systemitem>, "
 msgid ""
 "The <systemitem role=\"package\">dput</systemitem> package and script does "
 "much the same thing as <systemitem role=\"package\">dupload</systemitem>, "


@@ -526,12 +513,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:354
+#: tools.dbk:345

 msgid "<systemitem role=\"package\">dcut</systemitem>"
 msgid "<systemitem role=\"package\">dcut</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">dcut</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:356
+#: tools.dbk:347

 msgid ""
 "The <systemitem role=\"package\">dcut</systemitem> script (part of the "
 "package <xref linkend=\"dput\"/> ) helps in removing files from the ftp "
 msgid ""
 "The <systemitem role=\"package\">dcut</systemitem> script (part of the "
 "package <xref linkend=\"dput\"/> ) helps in removing files from the ftp "


@@ -539,12 +526,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:364
+#: tools.dbk:355

 msgid "Maintenance automation"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Maintenance automation"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:366
+#: tools.dbk:357

 msgid ""
 "The following tools help automate different maintenance tasks, from adding "
 "changelog entries or signature lines and looking up bugs in Emacs to making "
 msgid ""
 "The following tools help automate different maintenance tasks, from adding "
 "changelog entries or signature lines and looking up bugs in Emacs to making "


@@ -552,12 +539,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:371
+#: tools.dbk:362

 msgid "<systemitem role=\"package\">devscripts</systemitem>"
 msgid "<systemitem role=\"package\">devscripts</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">devscripts</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:373
+#: tools.dbk:364

 msgid ""
 "<systemitem role=\"package\">devscripts</systemitem> is a package containing "
 "wrappers and tools which are very helpful for maintaining your Debian "
 msgid ""
 "<systemitem role=\"package\">devscripts</systemitem> is a package containing "
 "wrappers and tools which are very helpful for maintaining your Debian "


@@ -573,7 +560,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:387
+#: tools.dbk:378

 msgid ""
 "See the <citerefentry> <refentrytitle>devscripts</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> manual page for a complete list of "
 msgid ""
 "See the <citerefentry> <refentrytitle>devscripts</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> manual page for a complete list of "


@@ -581,12 +568,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:394
+#: tools.dbk:385

 msgid "<systemitem role=\"package\">autotools-dev</systemitem>"
 msgid "<systemitem role=\"package\">autotools-dev</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">autotools-dev</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:396
+#: tools.dbk:387

 msgid ""
 "<systemitem role=\"package\">autotools-dev</systemitem> contains best "
 "practices for people who maintain packages which use <command>autoconf</"
 msgid ""
 "<systemitem role=\"package\">autotools-dev</systemitem> contains best "
 "practices for people who maintain packages which use <command>autoconf</"


@@ -596,12 +583,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:405
+#: tools.dbk:396

 msgid "<systemitem role=\"package\">dpkg-repack</systemitem>"
 msgid "<systemitem role=\"package\">dpkg-repack</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">dpkg-repack</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:407
+#: tools.dbk:398

 msgid ""
 "<command>dpkg-repack</command> creates Debian package file out of a package "
 "that has already been installed.  If any changes have been made to the "
 msgid ""
 "<command>dpkg-repack</command> creates Debian package file out of a package "
 "that has already been installed.  If any changes have been made to the "


@@ -610,7 +597,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:413
+#: tools.dbk:404

 msgid ""
 "This utility can make it easy to copy packages from one computer to another, "
 "or to recreate packages which are installed on your system but no longer "
 msgid ""
 "This utility can make it easy to copy packages from one computer to another, "
 "or to recreate packages which are installed on your system but no longer "


@@ -619,12 +606,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:420
+#: tools.dbk:411

 msgid "<systemitem role=\"package\">alien</systemitem>"
 msgid "<systemitem role=\"package\">alien</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">alien</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:422
+#: tools.dbk:413

 msgid ""
 "<command>alien</command> converts binary packages between various packaging "
 "formats, including Debian, RPM (RedHat), LSB (Linux Standard Base), Solaris, "
 msgid ""
 "<command>alien</command> converts binary packages between various packaging "
 "formats, including Debian, RPM (RedHat), LSB (Linux Standard Base), Solaris, "


@@ -632,12 +619,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:429
+#: tools.dbk:420

 msgid "<systemitem role=\"package\">debsums</systemitem>"
 msgid "<systemitem role=\"package\">debsums</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">debsums</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:431
+#: tools.dbk:422

 msgid ""
 "<command>debsums</command> checks installed packages against their MD5 "
 "sums.  Note that not all packages have MD5 sums, since they aren't required "
 msgid ""
 "<command>debsums</command> checks installed packages against their MD5 "
 "sums.  Note that not all packages have MD5 sums, since they aren't required "


@@ -645,12 +632,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:437
+#: tools.dbk:428

 msgid "<systemitem role=\"package\">dpkg-dev-el</systemitem>"
 msgid "<systemitem role=\"package\">dpkg-dev-el</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">dpkg-dev-el</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:439
+#: tools.dbk:430

 msgid ""
 "<systemitem role=\"package\">dpkg-dev-el</systemitem> is an Emacs lisp "
 "package which provides assistance when editing some of the files in the "
 msgid ""
 "<systemitem role=\"package\">dpkg-dev-el</systemitem> is an Emacs lisp "
 "package which provides assistance when editing some of the files in the "


@@ -660,12 +647,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:448
+#: tools.dbk:439

 msgid "<systemitem role=\"package\">dpkg-depcheck</systemitem>"
 msgid "<systemitem role=\"package\">dpkg-depcheck</systemitem>"

-msgstr ""
+msgstr "<systemitem role=\"package\">dpkg-depcheck</systemitem>"

 
 # type: Content of: <appendix><section><section><para>
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:450
+#: tools.dbk:441

 msgid ""
 "<command>dpkg-depcheck</command> (from the <systemitem role=\"package"
 "\">devscripts</systemitem> package, <xref linkend=\"devscripts\"/> )  runs a "
 msgid ""
 "<command>dpkg-depcheck</command> (from the <systemitem role=\"package"
 "\">devscripts</systemitem> package, <xref linkend=\"devscripts\"/> )  runs a "


@@ -674,7 +661,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:456
+#: tools.dbk:447

 msgid ""
 "For Debian packages, this is useful when you have to compose a "
 "<literal>Build-Depends</literal> line for your new package: running the "
 msgid ""
 "For Debian packages, this is useful when you have to compose a "
 "<literal>Build-Depends</literal> line for your new package: running the "


@@ -683,7 +670,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><screen>
 msgstr ""
 
 # type: Content of: <appendix><section><section><screen>

-#: tools.dbk:461
+#: tools.dbk:452

 #, no-wrap
 msgid ""
 "\n"
 #, no-wrap
 msgid ""
 "\n"


@@ -691,51 +678,50 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:465
+#: tools.dbk:456

 msgid ""
 "<command>dpkg-depcheck</command> can also be used to check for run-time "
 "dependencies, especially if your package uses exec(2) to run other programs."
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid ""
 "<command>dpkg-depcheck</command> can also be used to check for run-time "
 "dependencies, especially if your package uses exec(2) to run other programs."
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:469
+#: tools.dbk:460

 msgid ""
 "For more information please see <citerefentry> <refentrytitle>dpkg-depcheck</"
 "refentrytitle> <manvolnum>1</manvolnum> </citerefentry>."
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgid ""
 "For more information please see <citerefentry> <refentrytitle>dpkg-depcheck</"
 "refentrytitle> <manvolnum>1</manvolnum> </citerefentry>."
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:478
+#: tools.dbk:469

 msgid "Porting tools"
 msgstr "移植用ツール"
 
 # type: Content of: <appendix><section><para>
 msgid "Porting tools"
 msgstr "移植用ツール"
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:480
+#: tools.dbk:471

 msgid "The following tools are helpful for porters and for cross-compilation."
 msgstr "以下のツールが、移植作業者がクロスコンパイルをする際に役立ちます。"
 
 # type: Content of: <appendix><section><section><title>
 msgid "The following tools are helpful for porters and for cross-compilation."
 msgstr "以下のツールが、移植作業者がクロスコンパイルをする際に役立ちます。"
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:483
+#: tools.dbk:474

 msgid "<systemitem role=\"package\">quinn-diff</systemitem>"
 msgstr "<systemitem role=\"package\">quinn-diff</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">quinn-diff</systemitem>"
 msgstr "<systemitem role=\"package\">quinn-diff</systemitem>"
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:485
+#: tools.dbk:476

 msgid ""
 "<systemitem role=\"package\">quinn-diff</systemitem> is used to locate the "
 "differences from one architecture to another.  For instance, it could tell "
 "you which packages need to be ported for architecture <replaceable>Y</"
 "replaceable>, based on architecture <replaceable>X</replaceable>."
 msgstr ""
 msgid ""
 "<systemitem role=\"package\">quinn-diff</systemitem> is used to locate the "
 "differences from one architecture to another.  For instance, it could tell "
 "you which packages need to be ported for architecture <replaceable>Y</"
 "replaceable>, based on architecture <replaceable>X</replaceable>."
 msgstr ""

-""

 
 # type: Content of: <appendix><section><section><title>
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:493
+#: tools.dbk:484

 msgid "<systemitem role=\"package\">dpkg-cross</systemitem>"
 msgstr "<systemitem role=\"package\">dpkg-cross</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">dpkg-cross</systemitem>"
 msgstr "<systemitem role=\"package\">dpkg-cross</systemitem>"
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:495
+#: tools.dbk:486

 msgid ""
 "<systemitem role=\"package\">dpkg-cross</systemitem> is a tool for "
 "installing libraries and headers for cross-compiling in a way similar to "
 msgid ""
 "<systemitem role=\"package\">dpkg-cross</systemitem> is a tool for "
 "installing libraries and headers for cross-compiling in a way similar to "


@@ -745,24 +731,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><title>
 msgstr ""
 
 # type: Content of: <appendix><section><title>

-#: tools.dbk:506
+#: tools.dbk:497

 msgid "Documentation and information"
 msgstr ""
 
 # type: Content of: <appendix><section><para>
 msgid "Documentation and information"
 msgstr ""
 
 # type: Content of: <appendix><section><para>

-#: tools.dbk:508
+#: tools.dbk:499

 msgid ""
 "The following packages provide information for maintainers or help with "
 "building documentation."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgid ""
 "The following packages provide information for maintainers or help with "
 "building documentation."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:512
+#: tools.dbk:503

 msgid "<systemitem role=\"package\">debiandoc-sgml</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">debiandoc-sgml</systemitem>"
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:514
+#: tools.dbk:505

 msgid ""
 "<systemitem role=\"package\">debiandoc-sgml</systemitem> provides the "
 "DebianDoc SGML DTD, which is commonly used for Debian documentation.  This "
 msgid ""
 "<systemitem role=\"package\">debiandoc-sgml</systemitem> provides the "
 "DebianDoc SGML DTD, which is commonly used for Debian documentation.  This "


@@ -771,31 +757,43 @@ msgid ""
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>
 msgstr ""
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:520
+#: tools.dbk:511

 msgid ""
 "Documentation for the DTD can be found in the <systemitem role=\"package"
 "\">debiandoc-sgml-doc</systemitem> package."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgid ""
 "Documentation for the DTD can be found in the <systemitem role=\"package"
 "\">debiandoc-sgml-doc</systemitem> package."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:542
+#: tools.dbk:533

 msgid "<systemitem role=\"package\">debian-keyring</systemitem>"
 msgstr "<systemitem role=\"package\">debian-keyring</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">debian-keyring</systemitem>"
 msgstr "<systemitem role=\"package\">debian-keyring</systemitem>"
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:544
+#: tools.dbk:535

 msgid ""
 "Contains the public GPG and PGP keys of Debian developers.  See <xref "
 "linkend=\"key-maint\"/> and the package documentation for more information."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>
 msgid ""
 "Contains the public GPG and PGP keys of Debian developers.  See <xref "
 "linkend=\"key-maint\"/> and the package documentation for more information."
 msgstr ""
 
 # type: Content of: <appendix><section><section><title>

-#: tools.dbk:550
+#: tools.dbk:541
+msgid "<systemitem role=\"package\">debian-maintainers</systemitem>"
+msgstr "<systemitem role=\"package\">debian-maintainers</systemitem>"
+
+# type: Content of: <appendix><section><section><para>
+#: tools.dbk:543
+msgid ""
+"Contains the public GPG keys of Debian Maintainers.  See <ulink url=\"&url-"
+"wiki-dm;\"></ulink> for more information."
+msgstr ""
+
+# type: Content of: <appendix><section><section><title>
+#: tools.dbk:549

 msgid "<systemitem role=\"package\">debview</systemitem>"
 msgstr "<systemitem role=\"package\">debview</systemitem>"
 
 # type: Content of: <appendix><section><section><para>
 msgid "<systemitem role=\"package\">debview</systemitem>"
 msgstr "<systemitem role=\"package\">debview</systemitem>"
 
 # type: Content of: <appendix><section><section><para>

-#: tools.dbk:552
+#: tools.dbk:551

 msgid ""
 "<systemitem role=\"package\">debview</systemitem> provides an Emacs mode for "
 "viewing Debian binary packages.  This lets you examine a package without "
 msgid ""
 "<systemitem role=\"package\">debview</systemitem> provides an Emacs mode for "
 "viewing Debian binary packages.  This lets you examine a package without "