POT and PO update (planned with Hideki).

[developers-reference.git] / po4a / ja / pkgs.po

diff --git a/po4a/ja/pkgs.po b/po4a/ja/pkgs.po
index 9d17b7c428d272ef66644af75f2b3e6f5cac0052..af33086e637e53da087c79e5e88f1ed78ddc8caf 100644 (file)
--- a/po4a/ja/pkgs.po
+++ b/po4a/ja/pkgs.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: developers-reference 3.4.4\n"
-"POT-Creation-Date: 2010-01-04 00:17+0100\n"
+"POT-Creation-Date: 2010-06-20 09:23-0400\n"
 "PO-Revision-Date: 2010-01-05 18: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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,7 +59,7 @@ msgstr ""
 #: pkgs.dbk:23
 msgid ""
 "Assuming no one else is already working on your prospective package, you "
-"must then submit a bug report (<xref linkend=\"submit-bug\"/> ) against the "
+"must then submit a bug report (<xref linkend=\"submit-bug\"/>) against the "
 "pseudo-package <systemitem role=\"package\">wnpp</systemitem> describing "
 "your plan to create a new package, including, but not limiting yourself to, "
 "a description of the package, the license of the prospective package, and "
@@ -74,6 +75,7 @@ msgstr ""
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 #: pkgs.dbk:31
+#, fuzzy
 msgid ""
 "You should set the subject of the bug to <literal>ITP: <replaceable>foo</"
 "replaceable> -- <replaceable>short description</replaceable></literal>, "
@@ -82,8 +84,8 @@ msgid ""
 "<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 "
+"packages (>10)  that notifying the mailing list in separate messages is too "
+"disruptive, 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 ""
@@ -102,105 +104,116 @@ msgstr ""
 #. type: Content of: <chapter><section><para>
 #: pkgs.dbk:45
 msgid ""
-"Please include a <literal>Closes: bug#<replaceable>nnnnn</replaceable></"
+"Please include a <literal>Closes: #<replaceable>nnnnn</replaceable></"
 "literal> entry in the changelog of the new package in order for the bug "
 "report to be automatically closed once the new package is installed in the "
-"archive (see <xref linkend=\"upload-bugfix\"/> )."
+"archive (see <xref linkend=\"upload-bugfix\"/>)."
 msgstr ""
 "新規パッケージがアーカイブへインストールされる際にバグ報告を自動的に閉じるた"
-"め、<literal>Closes: bug#<replaceable>nnnnn</replaceable></literal> というエ"
-"ã\83³ã\83\88ã\83ªã\82\92æ\96°è¦\8fã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81® changelog å\86\85ã\81«å\90«ã\82\81ã\81¦ã\81\8fã\81 ã\81\95ã\81\84 (<xref linkend="
-"\"upload-bugfix\"/> を参照)。"
+"め、<literal>Closes: #<replaceable>nnnnn</replaceable></literal> というエント"
+"ã\83ªã\82\92æ\96°è¦\8fã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81® changelog å\86\85ã\81«å\90«ã\82\81ã\81¦ã\81\8fã\81 ã\81\95ã\81\84 (<xref linkend=\"upload-"
+"bugfix\"/> を参照)。"
 
+# FIXME: ftpmaster@debian.org
 #. type: Content of: <chapter><section><para>
 #: pkgs.dbk:51
 msgid ""
 "If you think your package needs some explanations for the administrators of "
-"the NEW package queue, include them in your changelog, send to "
-"ftpmaster@debian.org a reply to the email you receive as a maintainer after "
-"your upload, or reply to the rejection email in case you are already re-"
-"uploading."
+"the NEW package queue, include them in your changelog, send to &email-"
+"ftpmaster; a reply to the email you receive as a maintainer after your "
+"upload, or reply to the rejection email in case you are already re-uploading."
 msgstr ""
 "パッケージについて、NEW パッケージキューの管理者への説明が必要だろうと思う場"
 "合は、アップロード後にメンテナとして受け取るメールへの返信、あるいは既に再"
 "アップロードという場合は reject のメールに対しての返信として、説明を "
-"changelog に含めて ftpmaster@debian.org へ送ってください。"
+"changelog に含めて &email-ftpmaster; へ送ってください。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 #: pkgs.dbk:57
 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 "
-"an upload is made to fix the bug before the advisory ID is known, it is "
-"encouraged to modify the historical changelog entry with the next upload.  "
-"Even in this case, please include all available pointers to background "
-"information in the original changelog entry."
-msgstr ""
-"セキュリティバグを閉じる場合は、CVE 番号を Closes: #nnnnnn と同じように含める"
-"ようにしてください。これは、セキュリティチームが脆弱性を追跡するのに役立ちま"
-"す。アドバイザリの ID が分かる前にバグ修正のためのアップロードが行われた場合"
-"は、以前の changelog エントリを次のアップロード時に修正するのが推奨されていま"
-"す。このような場合でも、元々の changelog での記載に、可能な限り背景情報へのポ"
-"インタを全て含めてください。"
+"When closing security bugs include CVE numbers as well as the "
+"<literal>Closes: #<replaceable>nnnnn</replaceable></literal>.  This is "
+"useful for the security team to track vulnerabilities.  If an upload is made "
+"to fix the bug before the advisory ID is known, it is encouraged to modify "
+"the historical changelog entry with the next upload.  Even in this case, "
+"please include all available pointers to background information in the "
+"original changelog entry."
+msgstr ""
+"セキュリティバグを閉じる場合は、CVE 番号を <literal>Closes: "
+"#<replaceable>nnnnn</replaceable></literal> と同じく含めるようにしてくださ"
+"い。これは、セキュリティチームが脆弱性を追跡するのに役立ちます。アドバイザリ"
+"の ID が分かる前にバグ修正のためのアップロードが行われた場合は、以前の "
+"changelog エントリを次のアップロード時に修正するのが推奨されています。このよ"
+"うな場合でも、元々の changelog での記載に、可能な限り背景情報へのポインタを全"
+"て含めてください。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:65
-#, fuzzy
+#: pkgs.dbk:66
 msgid ""
 "There are a number of reasons why we ask maintainers to announce their "
 "intentions:"
 msgstr ""
-"我々がメンテナに意図をアナウンスする様に求めるのには、いくつもの理由がありま"
-"す。"
+"我々がメンテナにその意図をアナウンスする様に求めるのには、いくつもの理由があ"
+"ã\82\8aã\81¾ã\81\99ã\80\82"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:71
-#, fuzzy
+#: pkgs.dbk:72
 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 "
 "already."
-msgstr "(潜在的な新たな) メンテナ"
+msgstr ""
+"(潜在的な新たな) メンテナが、メーリングリストの人々の経験を活かすのを手助け"
+"し、もし他の誰かが既に作業を行っていた場合に知らせる。"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:77
+#: pkgs.dbk:78
 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>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:83
+#: pkgs.dbk:84
 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 &email-debian-devel-changes;."
 msgstr ""
+"&email-debian-devel-changes; に流される一行の説明文 (description) と通常どお"
+"りの「Intial release」という changelog エントリよりも、残った他のメンテナが"
+"パッケージに関してより深く知ることができる。"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:90
+#: pkgs.dbk:91
 msgid ""
 "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 ""
+"<literal>不安定版 (unstable)</literal> で暮らす人 (そして最前線のテスターであ"
+"る人) の助けになる。"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:96
+#: pkgs.dbk:97
 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>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:102
+#: pkgs.dbk:103
 msgid ""
 "Please see <ulink url=\"http://&ftp-master-host;/REJECT-FAQ.html\"></ulink> "
 "for common rejection reasons for a new package."
@@ -210,13 +223,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: pkgs.dbk:108
+#: pkgs.dbk:109
 msgid "Recording changes in the package"
 msgstr "パッケージの変更を記録する"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:110
+#: pkgs.dbk:111
 msgid ""
 "Changes that you make to the package need to be recorded in the "
 "<filename>debian/changelog</filename>.  These changes should provide a "
@@ -227,25 +240,35 @@ msgid ""
 "<filename>/usr/share/doc/<replaceable>package</replaceable>/changelog.gz</"
 "filename> for native packages."
 msgstr ""
+"パッケージについて行った変更は <filename>debian/changelog</filename> に記録さ"
+"れる必要があります。これらの変更には、何が変更されたのか、(疑問であれば) 何故"
+"なのか、そしてどのバグが完了されたのかの簡潔な説明文を付加する必要がありま"
+"す。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:121
+#: pkgs.dbk:122
+#, fuzzy
 msgid ""
 "The <filename>debian/changelog</filename> file conforms to a certain "
 "structure, with a number of different fields.  One field of note, the "
 "<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>."
+"\"/>.  More information about the structure of this file can be found in the "
+"Debian Policy section titled <filename>debian/changelog</filename>."
 msgstr ""
+"<filename>debian/changelog</filename> ファイルは、幾つもの異なった項目からな"
+"る特定の構造に従っています。文書のとある項目、<literal>distribution</"
+"literal> については<xref linkend=\"distribution\"/>に記述されています。この"
+"ファイルの構造について、より詳細な情報は Debian ポリシーの <filename>debian/"
+"changelog</filename> という章で確認できます。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:129
+#: pkgs.dbk:130
 msgid ""
 "Changelog entries can be used to automatically close Debian bugs when the "
 "package is installed into the archive.  See <xref linkend=\"upload-bugfix\"/"
-"> ."
+">."
 msgstr ""
 "changelog への記載は、パッケージがアーカイブにインストールされる際、自動的に "
 "Debian バグを閉じるのに利用できます。<xref linkend=\"upload-bugfix\"/> を参照"
@@ -253,47 +276,49 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:133
+#: pkgs.dbk:134
 msgid ""
 "It is conventional that the changelog entry of a package that contains a new "
 "upstream version of the software looks like this:"
 msgstr ""
+"ソフトウェアの新しい開発元のバージョン (new upstream version) を含むパッケー"
+"ジの changelog エントリは、以下のようにするのが慣習です:"
 
 # type: Content of: <chapter><section><screen>
 #. type: Content of: <chapter><section><screen>
-#: pkgs.dbk:137
+#: pkgs.dbk:138
 #, no-wrap
-msgid "  * new upstream version\n"
-msgstr "  * new upstream version\n"
+msgid "  * New upstream release.\n"
+msgstr "  * New upstream release.\n"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:140
-#, fuzzy
+#: pkgs.dbk:141
 msgid ""
 "There are tools to help you create entries and finalize the "
 "<filename>changelog</filename> for release — see <xref linkend=\"devscripts"
-"\"/> and <xref linkend=\"dpkg-dev-el\"/> ."
+"\"/> and <xref linkend=\"dpkg-dev-el\"/>."
 msgstr ""
-"<filename>changelog</filename> <xref linkend=\"devscripts\"/> と <xref "
-"linkend=\"dpkg-dev-el\"/> を参照してください。"
+"<filename>changelog</filename> エントリの作成と仕上げ処理に使えるツールがあり"
+"ます。<xref linkend=\"devscripts\"/> と <xref linkend=\"dpkg-dev-el\"/> を参"
+"照してください。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:145
-msgid "See also <xref linkend=\"bpp-debian-changelog\"/> ."
+#: pkgs.dbk:146
+msgid "See also <xref linkend=\"bpp-debian-changelog\"/>."
 msgstr "<xref linkend=\"bpp-debian-changelog\"/> も参照してください。"
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: pkgs.dbk:150
+#: pkgs.dbk:151
 msgid "Testing the package"
 msgstr "パッケージをテストする"
 
 # type: Content of: <chapter><section><para>
 # FIXME: around
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:152
+#: pkgs.dbk:153
 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 "
@@ -305,7 +330,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:159
+#: pkgs.dbk:160
 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 "
@@ -317,7 +342,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:166
+#: pkgs.dbk:167
 msgid ""
 "Run <command>lintian</command> over the package.  You can run "
 "<command>lintian</command> as follows: <literal>lintian -v "
@@ -336,7 +361,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:175
+#: pkgs.dbk:176
 msgid ""
 "Normally, a package should <emphasis>not</emphasis> be uploaded if it causes "
 "lintian to emit errors (they will start with <literal>E</literal>)."
@@ -347,27 +372,28 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:179
+#: pkgs.dbk:180
 msgid ""
 "For more information on <command>lintian</command>, see <xref linkend="
-"\"lintian\"/> ."
+"\"lintian\"/>."
 msgstr ""
 "<command>lintian</command> についての詳細は、<xref linkend=\"lintian\"/> を参"
 "照してください。"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:185
+#: pkgs.dbk:186
+#, fuzzy
 msgid ""
-"Optionally run <xref linkend=\"debdiff\"/> to analyze changes from an older "
-"version, if one exists."
+"Optionally run <command>debdiff</command> (see <xref linkend=\"debdiff\"/>) "
+"to analyze changes from an older version, if one exists."
 msgstr ""
 "もし古いバージョンがあれば、それからの変更点を分析するために追加で <xref "
 "linkend=\"debdiff\"/> を実行する。"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:191
+#: pkgs.dbk:192
 msgid ""
 "Downgrade the package to the previous version (if one exists) — this tests "
 "the <filename>postrm</filename> and <filename>prerm</filename> scripts."
@@ -377,65 +403,79 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:197
+#: pkgs.dbk:198
 msgid "Remove the package, then reinstall it."
 msgstr "パッケージを削除して、再インストールする。"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:202
-#, fuzzy
+#: pkgs.dbk:203
 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 "
 "of it, or if it relies on permissions being preserved on the files shipped "
-"inside the .diff.gz file."
+"inside the <filename>.diff.gz</filename> file."
 msgstr ""
 "ソースパッケージを違うディレクトリにコピーして展開し、再構築する。これは、"
-"パッケージが外部の既存ファイルに依存しているかどうか、.diff.gz ファイル内に含"
-"まれているファイル"
+"パッケージが外部の既存ファイルに依っているか、<filename>.diff.gz</filename> "
+"ファイル内に含まれているファイルで保存されている権限に依るかどうかをテストし"
+"ます。"
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: pkgs.dbk:212
+#: pkgs.dbk:213
 msgid "Layout of the source package"
 msgstr "ソースパッケージの概要"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:214
+#: pkgs.dbk:215
 msgid "There are two types of Debian source packages:"
 msgstr "Debian のソースパッケージには 2 種類あります："
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:219
+#: pkgs.dbk:220
 msgid ""
 "the so-called <literal>native</literal> packages, where there is no "
 "distinction between the original sources and the patches applied for Debian"
 msgstr ""
+"いわゆる <literal>native</literal>パッケージ。元のソースと Debian で当てられ"
+"たパッチの間に差が無いもの"
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:225
+#: pkgs.dbk:226
 msgid ""
 "the (more common) packages where there's an original source tarball file "
 "accompanied by another file that contains the changes made by Debian"
 msgstr ""
+"オリジナルのソースコードの tarball ファイルに、Debian によって作成された変更"
+"点を含む別のファイルが付随している (より一般的な) パッケージ"
 
+# FIXME: control ファイル？コントロールファイル？
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:231
+#: pkgs.dbk:232
+#, fuzzy
 msgid ""
 "For the native packages, the source package includes a Debian source control "
-"file (<literal>.dsc</literal>) and the source tarball (<literal>.tar.{gz,bz2,"
-"lzma}</literal>). A source package of a non-native package includes a Debian "
-"source control file, the original source tarball (<literal>.orig.tar.{gz,bz2,"
-"lzma}</literal>) and the Debian changes (<literal>.diff.gz</literal> for the "
-"source format “1.0” or <literal>.debian.tar.{gz,bz2,lzma}</literal> for the "
-"source format “3.0 (quilt)”)."
-msgstr ""
+"file (<filename>.dsc</filename>) and the source tarball (<filename>.tar.{gz,"
+"bz2,lzma}</filename>). A source package of a non-native package includes a "
+"Debian source control file, the original source tarball (<filename>.orig.tar."
+"{gz,bz2,lzma}</filename>) and the Debian changes (<filename>.diff.gz</"
+"filename> for the source format “1.0” or <filename>.debian.tar.{gz,bz2,lzma}"
+"</filename> for the source format “3.0 (quilt)”)."
+msgstr ""
+"native パッケージの場合、ソースパッケージは Debian のソース control ファイル "
+"(<filename>.dsc</filename>) とソースコードの tarball (<filename>.tar.{gz,bz2,"
+"lzma}</filename>) を含んでいます。native ではないパッケージのソースパッケージ"
+"は Debian のソース control ファイルと、オリジナルのソースコードの tarball "
+"(<filename>.orig.tar.{gz,bz2,lzma}</filename>)、そして Debian での変更点 "
+"(ソース形式“1.0”は <filename>.diff.gz</filename>、ソース形式“3.0 (quilt)”は "
+"<filename>.debian.tar.{gz,bz2,lzma}</filename>) を含んでいます。"
 
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:240
+#: pkgs.dbk:241
+#, fuzzy
 msgid ""
 "With source format “1.0”, whether a package is native or not was determined "
 "by <command>dpkg-source</command> at build time. Nowadays it is recommended "
@@ -443,10 +483,15 @@ msgid ""
 "(quilt)” or “3.0 (native)” in <filename>debian/source/format</filename>.  "
 "The rest of this section relates only to non-native packages."
 msgstr ""
+"ソース形式“1.0”では、パッケージが native かどうかはビルド時に <command>dpkg-"
+"source</command> によって決められていました。最近では望むソース形式を "
+"<filename>debian/source/format</filename> に“3.0 (quilt)”または“3.0 "
+"(native)”と記述することによって明示することが推奨されています。この章の残り"
+"は native ではないパッケージについてのみに関係しています。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:247
+#: pkgs.dbk:248
 msgid ""
 "The first time a version is uploaded which corresponds to a particular "
 "upstream version, the original source tar file should be uploaded and "
@@ -456,7 +501,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:254
+#: pkgs.dbk:255
+#, fuzzy
 msgid ""
 "By default, <command>dpkg-genchanges</command> and <command>dpkg-"
 "buildpackage</command> will include the original source tar file if and only "
@@ -465,78 +511,89 @@ msgid ""
 "literal> to always include it or <literal>-sd</literal> to always leave it "
 "out."
 msgstr ""
+"デフォルトで、<command>dpkg-genchanges</command> および <command>dpkg-"
+"buildpackage</command> この挙動は、常に含めるのに <literal>-sa</literal> を常"
+"に含めないのには <literal>-sd</literal> を使うことで"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:262
+#: pkgs.dbk:263
+#, fuzzy
 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>."
 "dsc</filename> file and diff to be uploaded <emphasis>must</emphasis> be "
 "byte-for-byte identical with the one already in the archive."
 msgstr ""
+"アップロード時にオリジナルのソースが含まれていない場合、アップロードされる "
+"<filename>.dsc</filename> と diff ファイルを構築する際に <command>dpkg-"
+"source</command> が使用するオリジナルの tar ファイルは、<emphasis>必ず</"
+"empashis>既にアーカイブにあるものと 1 バイトも変わらぬものでなくてはなりませ"
+"ん。"
 
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:269
+#: pkgs.dbk:270
 msgid ""
 "Please notice that, in non-native packages, permissions on files that are "
-"not present in the .orig.tar.{gz,bz2} will not be preserved, as diff does "
-"not store file permissions in the patch. However when using source format "
-"“3.0 (quilt)”, permissions of files inside the <filename>debian</filename> "
-"directory are preserved since they are stored in a tar archive."
+"not present in the <filename>*.orig.tar.{gz,bz2,lzma}</filename> will not be "
+"preserved, as diff does not store file permissions in the patch. However "
+"when using source format “3.0 (quilt)”, permissions of files inside the "
+"<filename>debian</filename> directory are preserved since they are stored in "
+"a tar archive."
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: pkgs.dbk:278
+#: pkgs.dbk:279
 msgid "Picking a distribution"
 msgstr "ディストリビューションを選ぶ"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:280
+#: pkgs.dbk:281
 msgid ""
 "Each upload needs to specify which distribution the package is intended "
 "for.  The package build process extracts this information from the first "
 "line of the <filename>debian/changelog</filename> file and places it in the "
-"<literal>Distribution</literal> field of the <literal>.changes</literal> "
+"<literal>Distribution</literal> field of the <filename>.changes</filename> "
 "file."
 msgstr ""
 "アップロードでは、パッケージがどのディストリビューション向けになっているかを"
 "指定してあることが必要です。パッケージの構築プロセスでは、<filename>debian/"
-"changelog</filename> ファイルの最初の行からこの情報を展開し、<literal>."
-"changes</literal> ファイルの <literal>Distribution</literal> 欄に配置します。"
+"changelog</filename> ファイルの最初の行からこの情報を展開し、<filename>."
+"changes</filename> ファイルの <literal>Distribution</literal> 欄に配置しま"
+"す。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:286
+#: pkgs.dbk:287
 msgid ""
 "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 ""
-"この欄にはいくつか指定可能な値があります: <literal>stable</literal>, "
-"<literal>unstable</literal>, <literal>testing-proposed-updates</literal>, "
-"<literal>experimental</literal> です。通常、パッケージは <literal>unstable</"
-"literal> にアップロードされます。"
+"この欄にはいくつか指定可能な値があります: <literal>stable</literal>、"
+"<literal>unstable</literal>、<literal>testing-proposed-updates</literal>、そ"
+"して <literal>experimental</literal> です。通常、パッケージは "
+"<literal>unstable</literal> にアップロードされます。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:292
+#: pkgs.dbk:293
 msgid ""
 "Actually, there are two other possible distributions: <literal>stable-"
-"security </literal> and <literal>testing-security</literal>, but read <xref "
+"security</literal> and <literal>testing-security</literal>, but read <xref "
 "linkend=\"bug-security\"/> for more information on those."
 msgstr ""
 "実際には、他に二つ指定可能なディストリビューションがあります: "
-"<literal>stable-security </literal> と <literal>testing-security</literal> で"
+"<literal>stable-security</literal> と <literal>testing-security</literal> で"
 "すが、これらについての詳細は <xref linkend=\"bug-security\"/> を読んでくださ"
 "い。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:297
+#: pkgs.dbk:298
 msgid ""
 "It is not possible to upload a package into several distributions at the "
 "same time."
@@ -546,16 +603,16 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:301
+#: pkgs.dbk:302
 msgid ""
 "Special case: uploads to the <literal>stable</literal> and "
 "<literal>oldstable</literal> distributions"
 msgstr ""
-"特別な例: <literal>stable</literal> と <literal>oldstable</literal> ディスト"
-"リビューションへアップロードする"
+"特別な例: <literal>安定版 (stable)</literal> と <literal>旧安定版 (oldstable)"
+"</literal> ディストリビューションへアップロードする"
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:304
+#: pkgs.dbk:305
 msgid ""
 "Uploading to <literal>stable</literal> means that the package will "
 "transferred to the <literal>proposed-updates-new</literal> queue for review "
@@ -564,10 +621,16 @@ msgid ""
 "archive.  From there, it will be included in <literal>stable</literal> with "
 "the next point release."
 msgstr ""
+"<literal>安定版 (stable)</literal> へのアップロードは、安定版リリースマネー"
+"ジャによるレビューのため、パッケージが <literal>proposed-updates-new</"
+"literal> キューに転送され、許可された場合は Debian アーカイブの "
+"<filename>stable-proposed-updates</filename> ディレクトリにインストールされま"
+"す。"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:312
+#: pkgs.dbk:313
+#, fuzzy
 msgid ""
 "To ensure that your upload will be accepted, you should discuss the changes "
 "with the stable release team before you upload. For that, send a mail to the "
@@ -576,10 +639,16 @@ msgid ""
 "verbose and detailed in your changelog entries for uploads to the "
 "<literal>stable</literal> distribution."
 msgstr ""
+"アップロードが許可されるのを確実にするには、アップロードの前に変更点について"
+"安定版リリースチームと協議する必要があります。そのためには、<literal>安定版 "
+"(stable)</literal> にある現在のパッケージバージョンに適用したいパッチを含めた"
+"メールを &email-debian-release; メーリングリストに送ってください。<literal>安"
+"定版 (stable)</literal> ディストリビューションへアップロードするパッケージの "
+"changelog のエントリには常に verbose で詳細にしてください。"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:320
+#: pkgs.dbk:321
 msgid ""
 "Extra care should be taken when uploading to <literal>stable</literal>.  "
 "Basically, a package should only be uploaded to <literal>stable</literal> if "
@@ -588,25 +657,25 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:327
+#: pkgs.dbk:328
 msgid "a truly critical functionality problem"
-msgstr ""
+msgstr "本当に致命的な機能への問題がある"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:332
+#: pkgs.dbk:333
 msgid "the package becomes uninstallable"
 msgstr "パッケージがインストールできなくなる"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:337
+#: pkgs.dbk:338
 msgid "a released architecture lacks the package"
 msgstr "リリースされたアーキテクチャにパッケージが無い"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:342
+#: pkgs.dbk:343
 msgid ""
 "In the past, uploads to <literal>stable</literal> were used to address "
 "security problems as well.  However, this practice is deprecated, as uploads "
@@ -621,15 +690,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:353
+#: pkgs.dbk:354
 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>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:357
+#: pkgs.dbk:358
 msgid ""
 "Packages uploaded to <literal>stable</literal> need to be compiled on "
 "systems running <literal>stable</literal>, so that their dependencies are "
@@ -637,23 +705,22 @@ msgid ""
 "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> "
+"messing with <literal>Provides</literal> or <filename>shlibs</filename> "
 "files), possibly making those other packages uninstallable, is strongly "
 "discouraged."
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:367
+#: pkgs.dbk:368
 msgid ""
 "Uploads to the <literal>oldstable</literal> distributions are possible as "
-"long as it hasn't been archived. The same rules as for <literal>stable </"
+"long as it hasn't been archived. The same rules as for <literal>stable</"
 "literal> apply."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:374
+#: pkgs.dbk:375
 msgid ""
 "Special case: uploads to <literal>testing/testing-proposed-updates</literal>"
 msgstr ""
@@ -662,7 +729,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:376
+#: pkgs.dbk:377
 msgid ""
 "Please see the information in the <link linkend=\"t-p-u\">testing section</"
 "link> for details."
@@ -672,18 +739,18 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: pkgs.dbk:384
+#: pkgs.dbk:385
 msgid "Uploading a package"
 msgstr "パッケージをアップロードする"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:386
+#: pkgs.dbk:387
 msgid "Uploading to <literal>ftp-master</literal>"
 msgstr "<literal>ftp-master</literal> にアップロードする"
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:388
+#: pkgs.dbk:389
 msgid ""
 "To upload a package, you should upload the files (including the signed "
 "changes and dsc-file) with anonymous ftp to <literal>&ftp-upload-host;</"
@@ -695,54 +762,55 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:397
+#: pkgs.dbk:398
 msgid ""
 "Please note that you should transfer the changes file last.  Otherwise, your "
 "upload may be rejected because the archive maintenance software will parse "
 "the changes file and see that not all files have been uploaded."
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:402
+#: pkgs.dbk:403
 msgid ""
-"You may also find the Debian packages <xref linkend=\"dupload\"/> or <xref "
-"linkend=\"dput\"/> useful when uploading packages.  These handy programs "
-"help automate the process of uploading packages into Debian."
+"You may also find the Debian packages <link linkend=\"dupload\">dupload</"
+"link> or <link linkend=\"dput\">dput</link> useful when uploading packages."
+"These handy programs help automate the process of uploading packages into "
+"Debian."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:407
+#: pkgs.dbk:408
 msgid ""
 "For removing packages, please see <ulink url=\"ftp://&ftp-upload-host;"
-"&upload-queue;/README\"/> and the Debian package <xref linkend=\"dcut\"/> ."
+"&upload-queue;README\"/> and the Debian package <link linkend=\"dcut\">dcut</"
+"link>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:414
+#: pkgs.dbk:415
 msgid "Delayed uploads"
 msgstr "遅延アップロード"
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:417
+#: pkgs.dbk:418
 msgid ""
 "It is sometimes useful to upload a package immediately, but to want this "
 "package to arrive in the archive only a few days later. For example, when "
-"preparing a <link linkend=\"nmu\">Non-maintainer Upload</link>, you might "
+"preparing a <link linkend=\"nmu\">Non-Maintainer Upload</link>, you might "
 "want to give the maintainer a few days to react."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:424
+#: pkgs.dbk:425
 msgid ""
 "An upload to the delayed directory keeps the package in <ulink url=\"http://"
-"ftp-master.debian.org/deferred.html\"> the deferred uploads queue\"</"
-"ulink>.  When the specified waiting time is over, the package is moved into "
-"the regular incoming directory for processing.  This is done through "
-"automatic uploading to <literal>&ftp-upload-host;</literal> in upload-"
-"directory <literal>DELAYED/[012345678]-day</literal>. 0-day is uploaded "
-"multiple times per day to <literal>&ftp-upload-host;</literal>."
+"ftp-master.debian.org/deferred.html\">the deferred uploads queue</ulink>.  "
+"When the specified waiting time is over, the package is moved into the "
+"regular incoming directory for processing.  This is done through automatic "
+"uploading to <literal>&ftp-upload-host;</literal> in upload-directory "
+"<literal>DELAYED/[012345678]-day</literal>. 0-day is uploaded multiple times "
+"per day to <literal>&ftp-upload-host;</literal>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
@@ -761,14 +829,21 @@ msgstr "セキュリティアップロード"
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:443
+#, fuzzy
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 "upload queue (<literal>oldstable-security</literal>, <literal>stable-"
-"security </literal>, etc.) without prior authorization from the security "
+"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\"/> ."
+"details, please see <xref linkend=\"bug-security\"/>."
 msgstr ""
+"セキュリティアップロードキュー (<literal>oldstable-security</literal>、"
+"<literal>stable-security</literal> 等) には、セキュリティチームからの事前許可"
+"無しにパッケージを<emphasis role=\"strong\">アップロードしないでください</"
+"emphasis>。パッケージがチームの要求に完全に合致していない場合、望まれないアッ"
+"プロードに対処するために多くの問題が引き起こされたり遅延が生じることになりま"
+"す。詳細については <xref linkend=\"bug-security\"/> を参照してください。"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
@@ -783,21 +858,25 @@ msgid ""
 "upload-host;&upload-queue;\"/>. It operates in the same way as <literal>&ftp-"
 "upload-host;</literal>, but should be faster for European developers."
 msgstr ""
+"ヨーロッパにはもう一つのアップロードキューが <ulink url=\"ftp://&ftp-eu-"
+"upload-host;&upload-queue;\"/> にあります。操作方法は <literal>&ftp-upload-"
+"host;</literal> と同じですが、ヨーロッパ圏の開発者に対しては、より速いはずで"
+"す。"
 
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:461
 msgid ""
 "Packages can also be uploaded via ssh to <literal>&ssh-upload-host;</"
 "literal>; files should be put <literal>/srv/upload.debian.org/UploadQueue</"
-"literal>. This queue does not support <xref linkend=\"delayed-incoming"
-"\">delayed uploads</xref>."
+"literal>. This queue does not support <link linkend=\"delayed-incoming"
+"\">delayed uploads</link>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
 #: pkgs.dbk:469
 msgid "Notification that a new package has been installed"
-msgstr ""
+msgstr "新しいパッケージがインストールされたことの通知"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
@@ -894,6 +973,10 @@ msgid ""
 "<manvolnum>1</manvolnum> </citerefentry> and <ulink url=\"&url-bts-devel;"
 "#maintincorrect\"></ulink>."
 msgstr ""
+"<literal>override ファイル</literal> についての詳細は、<citerefentry> "
+"<refentrytitle>dpkg-scanpackages</refentrytitle> <manvolnum>1</manvolnum> </"
+"citerefentry> と <ulink url=\"&url-bts-devel;#maintincorrect\"></ulink> を参"
+"照してください。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
@@ -901,7 +984,7 @@ msgstr ""
 msgid ""
 "Note that the <literal>Section</literal> field describes both the section as "
 "well as the subsection, which are described in <xref linkend=\"archive-"
-"sections\"/> .  If the section is main, it should be omitted.  The list of "
+"sections\"/>.  If the section is main, it should be omitted.  The list of "
 "allowable subsections can be found in <ulink url=\"&url-debian-policy;ch-"
 "archive.html#s-subsections\"></ulink>."
 msgstr ""
@@ -918,7 +1001,7 @@ msgstr "バグの取扱い"
 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 "
-"reports properly (see <xref linkend=\"submit-bug\"/> ), how to update them "
+"reports properly (see <xref linkend=\"submit-bug\"/>), how to update them "
 "and reorder them, and how to process and close them."
 msgstr ""
 "すべての開発者は Debian <ulink url=\"&url-bts;\">バグ追跡システム</ulink>を取"
@@ -1035,19 +1118,21 @@ msgstr "バグへの対応"
 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."
-"g., <email>123@&bugs-host;</email>).  If you're writing a new mail and you "
-"don't remember the submitter email address, you can use the <email>123-"
-"submitter@&bugs-host;</email> email to contact the submitter <emphasis>and</"
-"emphasis> to record your mail within the bug log (that means you don't need "
-"to send a copy of the mail to <email>123@&bugs-host;</email>)."
+"g., <email><replaceable>123</replaceable>@&bugs-host;</email>).  If you're "
+"writing a new mail and you don't remember the submitter email address, you "
+"can use the <email><replaceable>123</replaceable>-submitter@&bugs-host;</"
+"email> email to contact the submitter <emphasis>and</emphasis> to record "
+"your mail within the bug log (that means you don't need to send a copy of "
+"the mail to <email><replaceable>123</replaceable>@&bugs-host;</email>)."
 msgstr ""
 "バグに対応する際は、バグについて行った議論がバグの元々の報告者とバグ自身 (例"
-"えば <email>123@&bugs-host;</email>) の両方に送られているのを確認してくださ"
-"い。新しくメールを書いていて元々の報告者のメールアドレスを思い出せない場合"
-"は、<email>123-submitter@&bugs-host;</email> というメールアドレスを報告者へ連"
-"絡するのに使えます。<emphasis>さらに</emphasis>バグのログへあなたのメールを記"
-"録するのにも使えます (これは <email>123@&bugs-host;</email> へメールのコピー"
-"を送らなくても済むことを意味しています)。"
+"えば <email><replaceable>123</replaceable>@&bugs-host;</email>) の両方に送ら"
+"れているのを確認してください。新しくメールを書いていて元々の報告者のメールア"
+"ドレスを思い出せない場合は、<email><replaceable>123</replaceable>-"
+"submitter@&bugs-host;</email> というメールアドレスを報告者へ連絡するのに使え"
+"ます。<emphasis>さらに</emphasis>バグのログへあなたのメールを記録するのにも使"
+"えます (これは <email><replaceable>123</replaceable>@&bugs-host;</email> へ"
+"メールのコピーを送らなくても済むことを意味しています)。"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
@@ -1066,15 +1151,15 @@ msgstr ""
 msgid ""
 "Once you've dealt with a bug report (e.g.  fixed it), mark it as "
 "<literal>done</literal> (close it) by sending an explanation message to "
-"<email>123-done@&bugs-host;</email>.  If you're fixing a bug by changing and "
-"uploading the package, you can automate bug closing as described in <xref "
-"linkend=\"upload-bugfix\"/> ."
+"<email><replaceable>123</replaceable>-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 ""
-"既にバグに対処していた場合 (例えば修正済み)、説明のメッセージを <email>123-"
-"done@&bugs-host;</email> に送ることで <literal>done</literal> とマークしてお"
-"いて (閉じて) ください。パッケージを変更してアップロードすることでバグを修正"
-"する場合は、<xref linkend=\"upload-bugfix\"/> に記載されているように自動的に"
-"バグを閉じることができます。"
+"既にバグに対処していた場合 (例えば修正済み)、説明のメッセージを "
+"<email><replaceable>123</replaceable>-done@&bugs-host;</email> に送ることで "
+"<literal>done</literal> とマークしておいて (閉じて) ください。パッケージを変"
+"更してアップロードすることでバグを修正する場合は、<xref linkend=\"upload-"
+"bugfix\"/> に記載されているように自動的にバグを閉じることができます。"
 
 # type: Content of: <chapter><section><section><para>
 # FIXME: via the bug server ?
@@ -1156,7 +1241,6 @@ msgid ""
 "ulink>."
 msgstr ""
 
-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #: pkgs.dbk:676
 msgid ""
@@ -1165,11 +1249,11 @@ msgid ""
 "reassigned to, you should ask for help on <link linkend=\"irc-channels"
 "\">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."
+"that does the reassign to <email><replaceable>packagename</"
+"replaceable>@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>
@@ -1237,12 +1321,11 @@ msgid ""
 "literal>."
 msgstr ""
 
-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #: pkgs.dbk:742
 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 "
+"to the VCS repository, you may tag the bug as <literal>pending</literal> to "
 "let people know that the bug is corrected and that it will be closed with "
 "the next upload (add the <literal>closes:</literal> in the "
 "<filename>changelog</filename>).  This is particularly useful if you are "
@@ -1320,30 +1403,27 @@ msgstr ""
 msgid "  /closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig\n"
 msgstr "  /closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig\n"
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:792
 msgid ""
 "We prefer the <literal>closes: #<replaceable>XXX</replaceable></literal> "
 "syntax, as it is the most concise entry and the easiest to integrate with "
 "the text of the <filename>changelog</filename>.  Unless specified different "
-"by the <replaceable>-v</replaceable>-switch to <command>dpkg-buildpackage</"
-"command>, only the bugs closed in the most recent changelog entry are closed "
+"by the <literal>-v</literal>-switch to <command>dpkg-buildpackage</command>, "
+"only the bugs closed in the most recent changelog entry are closed "
 "(basically, exactly the bugs mentioned in the changelog-part in the "
 "<filename>.changes</filename> file are closed)."
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:801
 msgid ""
-"Historically, uploads identified as <link linkend=\"nmu\">Non-maintainer "
+"Historically, uploads identified as <link linkend=\"nmu\">non-maintainer "
 "upload (NMU)</link> were tagged <literal>fixed</literal> instead of being "
 "closed, but that practice was ceased with the advent of version-tracking.  "
 "The same applied to the tag <literal>fixed-in-experimental</literal>."
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:807
 msgid ""
@@ -1352,23 +1432,24 @@ msgid ""
 "wrongly closed bugs, send a <literal>reopen <replaceable>XXX</replaceable></"
 "literal> command to the bug tracking system's control address, &email-bts-"
 "control;.  To close any remaining bugs that were fixed by your upload, email "
-"the <filename>.changes</filename> file to <email>XXX-done@&bugs-host;</"
-"email>, where <replaceable>XXX</replaceable> is the bug number, and put "
-"Version: YYY and an empty line as the first two lines of the body of the "
-"email, where <replaceable>YYY</replaceable> is the first version where the "
-"bug has been fixed."
+"the <filename>.changes</filename> file to <email><replaceable>XXX</"
+"replaceable>-done@&bugs-host;</email>, where <replaceable>XXX</replaceable> "
+"is the bug number, and put Version: <replaceable>YYY</replaceable> and an "
+"empty line as the first two lines of the body of the email, where "
+"<replaceable>YYY</replaceable> is the first version where the bug has been "
+"fixed."
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:819
 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 "
 "to do with an upload you made, do it by emailing an explanation to "
-"<email>XXX-done@&bugs-host;</email>.  Do <emphasis role=\"strong\">not</"
-"emphasis> close bugs in the changelog entry of a version if the changes in "
-"that version of the package don't have any bearing on the bug."
+"<email><replaceable>XXX</replaceable>-done@&bugs-host;</email>.  Do "
+"<emphasis role=\"strong\">not</emphasis> close bugs in the changelog entry "
+"of a version if the changes in that version of the package don't have any "
+"bearing on the bug."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
@@ -1376,8 +1457,10 @@ msgstr ""
 #: pkgs.dbk:827
 msgid ""
 "For general information on how to write your changelog entries, see <xref "
-"linkend=\"bpp-debian-changelog\"/> ."
+"linkend=\"bpp-debian-changelog\"/>."
 msgstr ""
+"どのように changelog のエントリを書くのか、一般的な情報については <xref "
+"linkend=\"bpp-debian-changelog\"/> を参照してください。"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
@@ -1395,6 +1478,11 @@ msgid ""
 "security problems or fixing them themselves, sending security advisories, "
 "and maintaining <literal>security.debian.org</literal>."
 msgstr ""
+"機密性が高いその性質上、セキュリティ関連のバグは注意深く取り扱わねばなりませ"
+"ん。この作業をコーディネイトし、未処理のセキュリティ問題を追い続け、セキュリ"
+"ティ問題についてメンテナを手助けしたり修正自体を行い、セキュリティ勧告を出"
+"し、<literal>security.debian.org</literal> を維持するために Debian セキュリ"
+"ティチームが存在します。"
 
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:842
@@ -1406,6 +1494,12 @@ msgid ""
 "packages for <literal>stable</literal> without contacting the team.  Useful "
 "information includes, for example:"
 msgstr ""
+"Debian パッケージ中のセキュリティ関連のバグに気づいたら、あなたがメンテナであ"
+"るかどうかに関わらず、問題に関する正確な情報を集めて、まずは可能な限り早く "
+"&email-security-team; 宛でセキュリティチームに連絡を取ってください。チームに"
+"問い合わせること無く <literal>安定版 (stable)</literal> 向けのパッケージを"
+"<emphasis role=\"strong\">アップロードしないでください</emphasis>。例えば、役"
+"に立つ情報は以下を含んでいます:"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
@@ -1415,22 +1509,29 @@ msgid ""
 "each version that is present in a supported Debian release, as well as "
 "<literal>testing</literal> and <literal>unstable</literal>."
 msgstr ""
+"バグによって、どのバージョンが影響を受けると分かっているか。サポートされてい"
+"る Debian のリリース、ならびに <literal>テスト版 (testing)</literal> 及び "
+"<literal>不安定版 (unstable)</literal> にある各バージョンをチェックしてくださ"
+"い。"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #: pkgs.dbk:859
 msgid ""
 "The nature of the fix, if any is available (patches are especially helpful)"
-msgstr ""
+msgstr "利用可能なものがあれば、修正内容 (パッチが特に望ましい)"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #: pkgs.dbk:864
 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="
-"\"bug-security-building\"/> first)"
+"Any fixed packages that you have prepared yourself (send only the <filename>."
+"diff.gz</filename> and <filename>.dsc</filename> files and read <xref "
+"linkend=\"bug-security-building\"/> first)"
 msgstr ""
+"自身で準備した修正パッケージ (まずは <xref linkend=\"bug-security-building\"/"
+"> を読んで、<filename>.diff.gz</filename> と <filename>.dsc</filename> ファイ"
+"ルだけを送ってください)"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
@@ -1439,14 +1540,17 @@ msgid ""
 "Any assistance you can provide to help with testing (exploits, regression "
 "testing, etc.)"
 msgstr ""
+"テストについて何かしらの手助けになるもの (攻撃コード、リグレッションテストな"
+"ど)"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #: pkgs.dbk:877
 msgid ""
 "Any information needed for the advisory (see <xref linkend=\"bug-security-"
-"advisories\"/> )"
+"advisories\"/>)"
 msgstr ""
+"勧告に必要になる情報 (<xref linkend=\"bug-security-advisories\"/> 参照)"
 
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:882
@@ -1456,11 +1560,15 @@ msgid ""
 "patches and test updated packages, so please see the sections below on how "
 "to prepare packages for the Security Team to handle."
 msgstr ""
+"パッケージメンテナとして、あなたは安定版リリースについてもメンテナンスする責"
+"任を持ちます。あなたがパッチの評価と更新パッケージのテストを行うのに最も適任"
+"な人です。ですから、以下のセキュリティチームによって取り扱ってもらうため、ど"
+"のようにしてパッケージを用意するかについての章を参照してください。"
 
 #. type: Content of: <chapter><section><section><section><title>
 #: pkgs.dbk:888
 msgid "The Security Tracker"
-msgstr ""
+msgstr "セキュリティ追跡システム"
 
 #. type: Content of: <chapter><section><section><section><para>
 #: pkgs.dbk:890
@@ -1472,6 +1580,12 @@ msgid ""
 "testing and/or unstable are vulnerable. Information that is still "
 "confidential is not added to the tracker."
 msgstr ""
+"セキュリティチームは集約的なデータベース、<ulink url=\"http://security-"
+"tracker.debian.org/\">Debian セキュリティ追跡システム</ulink>をメンテナンスし"
+"ています。これはセキュリティ問題として知られている全ての公開情報を含んでいま"
+"す: どのパッケージ／バージョンが影響を受ける／修正されているか、つまりは安定"
+"版、テスト版、不安定版が脆弱化かどうか、という情報です。まだ機密扱いの情報は"
+"追跡システムには追加されません。"
 
 #. type: Content of: <chapter><section><section><section><para>
 #: pkgs.dbk:898
@@ -1481,12 +1595,16 @@ msgid ""
 "more information about those issues, or help to address them in your "
 "package.  Instructions are on the tracker web pages."
 msgstr ""
+"特定の問題について検索することもできますし、パッケージ名でも検索できます。あ"
+"なたのパッケージを探して、どの問題がまだ未解決かを確認してください。できれば"
+"追加情報を提供するか、パッケージの問題に対処するのを手伝ってください。やり方"
+"は追跡システムのウェブページにあります。"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 #: pkgs.dbk:906
 msgid "Confidentiality"
-msgstr ""
+msgstr "秘匿性"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
@@ -1499,30 +1617,35 @@ msgid ""
 "problem and corresponding fix, and whether it is already a matter of public "
 "knowledge."
 msgstr ""
+"Debian 内での他の多くの活動とは違い、時折セキュリティ問題に関する情報について"
+"は暫くの間秘密にしておく必要があります。これによって、ソフトウェアのディスト"
+"リビュータがユーザが危険にさらされるのを最小限にするため、公開時期を合わせる"
+"ことができます。今回がそうであるかは、問題と対応する修正の性質や、既に既知の"
+"ものになっているかどうかによります。"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 #: pkgs.dbk:915
 msgid "There are several ways developers can learn of a security problem:"
-msgstr ""
+msgstr "開発者がセキュリティ問題を知る方法はいくつかあります:"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #: pkgs.dbk:920
 msgid "they notice it on a public forum (mailing list, web site, etc.)"
-msgstr ""
+msgstr "公開フォーラム (メーリングリスト、ウェブサイトなど) で知らせる"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #: pkgs.dbk:925
 msgid "someone files a bug report"
-msgstr ""
+msgstr "誰かがバグ報告を登録している"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #: pkgs.dbk:930
 msgid "someone informs them via private email"
-msgstr ""
+msgstr "誰かがプライベートなメールで教えてきた"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
@@ -1533,6 +1656,9 @@ msgid ""
 "public information.  In that case there are a few possible options for "
 "dealing with the problem:"
 msgstr ""
+"最初の二つのケースでは、情報は公開されていて可能な限り早く修正することが重要"
+"です。しかしながら最後のケースは、公開情報ではないかもしれません。この場合"
+"は、問題に対処するのに幾つか取り得る選択肢があります:"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
@@ -1541,6 +1667,8 @@ 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>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
@@ -1550,6 +1678,9 @@ msgid ""
 "other vendors and coordinate a release.  The security team keeps in contact "
 "with the various organizations and individuals and can take care of that."
 msgstr ""
+"問題が深刻な場合、他のベンダと情報を共有してリリースをコーディネイトする方が"
+"望ましいでしょう。セキュリティチームは様々な組織／個人と連絡を取りつづけ、こ"
+"の問題に対応することができます。"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
@@ -1561,17 +1692,26 @@ msgid ""
 "release of Debian.  When sending confidential information to the security "
 "team, be sure to mention this fact."
 msgstr ""
+"どのような場合でも、問題を報告した人がこれを公開しないように求めているのであ"
+"れば、明白な例外として Debian の安定版リリースに対する修正を作成してもらうた"
+"めにセキュリティチームへ連絡すること以外、この様な要求は尊重されるべきです。"
+"機密情報をセキュリティチームに送る場合は、この点を明示しておくのを忘れないで"
+"ください。"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 #: pkgs.dbk:963
 msgid ""
 "Please note that if secrecy is needed you may not upload a fix to "
-"<literal>unstable</literal> (or anywhere else, such as a public CVS "
+"<literal>unstable</literal> (or anywhere else, such as a public VCS "
 "repository).  It is not sufficient to obfuscate the details of the change, "
 "as the code itself is public, and can (and will) be examined by the general "
 "public."
 msgstr ""
+"機密を要する場合は、修正を<literal>不安定版 (unstable)</literal> (や公開 VCS "
+"リポジトリなどその他どこでも) へ修正をアップロードしないよう、注意してくださ"
+"い。コードその物が公開されている場合、変更の詳細を難読化するだけでは十分では"
+"なく、皆によって解析され得る (そしてされる) でしょう。"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
@@ -1581,14 +1721,20 @@ msgid ""
 "requested: the problem has been known for a while, or the problem or exploit "
 "has become public."
 msgstr ""
+"機密であることを要求されたにも関わらず、情報を公開するのには 2 つの理由があり"
+"ます: 問題がしばらくの間既知になっている、あるいは問題や攻撃コードが公開され"
+"た場合です。"
 
 #. type: Content of: <chapter><section><section><section><para>
 #: pkgs.dbk:975
 msgid ""
 "The Security Team has a PGP-key to enable encrypted communication about "
-"sensitive issues. See the <ulink url=\"http://www.debian.org/security/faq.en."
-"html#contact\">Security Team FAQ</ulink> for details."
+"sensitive issues. See the <ulink url=\"http://www.debian.org/security/"
+"faq#contact\">Security Team FAQ</ulink> for details."
 msgstr ""
+"セキュリティチームは、機密事項に関して通信を暗号化できる PGP 鍵を持っていま"
+"す。詳細については、<ulink url=\"http://www.debian.org/security/faq#contact"
+"\">セキュリティチーム FAQ</ulink> を参照してください。"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
@@ -1597,6 +1743,7 @@ msgid "Security Advisories"
 msgstr "セキュリティ勧告"
 
 # type: Content of: <chapter><section><section><section><para>
+# FIXME: how about oldstable?
 #. type: Content of: <chapter><section><section><section><para>
 #: pkgs.dbk:983
 msgid ""
@@ -1610,24 +1757,33 @@ msgid ""
 "information for them, or write part of the text.  Information that should be "
 "in an advisory includes:"
 msgstr ""
+"セキュリティ勧告は現在のところ、リリースされた安定版ディストリビューションに"
+"ついてのみ、取り扱われます。<literal>テスト版 (testing)</literal> や "
+"<literal>不安定版 (unstable)</literal> についてでは<emphasis>ありません</"
+"emphasis>。リリースされると、セキュリティ勧告は email-debian-security-"
+"announce; メーリングリストに送られ、<ulink url=\"&url-debian-security-"
+"advisories;\">セキュリティのウェブページ</ulink>に掲載されます。セキュリティ"
+"勧告はセキュリティチームによって記述、掲載されます。しかし、メンテナが情報を"
+"提供できたり、文章の一部を書けるのであれば、彼らは当然そんなことは気にしませ"
+"ん。勧告にあるべき情報は以下を含んでいます:"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #: pkgs.dbk:996
 msgid "A description of the problem and its scope, including:"
-msgstr ""
+msgstr "以下のようなものを含めた問題の説明と範囲:"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #: pkgs.dbk:1001
 msgid "The type of problem (privilege escalation, denial of service, etc.)"
-msgstr ""
+msgstr "問題の種類 (権限の上昇、サービス拒否など)"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #: pkgs.dbk:1006
 msgid "What privileges may be gained, and by whom (if any)"
-msgstr ""
+msgstr "何の権限が得られるのか、(もし分かれば) 誰が得るのか"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -1652,6 +1808,7 @@ msgstr "どのようにして問題が修正されたのか"
 #: pkgs.dbk:1026
 msgid "This information allows users to assess the threat to their systems."
 msgstr ""
+"この情報によって、ユーザがシステムに対する脅威を評価できるようになります。"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
@@ -1672,6 +1829,8 @@ msgid ""
 "Information on where to obtain the updated packages (usually from the Debian "
 "security archive)"
 msgstr ""
+"どこで更新されたパッケージを得るかという情報 (通常は Debian のセキュリティ"
+"アーカイブからです)"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
@@ -1681,21 +1840,27 @@ msgid ""
 "ulink> identifiers, and any other information useful in cross-referencing "
 "the vulnerability"
 msgstr ""
+"開発元のアドバイザリへの参照、<ulink url=\"http://cve.mitre.org\">CVE</"
+"ulink> 番号、脆弱性の相互参照について役立つその他の情報"
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 #: pkgs.dbk:1056
 msgid "Preparing packages to address security issues"
-msgstr ""
+msgstr "セキュリティ問題に対処するパッケージを用意する"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 #: pkgs.dbk:1058
+#, fuzzy
 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 "
 "Debian release."
 msgstr ""
+"セキュリティチームを彼らの作業範囲内で手助けできる方法の一つは、安定版 "
+"Debian リリース用のセキュリティ勧告に適した修正版パッケージを提供することで"
+"す。"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
@@ -1708,6 +1873,12 @@ msgid ""
 "might break someone's system.  This is especially true of libraries: make "
 "sure you never change the API or ABI, no matter how small the change."
 msgstr ""
+"安定版について更新が作成される際、システムの挙動の変化や新しいバグの導入を避"
+"けるように注意が必要です。これを行うため、バグを修正するための変更は可能な限"
+"り少なくします。ユーザや管理者は一旦リリースされたものの厳密な挙動を当てにし"
+"ている、どのような変更でも誰かのシステムを壊しかねません。これは特にライブラ"
+"リについて当てはまります: API や ABI を決して変更していないことを確認してくだ"
+"さい。変更がどれほど小さいものでも関係ありません。"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
@@ -1719,6 +1890,11 @@ msgid ""
 "willing to help if needed.  If not, the Debian security team may be able to "
 "help."
 msgstr ""
+"これは、開発元の新しいリリースバージョン (new upstream version) への移行が良"
+"い解決策ではないことを意味しています。代わりに、関連する変更を現在の Debian "
+"安定版リリースに存在しているバージョンへバックポートするべきです。通常、開発"
+"元のメンテナは助けが必要であれば手伝おうとしてくれます。そうでない場合は、"
+"Debian セキュリティチームが手助けすることができます。"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
@@ -1764,7 +1940,7 @@ msgid ""
 "from the previous version repeatedly (<command>interdiff</command> from the "
 "<systemitem role=\"package\">patchutils</systemitem> package and "
 "<command>debdiff</command> from <systemitem role=\"package\">devscripts</"
-"systemitem> are useful tools for this, see <xref linkend=\"debdiff\"/> )."
+"systemitem> are useful tools for this, see <xref linkend=\"debdiff\"/>)."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
@@ -1778,12 +1954,20 @@ msgstr ""
 msgid ""
 "<emphasis role=\"strong\">Target the right distribution</emphasis> in your "
 "<filename>debian/changelog</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 "
+"is <literal>stable-security</literal> and for <literal>testing</literal> "
+"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 ""
+"<filename>debian/changelog</filename> で <emphasis role=\"strong\">正しいディ"
+"ストリビューションを対象にする</emphasis>。<literal>安定版 (stable)</"
+"literal> の場合、これは <literal>stable-security</literal> になり、<literal>"
+"テスト版 (testing)</literal> の場合は <literal>testing-security</literal> "
+"に、そして以前の安定版リリースへの場合は <literal>oldstable-security</"
+"literal> となります。<replaceable>distribution</replaceable><literal>-"
+"proposed-updates</literal> や <literal>安定版 (stable)</literal> を対象にしな"
+"いでください!"
 
 # type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
@@ -1806,6 +1990,8 @@ msgid ""
 "but continue the process. The identifier can be cross-referenced later."
 msgstr ""
 
+# FIXME: etch1 -> <stable code>
+# convention
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #: pkgs.dbk:1141
 msgid ""
@@ -1816,10 +2002,21 @@ msgid ""
 "you have already used for a previous upload, or one that conflicts with a "
 "binNMU. The convention is to append <literal>+</"
 "literal><replaceable>codename</replaceable><literal>1</literal>, e.g.  "
-"<literal>1:2.4.3-4+etch1</literal>, of course increasing 1 for any "
+"<literal>1:2.4.3-4+lenny1</literal>, of course increasing 1 for any "
 "subsequent uploads."
 msgstr ""
-
+"<emphasis role=\"strong\">バージョン番号</emphasis>が正しいことを確認する。現"
+"在のパッケージより大きく、しかし以降のディストリビューションよりパッケージ"
+"バージョンが小さい必要があります。分からない場合は <literal>dpkg --compare-"
+"versions</literal> でテストしてください。バ以前のアップロードで既に使っている"
+"バージョン番号を再利用しないように注意してください。そうしないと番号が "
+"binNMU と衝突します。<literal>+</literal><replaceable>codename</"
+"replaceable><literal>1</literal> を追加するのが通例です。例えば "
+"<literal>1:2.4.3-4+lenny1</literal> とします。もちろん 1 はアップロードするご"
+"とに増やします。"
+
+# FIXME: remove " "
+# FIXME: how about debuild -sa ?
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #: pkgs.dbk:1154
 msgid ""
@@ -1828,16 +2025,23 @@ msgid ""
 "<emphasis role=\"strong\">with full upstream source</emphasis> "
 "(<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>)."
+"version, you may upload without upstream source (<literal>dpkg-buildpackage -"
+"sd</literal>)."
 msgstr ""
+"これまでに (以前のセキュリティ更新によって) <literal>security.debian.org</"
+"literal> へ開発元のソースコードをアップロードしていなければ、<emphasis role="
+"\"strong\">開発元のソースコードを全て含めて</emphasis>アップロードするパッ"
+"ケージをビルドする (<literal>dpkg-buildpackage -sa</literal>)。以前、同じ開発"
+"元のバージョンで <literal>security.debian.org</literal> にアップロードしたこ"
+"とがある場合は、開発元のソースコード無しでアップロードしても構いません "
+"(<literal>dpkg-buildpackage -sd</literal>)。"
 
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
 #: pkgs.dbk:1164
 msgid ""
 "Be sure to use the <emphasis role=\"strong\">exact same <filename>*.orig.tar."
-"{gz,bz2}</filename></emphasis> as used in the normal archive, otherwise it "
-"is not possible to move the security fix into the main archives later."
+"{gz,bz2,lzma}</filename></emphasis> as used in the normal archive, otherwise "
+"it is not possible to move the security fix into the main archives later."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
@@ -1846,15 +2050,15 @@ msgid ""
 "Build the package on a <emphasis role=\"strong\">clean system</emphasis> "
 "which only has packages installed from the distribution you are building "
 "for. If you do not have such a system yourself, you can use a debian.org "
-"machine (see <xref linkend=\"server-machines\"/> ) or setup a chroot (see "
-"<xref linkend=\"pbuilder\"/> and <xref linkend=\"debootstrap\"/> )."
+"machine (see <xref linkend=\"server-machines\"/>) or setup a chroot (see "
+"<xref linkend=\"pbuilder\"/> and <xref linkend=\"debootstrap\"/>)."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
 #: pkgs.dbk:1183
 msgid "Uploading the fixed package"
-msgstr ""
+msgstr "修正したパッケージをアップロードする"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
@@ -1862,23 +2066,22 @@ msgstr ""
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 "upload queue (<literal>oldstable-security</literal>, <literal>stable-"
-"security </literal>, etc.) without prior authorization from the security "
+"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>
 #. type: Content of: <chapter><section><section><section><para>
 #: pkgs.dbk:1192
 msgid ""
-"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."
+"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>
@@ -1888,8 +2091,7 @@ 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 "
 "the archives.  For security uploads, the place to upload to is "
-"<literal>ftp://security-master.debian.org/pub/SecurityUploadQueue/</"
-"literal> ."
+"<literal>ftp://security-master.debian.org/pub/SecurityUploadQueue/</literal>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
@@ -1964,11 +2166,11 @@ msgid ""
 "package control information to place the package in the desired section, and "
 "re-upload the package (see the <ulink url=\"&url-debian-policy;\">Debian "
 "Policy Manual</ulink> for details).  You must ensure that you include the "
-"<filename>.orig.tar.{gz,bz2}</filename> in your upload (even if you are not "
-"uploading a new upstream version), or it will not appear in the new section "
-"together with the rest of the package.  If your new section is valid, it "
-"will be moved automatically.  If it does not, then contact the ftpmasters in "
-"order to understand what happened."
+"<filename>.orig.tar.{gz,bz2,lzma}</filename> in your upload (even if you are "
+"not uploading a new upstream version), or it will not appear in the new "
+"section together with the rest of the package.  If your new section is "
+"valid, it will be moved automatically.  If it does not, then contact the "
+"ftpmasters in order to understand what happened."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
@@ -1979,7 +2181,7 @@ msgid ""
 "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\"/> ."
+"updated, as described in <xref linkend=\"override-file\"/>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
@@ -1988,7 +2190,6 @@ msgstr ""
 msgid "Removing packages"
 msgstr "パッケージの削除"
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:1269
 msgid ""
@@ -1996,7 +2197,7 @@ msgid ""
 "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.  The "
-"bug title should be in the form <literal>RM: <replaceable>package </"
+"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</"
@@ -2004,7 +2205,7 @@ msgid ""
 "<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."
+"these rules when you use it to report a bug against the <literal>ftp.debian."
 "org</literal> pseudo-package."
 msgstr ""
 
@@ -2020,16 +2221,15 @@ msgid ""
 "pending removal requests."
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:1295
 msgid ""
-"Note that removals can only be done for the <literal>unstable </literal>, "
-"<literal>experimental</literal> and <literal>stable </literal> "
-"distribution.  Packages are not removed from <literal>testing</literal> "
-"directly.  Rather, they will be removed automatically after the package has "
-"been removed from <literal>unstable</literal> and no package in "
-"<literal>testing </literal> depends on it."
+"Note that removals can only be done for the <literal>unstable</literal>, "
+"<literal>experimental</literal> and <literal>stable</literal> distribution.  "
+"Packages are not removed from <literal>testing</literal> directly.  Rather, "
+"they will be removed automatically after the package has been removed from "
+"<literal>unstable</literal> and no package in <literal>testing</literal> "
+"depends on it."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
@@ -2077,7 +2277,6 @@ msgid ""
 "\"></ulink> and <ulink url=\"&url-debian-qa;howto-remove.html\"></ulink>."
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:1334
 msgid ""
@@ -2087,7 +2286,7 @@ msgid ""
 "package.  When invoked as <literal>apt-cache showpkg <replaceable>package</"
 "replaceable></literal>, the program will show details for "
 "<replaceable>package</replaceable>, including reverse depends.  Other useful "
-"programs include <literal>apt-cache rdepends</literal>, <command>apt-"
+"programs include <command>apt-cache rdepends</command>, <command>apt-"
 "rdepends</command>, <command>build-rdeps</command> (in the <systemitem role="
 "\"package\">devscripts</systemitem> package) and <command>grep-dctrl</"
 "command>.  Removal of orphaned packages is discussed on &email-debian-qa;."
@@ -2133,7 +2332,6 @@ msgstr ""
 msgid "Replacing or renaming packages"
 msgstr "パッケージをリプレースあるいはリネームする"
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:1377
 msgid ""
@@ -2142,14 +2340,14 @@ msgid ""
 "two-step process to rename it. In the first step, change the "
 "<filename>debian/control</filename> file to reflect the new name and to "
 "replace, provide and conflict with the obsolete package name (see the <ulink "
-"url=\"&url-debian-policy;\"> Debian Policy Manual</ulink> for details).  "
+"url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for details).  "
 "Please note that you should only add a <literal>Provides</literal> relation "
 "if all packages depending on the obsolete package name continue to work "
 "after the renaming. Once you've uploaded the package and the package has "
-"moved into the archive, file a bug against <literal> ftp.debian.org</"
-"literal> asking to remove the package with the obsolete name (see <xref "
-"linkend=\"removing-pkgs\"/>).  Do not forget to properly reassign the "
-"package's bugs at the same time."
+"moved into the archive, file a bug against <literal>ftp.debian.org</literal> "
+"asking to remove the package with the obsolete name (see <xref linkend="
+"\"removing-pkgs\"/>).  Do not forget to properly reassign the package's bugs "
+"at the same time."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
@@ -2161,10 +2359,10 @@ msgid ""
 "manner.  Note that this applies to each part of your package, including the "
 "sources: if you wish to replace the upstream source tarball of your package, "
 "you will need to upload it with a different version.  An easy possibility is "
-"to replace <filename>foo_1.00.orig.tar.gz</filename> with <filename>foo_1.00"
-"+0.orig.tar.gz</filename> or <filename>foo_1.00.orig.tar.bz2</filename>.  "
-"This restriction gives each file on the ftp site a unique name, which helps "
-"to ensure consistency across the mirror network."
+"to replace <filename>foo_1.00.orig.tar.gz</filename> with "
+"<filename>foo_1.00+0.orig.tar.gz</filename> or <filename>foo_1.00.orig.tar."
+"bz2</filename>.  This restriction gives each file on the ftp site a unique "
+"name, which helps to ensure consistency across the mirror network."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
@@ -2238,7 +2436,7 @@ msgid ""
 "would be package hijacking.  You can, of course, contact the current "
 "maintainer and ask them if you may take over the package.  If you have "
 "reason to believe a maintainer has gone AWOL (absent without leave), see "
-"<xref linkend=\"mia-qa\"/> ."
+"<xref linkend=\"mia-qa\"/>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
@@ -2254,14 +2452,13 @@ msgid ""
 "ctte;\">technical committee web page</ulink> for more information)."
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:1464
 msgid ""
 "If you take over an old package, you probably want to be listed as the "
 "package's official maintainer in the bug system.  This will happen "
 "automatically once you upload a new version with an updated "
-"<literal>Maintainer:</literal> field, although it can take a few hours after "
+"<literal>Maintainer</literal> field, although it can take a few hours after "
 "the upload is done.  If you do not expect to upload a new version for a "
 "while, you can use <xref linkend=\"pkg-tracking-system\"/> to get the bug "
 "reports.  However, make sure that the old maintainer has no problem with the "
@@ -2284,7 +2481,6 @@ msgid ""
 "if you are not a porter, you should read most of this chapter."
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
 #: pkgs.dbk:1486
 msgid ""
@@ -2292,7 +2488,7 @@ msgid ""
 "different from the original architecture of the package maintainer's binary "
 "package.  It is a unique and essential activity.  In fact, porters do most "
 "of the actual compiling of Debian packages.  For instance, when a maintainer "
-"uploads a (portable) source packages with binaries for the <literal>i386 </"
+"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 ""
@@ -2343,14 +2539,14 @@ msgid ""
 "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 <literal>unstable</"
-"literal> chroot environment (see <xref linkend=\"debootstrap\"/> ).  Within "
+"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\"/> )."
+"same name (see <xref linkend=\"pbuilder\"/>)."
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
@@ -2358,7 +2554,7 @@ msgstr ""
 #: pkgs.dbk:1534
 msgid ""
 "If you can't set up a proper chroot, <command>dpkg-depcheck</command> may be "
-"of assistance (see <xref linkend=\"dpkg-depcheck\"/> )."
+"of assistance (see <xref linkend=\"dpkg-depcheck\"/>)."
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
@@ -2432,15 +2628,15 @@ msgid ""
 "standardize on different compilers."
 msgstr ""
 
-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #: pkgs.dbk:1595
 msgid ""
-"Make sure your debian/rules contains separate <literal>binary-arch</literal> "
-"and <literal>binary-indep</literal> targets, as the Debian Policy Manual "
-"requires.  Make sure that both targets work independently, that is, that you "
-"can call the target without having called the other before.  To test this, "
-"try to run <command>dpkg-buildpackage -B</command>."
+"Make sure your <filename>debian/rules</filename> contains separate "
+"<literal>binary-arch</literal> and <literal>binary-indep</literal> targets, "
+"as the Debian Policy Manual requires.  Make sure that both targets work "
+"independently, that is, that you can call the target without having called "
+"the other before.  To test this, try to run <command>dpkg-buildpackage -B</"
+"command>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
@@ -2470,7 +2666,6 @@ msgid ""
 "<filename>debian/changelog</filename>."
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
 #: pkgs.dbk:1621
 msgid ""
@@ -2479,7 +2674,7 @@ msgid ""
 "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 <literal>binary-arch</literal> target in "
-"<filename>debian/rules </filename>."
+"<filename>debian/rules</filename>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
@@ -2499,33 +2694,31 @@ msgstr ""
 msgid "Recompilation or binary-only NMU"
 msgstr ""
 
-# type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
 #: pkgs.dbk:1639
 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 "
+"library, bad compiler, etc.).  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>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>
 #. type: Content of: <chapter><section><section><section><para>
 #: pkgs.dbk:1648
 msgid ""
 "You have to make sure that your binary-only NMU doesn't render the package "
 "uninstallable.  This could happen when a source package generates arch-"
 "dependent and arch-independent packages that have inter-dependencies "
-"generated using dpkg's substitution variable <literal>$(Source-Version)  </"
+"generated using dpkg's substitution variable <literal>$(Source-Version)</"
 "literal>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1655
+#: pkgs.dbk:1654
 msgid ""
 "Despite the required modification of the changelog, these are called binary-"
 "only NMUs — there is no need in this case to trigger all other architectures "
@@ -2534,7 +2727,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1660
+#: pkgs.dbk:1659
 msgid ""
 "Such recompilations require special ``magic'' version numbering, so that the "
 "archive maintenance tools recognize that, even though there is a new Debian "
@@ -2545,7 +2738,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para><footnote><para>
 #. type: Content of: <chapter><section><section><section><para><footnote><para>
-#: pkgs.dbk:1675
+#: pkgs.dbk:1674
 msgid ""
 "In the past, such NMUs used the third-level number on the Debian part of the "
 "revision to denote their recompilation-only status; however, this syntax was "
@@ -2555,22 +2748,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1667
+#: pkgs.dbk:1666
 msgid ""
 "The ``magic'' for a recompilation-only NMU is triggered by using a suffix "
-"appended to the package version number, following the form <literal> "
-"b<replaceable>number</replaceable></literal>.  For instance, if the latest "
-"version you are recompiling against was version <literal>2.9-3</literal>, "
-"your binary-only NMU should carry a version of <literal>2.9-3+b1</literal>.  "
-"If the latest version was <literal>3.4+b1 </literal> (i.e, a native package "
-"with a previous recompilation NMU), your binary-only NMU should have a "
-"version number of <literal>3.4+b2</literal>.  <placeholder type=\"footnote\" "
-"id=\"0\"/>"
+"appended to the package version number, following the form "
+"<literal>b<replaceable>number</replaceable></literal>.  For instance, if the "
+"latest version you are recompiling against was version <literal>2.9-3</"
+"literal>, your binary-only NMU should carry a version of <literal>2.9-3+b1</"
+"literal>.  If the latest version was <literal>3.4+b1</literal> (i.e, a "
+"native package with a previous recompilation NMU), your binary-only NMU "
+"should have a version number of <literal>3.4+b2</literal>.<placeholder type="
+"\"footnote\" id=\"0\"/>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1683
+#: pkgs.dbk:1682
 msgid ""
 "Similar to initial porter uploads, the correct way of invoking <command>dpkg-"
 "buildpackage</command> is <literal>dpkg-buildpackage -B</literal> to only "
@@ -2579,16 +2772,15 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1690
+#: pkgs.dbk:1689
 msgid "When to do a source NMU if you are a porter"
 msgstr ""
 
-# type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1692
+#: pkgs.dbk:1691
 msgid ""
 "Porters doing a source NMU generally follow the guidelines found in <xref "
-"linkend=\"nmu\"/> , just like non-porters.  However, it is expected that the "
+"linkend=\"nmu\"/>, just like non-porters.  However, it is expected that the "
 "wait cycle for a porter's source NMU is smaller than for a non-porter, since "
 "porters have to cope with a large quantity of packages.  Again, the "
 "situation varies depending on the distribution they are uploading to.  It "
@@ -2597,9 +2789,8 @@ msgid ""
 "architectures are candidates."
 msgstr ""
 
-# type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1701
+#: pkgs.dbk:1700
 msgid ""
 "If you are a porter doing an NMU for <literal>unstable</literal>, the above "
 "guidelines for porting should be followed, with two variations.  Firstly, "
@@ -2609,13 +2800,13 @@ msgid ""
 "shortened if the problem is critical and imposes hardship on the porting "
 "effort, at the discretion of the porter group.  (Remember, none of this is "
 "Policy, just mutually agreed upon guidelines.) For uploads to "
-"<literal>stable</literal> or <literal>testing </literal>, please coordinate "
+"<literal>stable</literal> or <literal>testing</literal>, please coordinate "
 "with the appropriate release team first."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1713
+#: pkgs.dbk:1712
 msgid ""
 "Secondly, porters doing source NMUs should make sure that the bug they "
 "submit to the BTS should be of severity <literal>serious</literal> or "
@@ -2627,7 +2818,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1721
+#: pkgs.dbk:1720
 msgid ""
 "Porters should try to avoid patches which simply kludge around bugs in the "
 "current version of the compile environment, kernel, or libc.  Sometimes such "
@@ -2639,7 +2830,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1729
+#: pkgs.dbk:1728
 msgid ""
 "Porters may also have an unofficial location where they can put the results "
 "of their work during the waiting period.  This helps others running the port "
@@ -2649,13 +2840,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1739
+#: pkgs.dbk:1738
 msgid "Porting infrastructure and automation"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1741
+#: pkgs.dbk:1740
 msgid ""
 "There is infrastructure and several tools to help automate package porting.  "
 "This section contains a brief overview of this automation and porting to "
@@ -2665,13 +2856,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1746
+#: pkgs.dbk:1745
 msgid "Mailing lists and web pages"
 msgstr "メーリングリストとウェブページ"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1748
+#: pkgs.dbk:1747
 msgid ""
 "Web pages containing the status of each port can be found at <ulink url="
 "\"&url-debian-ports;\"></ulink>."
@@ -2679,7 +2870,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1752
+#: pkgs.dbk:1751
 msgid ""
 "Each port of Debian has a mailing list.  The list of porting mailing lists "
 "can be found at <ulink url=\"&url-debian-port-lists;\"></ulink>.  These "
@@ -2689,55 +2880,53 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1760
+#: pkgs.dbk:1759
 msgid "Porter tools"
 msgstr "移植用ツール"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1762
+#: pkgs.dbk:1761
 msgid ""
 "Descriptions of several porting tools can be found in <xref linkend=\"tools-"
-"porting\"/> ."
+"porting\"/>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1768
+#: pkgs.dbk:1767
 msgid "<systemitem role=\"package\">wanna-build</systemitem>"
 msgstr ""
 
-# type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1770
+#: pkgs.dbk:1769
 msgid ""
 "The <systemitem role=\"package\">wanna-build</systemitem> system is used as "
 "a distributed, client-server build distribution system.  It is usually used "
 "in conjunction with build daemons running the <systemitem 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."
+"\">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>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1778
+#: pkgs.dbk:1777
 msgid ""
 "<systemitem role=\"package\">wanna-build</systemitem> is not yet available "
 "as a package; however, all Debian porting efforts are using it for automated "
 "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 "
+"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>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1787
+#: pkgs.dbk:1786
 msgid ""
-"Most of the data produced by <systemitem role=\"package\">wanna-build </"
+"Most of the data produced by <systemitem role=\"package\">wanna-build</"
 "systemitem> which is generally useful to porters is available on the web at "
 "<ulink url=\"&url-buildd;\"></ulink>.  This data includes nightly updated "
 "statistics, queueing information and logs for build attempts."
@@ -2745,7 +2934,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1793
+#: pkgs.dbk:1792
 msgid ""
 "We are quite proud of this system, since it has so many possible uses.  "
 "Independent development groups can use the system for different sub-flavors "
@@ -2755,7 +2944,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1800
+#: pkgs.dbk:1799
 msgid ""
 "The wanna-build team, in charge of the buildds, can be reached at "
 "<literal>debian-wb-team@lists.debian.org</literal>.  To determine who (wanna-"
@@ -2764,7 +2953,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1807
+#: pkgs.dbk:1806
 msgid ""
 "When requesting binNMUs or give-backs (retries after a failed build), please "
 "use the format described at <ulink url=\"&url-release-wb;\"/>."
@@ -2772,13 +2961,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1816
+#: pkgs.dbk:1815
 msgid "When your package is <emphasis>not</emphasis> portable"
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1818
+#: pkgs.dbk:1817
 msgid ""
 "Some packages still have issues with building and/or working on some of the "
 "architectures supported by Debian, and cannot be ported at all, or not "
@@ -2790,7 +2979,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1825
+#: pkgs.dbk:1824
 msgid ""
 "In order to prevent broken packages from being uploaded to the archive, and "
 "wasting buildd time, you need to do a few things:"
@@ -2798,7 +2987,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1831
+#: pkgs.dbk:1830
 msgid ""
 "First, make sure your package <emphasis>does</emphasis> fail to build on "
 "architectures that it cannot support.  There are a few ways to achieve "
@@ -2811,7 +3000,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1839
+#: pkgs.dbk:1838
 msgid ""
 "Additionally, if you believe the list of supported architectures is pretty "
 "constant, you should change <literal>any</literal> to a list of supported "
@@ -2820,36 +3009,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1847
+#: pkgs.dbk:1846
 msgid ""
 "In order to prevent autobuilders from needlessly trying to build your "
-"package, it must be included in <filename>packages-arch-specific</filename>, "
+"package, it must be included in <filename>Packages-arch-specific</filename>, "
 "a list used by the <command>wanna-build</command> script.  The current "
 "version is available as <ulink url=\"&url-buildd-p-a-s;\"/>; please see the "
 "top of the file for whom to contact for changes."
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1856
+#: pkgs.dbk:1855
 msgid ""
-"Please note that it is insufficient to only add your package to Packages-"
-"arch-specific without making it fail to build on unsupported architectures: "
-"A porter or any other person trying to build your package might accidently "
-"upload it without noticing it doesn't work.  If in the past some binary "
-"packages were uploaded on unsupported architectures, request their removal "
-"by filing a bug against <systemitem role=\"package\">ftp.debian.org</"
-"systemitem>"
+"Please note that it is insufficient to only add your package to "
+"<filename>Packages-arch-specific</filename> without making it fail to build "
+"on unsupported architectures: A porter or any other person trying to build "
+"your package might accidently upload it without noticing it doesn't work.  "
+"If in the past some binary packages were uploaded on unsupported "
+"architectures, request their removal by filing a bug against <systemitem "
+"role=\"package\">ftp.debian.org</systemitem>."
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: pkgs.dbk:1869
+#: pkgs.dbk:1868
 msgid "Non-Maintainer Uploads (NMUs)"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:1871
+#: pkgs.dbk:1870
 msgid ""
 "Every package has one or more maintainers. Normally, these are the people "
 "who work on and upload new versions of the package. In some situations, it "
@@ -2861,25 +3049,24 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1880
-#, fuzzy
+#: pkgs.dbk:1879
 msgid "When and how to do an NMU"
-msgstr "誰が NMU 可能なのか"
+msgstr "いつ、どうやって NMU を行うか"
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1883
+#: pkgs.dbk:1882
 msgid "Before doing an NMU, consider the following questions:"
-msgstr ""
+msgstr "NMU を行う前に、以下の質問について考えてください:"
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1888
+#: pkgs.dbk:1887
 msgid ""
 "Does your NMU really fix bugs? Fixing cosmetic issues or changing the "
 "packaging style in NMUs is discouraged."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1894
+#: pkgs.dbk:1893
 msgid ""
 "Did you give enough time to the maintainer? When was the bug reported to the "
 "BTS? Being busy for a week or two isn't unusual.  Is the bug so severe that "
@@ -2887,7 +3074,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1901
+#: pkgs.dbk:1900
 msgid ""
 "How confident are you about your changes? Please remember the Hippocratic "
 "Oath: \"Above all, do no harm.\" It is better to leave a package with an "
@@ -2898,7 +3085,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1911
+#: pkgs.dbk:1910
 msgid ""
 "Have you clearly expressed your intention to NMU, at least in the BTS? It is "
 "also a good idea to try to contact the maintainer by other means (private "
@@ -2906,7 +3093,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1918
+#: pkgs.dbk:1917
 msgid ""
 "If the maintainer is usually active and responsive, have you tried to "
 "contact him? In general it should be considered preferable that a maintainer "
@@ -2917,16 +3104,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1928
+#: pkgs.dbk:1927
 msgid ""
 "When doing an NMU, you must first make sure that your intention to NMU is "
 "clear.  Then, you must send a patch with the differences between the current "
-"package and your proposed NMU to the BTS. The <literal>nmudiff</literal> "
-"script in the <literal>devscripts</literal> package might be helpful."
+"package and your proposed NMU to the BTS. The <command>nmudiff</command> "
+"script in the <systemitem role=\"package\">devscripts</systemitem> package "
+"might be helpful."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1935
+#: pkgs.dbk:1934
 msgid ""
 "While preparing the patch, you should better be aware of any package-"
 "specific practices that the maintainer might be using. Taking them into "
@@ -2934,11 +3122,11 @@ msgid ""
 "normal package workflow and thus increases the possibilities that that will "
 "happen. A good place where to look for for possible package-specific "
 "practices is <ulink url=\"&url-debian-policy;ch-source.html#s-readmesource"
-"\"><literal>debian/README.source</literal></ulink>."
+"\"><filename>debian/README.source</filename></ulink>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1943
+#: pkgs.dbk:1942
 msgid ""
 "Unless you have an excellent reason not to do so, you must then give some "
 "time to the maintainer to react (for example, by uploading to the "
@@ -2947,22 +3135,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1950
+#: pkgs.dbk:1949
 msgid "Upload fixing only release-critical bugs older than 7 days: 2 days"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1955
+#: pkgs.dbk:1954
 msgid "Upload fixing only release-critical and important bugs: 5 days"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1960
+#: pkgs.dbk:1959
 msgid "Other NMUs: 10 days"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1966
+#: pkgs.dbk:1965
 msgid ""
 "Those delays are only examples. In some cases, such as uploads fixing "
 "security issues, or fixes for trivial bugs that blocking a transition, it is "
@@ -2970,7 +3158,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1972
+#: pkgs.dbk:1971
 msgid ""
 "Sometimes, release managers decide to allow NMUs with shorter delays for a "
 "subset of bugs (e.g release-critical bugs older than 7 days). Also, some "
@@ -2983,7 +3171,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1982
+#: pkgs.dbk:1981
 msgid ""
 "After you upload an NMU, you are responsible for the possible problems that "
 "you might have introduced. You must keep an eye on the package (subscribing "
@@ -2991,7 +3179,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1988
+#: pkgs.dbk:1987
 msgid ""
 "This is not a license to perform NMUs thoughtlessly.  If you NMU when it is "
 "clear that the maintainers are active and would have acknowledged a patch in "
@@ -3001,35 +3189,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1998
-msgid "NMUs and debian/changelog"
-msgstr ""
+#: pkgs.dbk:1997
+msgid "NMUs and <filename>debian/changelog</filename>"
+msgstr "NMU と <filename>debian/changelog</filename>"
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2000
+#: pkgs.dbk:1999
 msgid ""
 "Just like any other (source) upload, NMUs must add an entry to "
-"<literal>debian/changelog</literal>, telling what has changed with this "
+"<filename>debian/changelog</filename>, telling what has changed with this "
 "upload.  The first line of this entry must explicitely mention that this "
 "upload is an NMU, e.g.:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
-#: pkgs.dbk:2005
-#, fuzzy, no-wrap
+#: pkgs.dbk:2004
+#, no-wrap
 msgid "  * Non-maintainer upload.\n"
-msgstr "* Non-maintainer upload"
+msgstr "  * Non-maintainer upload.\n"
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2009
+#: pkgs.dbk:2008
 msgid "The way to version NMUs differs for native and non-native packages."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2012
+#: pkgs.dbk:2011
 msgid ""
-"If the package is a native package (without a debian revision in the version "
+"If the package is a native package (without a Debian revision in the version "
 "number), the version must be the version of the last maintainer upload, plus "
 "<literal>+nmu<replaceable>X</replaceable></literal>, where <replaceable>X</"
 "replaceable> is a counter starting at <literal>1</literal>.  If the last "
@@ -3039,28 +3227,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2022
+#: pkgs.dbk:2021
 msgid ""
 "If the package is a not a native package, you should add a minor version "
-"number to the debian revision part of the version number (the portion after "
-"the last hyphen). This extra number must start at 1.  For example, if the "
-"current version is <literal>1.5-2</literal>, then an NMU would get version "
-"<literal>1.5-2.1</literal>. If a new upstream version is packaged in the "
-"NMU, the debian revision is set to <literal>0</literal>, for example "
-"<literal>1.6-0.1</literal>."
+"number to the Debian revision part of the version number (the portion after "
+"the last hyphen). This extra number must start at <literal>1</literal>.  For "
+"example, if the current version is <literal>1.5-2</literal>, then an NMU "
+"would get version <literal>1.5-2.1</literal>. If a new upstream version is "
+"packaged in the NMU, the Debian revision is set to <literal>0</literal>, for "
+"example <literal>1.6-0.1</literal>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2031
+#: pkgs.dbk:2030
 msgid ""
 "In both cases, if the last upload was also an NMU, the counter should be "
 "increased. For example, if the current version is <literal>1.5+nmu3</"
 "literal> (a native package which has already been NMUed), the NMU would get "
-"version <literal>1.5+nmu4</literal>.  ."
+"version <literal>1.5+nmu4</literal>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2037
+#: pkgs.dbk:2036
 msgid ""
 "A special versioning scheme is needed to avoid disrupting the maintainer's "
 "work, since using an integer for the Debian revision will potentially "
@@ -3071,7 +3259,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2047
+#: pkgs.dbk:2046
 msgid ""
 "If you upload a package to testing or stable, you sometimes need to \"fork\" "
 "the version number tree. This is the case for security uploads, for "
@@ -3082,24 +3270,24 @@ msgid ""
 "starting at <literal>1</literal>.  When the release number is not yet known "
 "(often the case for <literal>testing</literal>, at the beginning of release "
 "cycles), the lowest release number higher than the last stable release "
-"number must be used.  For example, while Etch (Debian 4.0) is stable, a "
+"number must be used.  For example, while Lenny (Debian 5.0) is stable, a "
 "security NMU to stable for a package at version <literal>1.5-3</literal> "
-"would have version <literal>1.5-3+deb40u1</literal>, whereas a security NMU "
-"to Lenny would get version <literal>1.5-3+deb50u1</literal>. After the "
-"release of Lenny, security uploads to the <literal>testing</literal> "
-"distribution will be versioned <literal>+deb51uZ</literal>, until it is "
-"known whether that release will be Debian 5.1 or Debian 6.0 (if that becomes "
-"the case, uploads will be versioned as <literal>+deb60uZ</literal>."
+"would have version <literal>1.5-3+deb50u1</literal>, whereas a security NMU "
+"to Squeeze would get version <literal>1.5-3+deb60u1</literal>. After the "
+"release of Squeeze, security uploads to the <literal>testing</literal> "
+"distribution will be versioned <literal>+deb61uZ</literal>, until it is "
+"known whether that release will be Debian 6.1 or Debian 7.0 (if that becomes "
+"the case, uploads will be versioned as <literal>+deb70uZ</literal>)."
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2069
+#: pkgs.dbk:2068
 msgid "Using the <literal>DELAYED/</literal> queue"
 msgstr "<literal>DELAYED/</literal> キューを使う"
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2072
+#: pkgs.dbk:2071
 msgid ""
 "Having to wait for a response after you request permission to NMU is "
 "inefficient, because it costs the NMUer a context switch to come back to the "
@@ -3113,7 +3301,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2086
+#: pkgs.dbk:2085
 msgid ""
 "The <literal>DELAYED</literal> queue should not be used to put additional "
 "pressure on the maintainer. In particular, it's important that you are "
@@ -3122,7 +3310,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2093
+#: pkgs.dbk:2092
 msgid ""
 "If you make an NMU to <literal>DELAYED</literal> and the maintainer updates "
 "his package before the delay expires, your upload will be rejected because a "
@@ -3132,12 +3320,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2103
+#: pkgs.dbk:2102
 msgid "NMUs from the maintainer's point of view"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2106
+#: pkgs.dbk:2105
 msgid ""
 "When someone NMUs your package, this means they want to help you to keep it "
 "in good shape.  This gives users fixed packages faster.  You can consider "
@@ -3147,7 +3335,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2115
+#: pkgs.dbk:2114
 msgid ""
 "To acknowledge an NMU, include its changes and changelog entry in your next "
 "maintainer upload.  If you do not acknowledge the NMU by including the NMU "
@@ -3156,12 +3344,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2124
+#: pkgs.dbk:2123
 msgid "Source NMUs vs Binary-only NMUs (binNMUs)"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2127
+#: pkgs.dbk:2126
 msgid ""
 "The full name of an NMU is <emphasis>source NMU</emphasis>.  There is also "
 "another type, namely the <emphasis>binary-only NMU</emphasis>, or "
@@ -3170,7 +3358,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2134
+#: pkgs.dbk:2133
 msgid ""
 "When a library (or other dependency) is updated, the packages using it may "
 "need to be rebuilt.  Since no changes to the source are needed, the same "
@@ -3178,29 +3366,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2140
+#: pkgs.dbk:2139
 msgid ""
 "BinNMUs are usually triggered on the buildds by wanna-build.  An entry is "
-"added to debian/changelog, explaining why the upload was needed and "
-"increasing the version number as described in <xref linkend=\"binary-only-nmu"
-"\"/>.  This entry should not be included in the next upload."
+"added to <filename>debian/changelog</filename>, explaining why the upload "
+"was needed and increasing the version number as described in <xref linkend="
+"\"binary-only-nmu\"/>.  This entry should not be included in the next upload."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2148
+#: pkgs.dbk:2147
 msgid ""
 "Buildds upload packages for their architecture to the archive as binary-only "
 "uploads.  Strictly speaking, these are binNMUs.  However, they are not "
-"normally called NMU, and they don't add an entry to debian/changelog."
+"normally called NMU, and they don't add an entry to <filename>debian/"
+"changelog</filename>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2156
+#: pkgs.dbk:2155
 msgid "NMUs vs QA uploads"
 msgstr "NMU vs QA アップロード"
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2159
+#: pkgs.dbk:2158
 msgid ""
 "NMUs are uploads of packages by somebody else than their assigned "
 "maintainer.  There is another type of upload where the uploaded package is "
@@ -3208,23 +3397,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2166
+#: pkgs.dbk:2165
 msgid ""
 "QA uploads are very much like normal maintainer uploads: they may fix "
 "anything, even minor issues; the version numbering is normal, and there is "
 "no need to use a delayed upload.  The difference is that you are not listed "
-"as the Maintainer or Uploader for the package.  Also, the changelog entry of "
-"a QA upload has a special first line:"
+"as the <literal>Maintainer</literal> or <literal>Uploader</literal> for the "
+"package.  Also, the changelog entry of a QA upload has a special first line:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: pkgs.dbk:2174
+#: pkgs.dbk:2173
 #, no-wrap
 msgid " * QA upload.\n"
 msgstr " * QA upload.\n"
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2178
+#: pkgs.dbk:2177
 msgid ""
 "If you want to do an NMU, and it seems that the maintainer is not active, it "
 "is wise to check if the package is orphaned (this information is displayed "
@@ -3236,7 +3425,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2189
+#: pkgs.dbk:2188
 msgid ""
 "Instead of doing a QA upload, you can also consider adopting the package by "
 "making yourself the maintainer.  You don't need permission from anybody to "
@@ -3244,27 +3433,52 @@ msgid ""
 "upload the new version (see <xref linkend=\"adopting\"/>)."
 msgstr ""
 
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2197
+#, fuzzy
+msgid "NMUs vs team uploads"
+msgstr "NMU vs QA アップロード"
+
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2200
+msgid ""
+"Sometimes you are fixing and/or updating a package because you are member of "
+"a packaging team (which uses a mailing list as <literal>Maintainer</literal> "
+"or <literal>Uploader</literal>, see <xref linkend=\"collaborative-maint\"/>) "
+"but you don't want to add yourself to <literal>Uploaders</literal> because "
+"you do not plan to contribute regularly to this specific package. If it "
+"conforms with your team's policy, you can perform a normal upload without "
+"being listed directly as <literal>Maintainer</literal> or <literal>Uploader</"
+"literal>. In that case, you should start your changelog entry with the "
+"following line:"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><screen>
+#: pkgs.dbk:2210
+#, fuzzy, no-wrap
+msgid " * Team upload.\n"
+msgstr " * QA upload.\n"
+
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: pkgs.dbk:2200
+#: pkgs.dbk:2218
 msgid "Collaborative maintenance"
 msgstr "共同メンテナンス"
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:2202
+#: pkgs.dbk:2220
 msgid ""
 "Collaborative maintenance is a term describing the sharing of Debian package "
 "maintenance duties by several people.  This collaboration is almost always a "
 "good idea, since it generally results in higher quality and faster bug fix "
 "turnaround times.  It is strongly recommended that packages with a priority "
-"of <literal>Standard</literal> or which are part of the base set have co-"
+"of <literal>standard</literal> or which are part of the base set have co-"
 "maintainers."
 msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:2210
+#: pkgs.dbk:2228
 msgid ""
 "Generally there is a primary maintainer and one or more co-maintainers.  The "
 "primary maintainer is the person whose name is listed in the "
@@ -3276,26 +3490,25 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:2218
+#: pkgs.dbk:2236
 msgid ""
 "In its most basic form, the process of adding a new co-maintainer is quite "
 "easy:"
 msgstr ""
 
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2224
+#: pkgs.dbk:2242
 msgid ""
 "Setup the co-maintainer with access to the sources you build the package "
 "from.  Generally this implies you are using a network-capable version "
-"control system, such as <command>CVS</command> or <command>Subversion</"
-"command>.  Alioth (see <xref linkend=\"alioth\"/> ) provides such tools, "
+"control system, such as <literal>CVS</literal> or <literal>Subversion</"
+"literal>.  Alioth (see <xref linkend=\"alioth\"/>) provides such tools, "
 "amongst others."
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2232
+#: pkgs.dbk:2250
 msgid ""
 "Add the co-maintainer's correct maintainer name and address to the "
 "<literal>Uploaders</literal> field in the first paragraph of the "
@@ -3304,100 +3517,101 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><screen>
 #. type: Content of: <chapter><section><itemizedlist><listitem><screen>
-#: pkgs.dbk:2237
+#: pkgs.dbk:2255
 #, no-wrap
 msgid "Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex &lt;arex@debian.org&gt;\n"
 msgstr "Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex &lt;arex@debian.org&gt;\n"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2242
+#: pkgs.dbk:2260
 msgid ""
-"Using the PTS (<xref linkend=\"pkg-tracking-system\"/> ), the co-maintainers "
+"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>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:2248
+#: pkgs.dbk:2266
 msgid ""
 "Another form of collaborative maintenance is team maintenance, which is "
 "recommended if you maintain several packages with the same group of "
-"developers.  In that case, the Maintainer and Uploaders field of each "
-"package must be managed with care.  It is recommended to choose between one "
-"of the two following schemes:"
+"developers.  In that case, the <literal>Maintainer</literal> and "
+"<literal>Uploaders</literal> field of each package must be managed with "
+"care.  It is recommended to choose between one of the two following schemes:"
 msgstr ""
 
-# type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: pkgs.dbk:2257
+#: pkgs.dbk:2275
 msgid ""
-"Put the team member mainly responsible for the package in the Maintainer "
-"field.  In the Uploaders, put the mailing list address, and the team members "
-"who care for the package."
+"Put the team member mainly responsible for the package in the "
+"<literal>Maintainer</literal> field.  In the <literal>Uploaders</literal>, "
+"put the mailing list address, and the team members who care for the package."
 msgstr ""
 
-# type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: pkgs.dbk:2264
+#: pkgs.dbk:2282
 msgid ""
-"Put the mailing list address in the Maintainer field.  In the Uploaders "
-"field, put the team members who care for the package.  In this case, you "
-"must make sure the mailing list accept bug reports without any human "
-"interaction (like moderation for non-subscribers)."
+"Put the mailing list address in the <literal>Maintainer</literal> field.  In "
+"the <literal>Uploaders</literal> field, put the team members who care for "
+"the package.  In this case, you must make sure the mailing list accept bug "
+"reports without any human interaction (like moderation for non-subscribers)."
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: pkgs.dbk:2272
+#: pkgs.dbk:2291
 msgid ""
 "In any case, it is a bad idea to automatically put all team members in the "
-"Uploaders field.  It clutters the Developer's Package Overview listing (see "
-"<xref linkend=\"ddpo\"/> ) with packages one doesn't really care for, and "
-"creates a false sense of good maintenance."
+"<literal>Uploaders</literal> field. It clutters the Developer's Package "
+"Overview listing (see <xref linkend=\"ddpo\"/>) with packages one doesn't "
+"really care for, and creates a false sense of good maintenance. For the same "
+"reason, team members do not need to add themselves to the "
+"<literal>Uploaders</literal> field just because they are uploading the "
+"package once, they can do a “Team upload” (see <xref linkend=\"nmu-team-"
+"upload\"/>). Conversely, it it a bad idea to keep a package with only the "
+"mailing list address as a <literal>Maintainer</literal> and no "
+"<literal>Uploaders</literal>."
 msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: pkgs.dbk:2280
+#: pkgs.dbk:2304
 msgid "The testing distribution"
 msgstr "テスト版ディストリビューション"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2282
+#: pkgs.dbk:2306
 msgid "Basics"
 msgstr "基本"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2284
+#: pkgs.dbk:2308
 msgid ""
 "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>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2289
+#: pkgs.dbk:2313
 msgid ""
 "They must be in sync on all architectures and mustn't have dependencies that "
 "make them uninstallable; they also have to have generally no known release-"
-"critical bugs at the time they're installed into <literal>testing </"
+"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>
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2298
+#: pkgs.dbk:2322
 msgid "Updates from unstable"
 msgstr "不安定版からの更新"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2300
+#: pkgs.dbk:2324
 msgid ""
 "The scripts that update the <literal>testing</literal> distribution are run "
 "twice each day, right after the installation of the updated packages; these "
@@ -3409,7 +3623,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2308
+#: pkgs.dbk:2332
 msgid ""
 "The inclusion of a package from <literal>unstable</literal> is conditional "
 "on the following:"
@@ -3417,7 +3631,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2314
+#: pkgs.dbk:2338
 msgid ""
 "The package must have been available in <literal>unstable</literal> for 2, 5 "
 "or 10 days, depending on the urgency (high, medium or low).  Please note "
@@ -3429,43 +3643,41 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2324
+#: pkgs.dbk:2348
 msgid ""
 "It must not have new release-critical bugs (RC bugs affecting the version "
 "available in <literal>unstable</literal>, but not affecting the version in "
 "<literal>testing</literal>);"
 msgstr ""
 
-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2331
+#: pkgs.dbk:2355
 msgid ""
 "It must be available on all architectures on which it has previously been "
-"built in <literal>unstable</literal>.  <xref linkend=\"dak-ls\"/> may be of "
-"interest to check that information;"
+"built in <literal>unstable</literal>. <link linkend=\"dak-ls\">dak ls</link> "
+"may be of interest to check that information;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2338
+#: pkgs.dbk:2362
 msgid ""
 "It must not break any dependency of a package which is already available in "
 "<literal>testing</literal>;"
 msgstr ""
 
-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2344
+#: pkgs.dbk:2368
 msgid ""
 "The packages on which it depends must either be available in "
 "<literal>testing</literal> or they must be accepted into <literal>testing</"
 "literal> at the same time (and they will be if they fulfill all the "
-"necessary criteria);"
+"necessary criteria)."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2352
+#: pkgs.dbk:2376
 msgid ""
 "To find out whether a package is progressing into <literal>testing</literal> "
 "or not, see the <literal>testing</literal> script output on the <ulink url="
@@ -3479,7 +3691,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2363
+#: pkgs.dbk:2387
 msgid ""
 "The <filename>update_excuses</filename> file does not always give the "
 "precise reason why the package is refused; you may have to find it on your "
@@ -3490,7 +3702,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2370
+#: pkgs.dbk:2394
 msgid ""
 "Sometimes, some packages never enter <literal>testing</literal> because the "
 "set of inter-relationship is too complicated and cannot be sorted out by the "
@@ -3499,23 +3711,22 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2375
+#: pkgs.dbk:2399
 msgid ""
 "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>
 #. type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2380
-msgid "out-of-date"
+#: pkgs.dbk:2404
+msgid "Out-of-date"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #.  FIXME: better rename this file than document rampant professionalism? 
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2383
+#: pkgs.dbk:2407
 msgid ""
 "For the <literal>testing</literal> migration script, outdated means: There "
 "are different versions in <literal>unstable</literal> for the release "
@@ -3527,65 +3738,65 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2391
+#: pkgs.dbk:2415
 msgid "Consider this example:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
-#: pkgs.dbk:2398 pkgs.dbk:2431
+#: pkgs.dbk:2422 pkgs.dbk:2455
 msgid "alpha"
 msgstr "alpha"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
-#: pkgs.dbk:2399 pkgs.dbk:2432
+#: pkgs.dbk:2423 pkgs.dbk:2456
 msgid "arm"
 msgstr "arm"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
-#: pkgs.dbk:2404 pkgs.dbk:2438 pkgs.dbk:2500
+#: pkgs.dbk:2428 pkgs.dbk:2462 pkgs.dbk:2524
 msgid "testing"
 msgstr "テスト版"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2405 pkgs.dbk:2410 pkgs.dbk:2439 pkgs.dbk:2440 pkgs.dbk:2447
+#: pkgs.dbk:2429 pkgs.dbk:2434 pkgs.dbk:2463 pkgs.dbk:2464 pkgs.dbk:2471
 msgid "1"
 msgstr "1"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2406 pkgs.dbk:2441 pkgs.dbk:2446
+#: pkgs.dbk:2430 pkgs.dbk:2465 pkgs.dbk:2470
 msgid "-"
 msgstr "-"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
-#: pkgs.dbk:2409 pkgs.dbk:2444 pkgs.dbk:2501
+#: pkgs.dbk:2433 pkgs.dbk:2468 pkgs.dbk:2525
 msgid "unstable"
 msgstr "不安定版"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2411 pkgs.dbk:2445
+#: pkgs.dbk:2435 pkgs.dbk:2469
 msgid "2"
 msgstr "2"
 
-# type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2417
+#: pkgs.dbk:2441
 msgid ""
-"The package is out of date on alpha in <literal>unstable</literal>, and will "
-"not go to <literal>testing</literal>. Removing the package would not help at "
-"all, the package is still out of date on <literal>alpha</literal>, and will "
-"not propagate to testing."
+"The package is out of date on <literal>alpha</literal> in <literal>unstable</"
+"literal>, and will not go to <literal>testing</literal>. Removing the "
+"package would not help at all, the package is still out of date on "
+"<literal>alpha</literal>, and will not propagate to <literal>testing</"
+"literal>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2423
+#: pkgs.dbk:2447
 msgid ""
 "However, if ftp-master removes a package in <literal>unstable</literal> "
 "(here on <literal>arm</literal>):"
@@ -3593,13 +3804,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
-#: pkgs.dbk:2433
+#: pkgs.dbk:2457
 msgid "hurd-i386"
 msgstr "hurd-i386"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2453
+#: pkgs.dbk:2477
 msgid ""
 "In this case, the package is up to date on all release architectures in "
 "<literal>unstable</literal> (and the extra <literal>hurd-i386</literal> "
@@ -3608,7 +3819,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2458
+#: pkgs.dbk:2482
 msgid ""
 "Sometimes, the question is raised if it is possible to allow packages in "
 "that are not yet built on all architectures: No.  Just plainly no.  (Except "
@@ -3617,13 +3828,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2465
+#: pkgs.dbk:2489
 msgid "Removals from testing"
 msgstr "テスト版からの削除"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2467
+#: pkgs.dbk:2491
 msgid ""
 "Sometimes, a package is removed to allow another package in: This happens "
 "only to allow <emphasis>another</emphasis> package to go in if it's ready in "
@@ -3632,33 +3843,31 @@ msgid ""
 "literal> may be removed to allow <literal>b</literal> in."
 msgstr ""
 
-# type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2474
+#: pkgs.dbk:2498
 msgid ""
-"Of course, there is another reason to remove a package from <literal>testing "
-"</literal>: It's just too buggy (and having a single RC-bug is enough to be "
-"in this state)."
+"Of course, there is another reason to remove a package from "
+"<literal>testing</literal>: It's just too buggy (and having a single RC-bug "
+"is enough to be in this state)."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2479
+#: pkgs.dbk:2503
 msgid ""
 "Furthermore, if a package has been removed from <literal>unstable</literal>, "
 "and no package in <literal>testing</literal> depends on it any more, then it "
 "will automatically be removed."
 msgstr ""
 
-# type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2486
-msgid "circular dependencies"
+#: pkgs.dbk:2510
+msgid "Circular dependencies"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2488
+#: pkgs.dbk:2512
 msgid ""
 "A situation which is not handled very well by britney is if package "
 "<literal>a</literal> depends on the new version of package <literal>b</"
@@ -3667,49 +3876,49 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2493
+#: pkgs.dbk:2517
 msgid "An example of this is:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2506
+#: pkgs.dbk:2530
 msgid "a"
 msgstr "a"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2507
+#: pkgs.dbk:2531
 msgid "1; depends: b=1"
 msgstr "1; depends: b=1"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2508
+#: pkgs.dbk:2532
 msgid "2; depends: b=2"
 msgstr "2; depends: b=2"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2511
+#: pkgs.dbk:2535
 msgid "b"
 msgstr "b"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2512
+#: pkgs.dbk:2536
 msgid "1; depends: a=1"
 msgstr "1; depends: a=1"
 
 # type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
 #. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2513
+#: pkgs.dbk:2537
 msgid "2; depends: a=2"
 msgstr "2; depends: a=2"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2519
+#: pkgs.dbk:2543
 msgid ""
 "Neither package <literal>a</literal> nor package <literal>b</literal> is "
 "considered for update."
@@ -3717,7 +3926,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2523
+#: pkgs.dbk:2547
 msgid ""
 "Currently, this requires some manual hinting from the release team.  Please "
 "contact them by sending mail to &email-debian-release; if this happens to "
@@ -3726,51 +3935,49 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2530
-msgid "influence of package in testing"
+#: pkgs.dbk:2554
+#, fuzzy
+msgid "Influence of package in testing"
 msgstr "テスト版パッケージへの影響"
 
-# type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2532
+#: pkgs.dbk:2556
 msgid ""
-"Generally, there is nothing that the status of a package in <literal>testing "
-"</literal> means for transition of the next version from <literal>unstable </"
-"literal> to <literal>testing</literal>, with two exceptions: If the RC-"
-"bugginess of the package goes down, it may go in even if it is still RC-"
-"buggy.  The second exception is if the version of the package in <literal> "
-"testing</literal> is out of sync on the different arches: Then any arch "
-"might just upgrade to the version of the source package; however, this can "
-"happen only if the package was previously forced through, the arch is in "
-"fuckedarches, or there was no binary package of that arch present in "
-"<literal>unstable </literal> at all during the <literal>testing</literal> "
-"migration."
+"Generally, there is nothing that the status of a package in "
+"<literal>testing</literal> means for transition of the next version from "
+"<literal>unstable</literal> to <literal>testing</literal>, with two "
+"exceptions: If the RC-bugginess of the package goes down, it may go in even "
+"if it is still RC-buggy.  The second exception is if the version of the "
+"package in <literal>testing</literal> is out of sync on the different "
+"arches: Then any arch might just upgrade to the version of the source "
+"package; however, this can happen only if the package was previously forced "
+"through, the arch is in fuckedarches, or there was no binary package of that "
+"arch present in <literal>unstable</literal> at all during the "
+"<literal>testing</literal> migration."
 msgstr ""
 
-# type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2544
+#: pkgs.dbk:2568
 msgid ""
-"In summary this means: The only influence that a package being in <literal> "
-"testing</literal> has on a new version of the same package is that the new "
-"version might go in easier."
+"In summary this means: The only influence that a package being in "
+"<literal>testing</literal> has on a new version of the same package is that "
+"the new version might go in easier."
 msgstr ""
 
-# type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2551
-msgid "details"
+#: pkgs.dbk:2575
+msgid "Details"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2553
+#: pkgs.dbk:2577
 msgid "If you are interested in details, this is how britney works:"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2556
+#: pkgs.dbk:2580
 msgid ""
 "The packages are looked at to determine whether they are valid candidates.  "
 "This gives the update excuses.  The most common reasons why a package is not "
@@ -3782,34 +3989,33 @@ msgid ""
 "the code.)"
 msgstr ""
 
-# type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2565
+#: pkgs.dbk:2589
 msgid ""
-"Now, the more complex part happens: Britney tries to update <literal>testing "
-"</literal> with the valid candidates. For that, britney tries to add each "
-"valid candidate to the testing distribution. If the number of uninstallable "
-"packages in <literal>testing</literal> doesn't increase, the package is "
-"accepted. From that point on, the accepted package is considered to be part "
-"of <literal>testing</literal>, such that all subsequent installability tests "
-"include this package.  Hints from the release team are processed before or "
-"after this main run, depending on the exact type."
+"Now, the more complex part happens: Britney tries to update "
+"<literal>testing</literal> with the valid candidates. For that, britney "
+"tries to add each valid candidate to the testing distribution. If the number "
+"of uninstallable packages in <literal>testing</literal> doesn't increase, "
+"the package is accepted. From that point on, the accepted package is "
+"considered to be part of <literal>testing</literal>, such that all "
+"subsequent installability tests include this package.  Hints from the "
+"release team are processed before or after this main run, depending on the "
+"exact type."
 msgstr ""
 
-# type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2575
+#: pkgs.dbk:2599
 msgid ""
 "If you want to see more details, you can look it up on <filename>merkel:/org/"
 "&ftp-debian-org;/testing/update_out/</filename> (or in <filename>merkel:~aba/"
 "testing/update_out</filename> to see a setup with a smaller packages file).  "
 "Via web, it's at <ulink url=\"http://&ftp-master-host;/testing/"
-"update_out_code/\"></ulink>"
+"update_out_code/\"></ulink>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2582
+#: pkgs.dbk:2606
 msgid ""
 "The hints are available via <ulink url=\"http://&ftp-master-host;/testing/"
 "hints/\"></ulink>."
@@ -3817,24 +4023,23 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2590
+#: pkgs.dbk:2614
 msgid "Direct updates to testing"
 msgstr "直接テスト版を更新する"
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2592
+#: pkgs.dbk:2616
 msgid ""
 "The <literal>testing</literal> distribution is fed with packages from "
 "<literal>unstable</literal> according to the rules explained above.  "
 "However, in some cases, it is necessary to upload packages built only for "
-"<literal> testing</literal>.  For that, you may want to upload to <literal> "
-"testing-proposed-updates</literal>."
+"<literal>testing</literal>.  For that, you may want to upload to "
+"<literal>testing-proposed-updates</literal>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2599
+#: pkgs.dbk:2623
 msgid ""
 "Keep in mind that packages uploaded there are not automatically processed, "
 "they have to go through the hands of the release manager.  So you'd better "
@@ -3843,61 +4048,57 @@ msgid ""
 "regularly give on &email-debian-devel-announce;."
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2606
+#: pkgs.dbk:2630
 msgid ""
 "You should not upload to <literal>testing-proposed-updates</literal> when "
 "you can update your packages through <literal>unstable</literal>.  If you "
 "can't (for example because you have a newer development version in "
-"<literal>unstable </literal>), you may use this facility, but it is "
+"<literal>unstable</literal>), you may use this facility, but it is "
 "recommended that you ask for authorization from the release manager first.  "
 "Even if a package is frozen, updates through <literal>unstable</literal> are "
 "possible, if the upload via <literal>unstable</literal> does not pull in any "
 "new dependencies."
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2615
+#: pkgs.dbk:2639
 msgid ""
 "Version numbers are usually selected by adding the codename of the "
 "<literal>testing</literal> distribution and a running number, like "
-"<literal>1.2sarge1</literal> for the first upload through <literal>testing-"
+"<literal>1.2squeeze1</literal> for the first upload through <literal>testing-"
 "proposed-updates</literal> of package version <literal>1.2</literal>."
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2622
+#: pkgs.dbk:2646
 msgid "Please make sure you didn't miss any of these items in your upload:"
 msgstr ""
 
-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2627
+#: pkgs.dbk:2651
 msgid ""
 "Make sure that your package really needs to go through <literal>testing-"
-"proposed-updates</literal>, and can't go through <literal> unstable</"
-"literal>;"
+"proposed-updates</literal>, and can't go through <literal>unstable</literal>;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2634
+#: pkgs.dbk:2658
 msgid "Make sure that you included only the minimal amount of changes;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2639
+#: pkgs.dbk:2663
 msgid ""
 "Make sure that you included an appropriate explanation in the changelog;"
 msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2644
+#: pkgs.dbk:2668
 msgid ""
 "Make sure that you've written <literal>testing</literal> or <literal>testing-"
 "proposed-updates</literal> into your target distribution;"
@@ -3905,7 +4106,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2650
+#: pkgs.dbk:2674
 msgid ""
 "Make sure that you've built and tested your package in <literal>testing</"
 "literal>, not in <literal>unstable</literal>;"
@@ -3913,7 +4114,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2656
+#: pkgs.dbk:2680
 msgid ""
 "Make sure that your version number is higher than the version in "
 "<literal>testing</literal> and <literal>testing-proposed-updates</literal>, "
@@ -3922,7 +4123,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2663
+#: pkgs.dbk:2687
 msgid ""
 "After uploading and successful build on all platforms, contact the release "
 "team at &email-debian-release; and ask them to approve your upload."
@@ -3930,70 +4131,67 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2671
+#: pkgs.dbk:2695
 msgid "Frequently asked questions"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2673
+#: pkgs.dbk:2697
 msgid "What are release-critical bugs, and how do they get counted?"
 msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2675
+#: pkgs.dbk:2699
 msgid ""
 "All bugs of some higher severities are by default considered release-"
 "critical; currently, these are <literal>critical</literal>, <literal>grave</"
 "literal> and <literal>serious</literal> bugs."
 msgstr ""
 
-# type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2680
+#: pkgs.dbk:2704
 msgid ""
 "Such bugs are presumed to have an impact on the chances that the package "
 "will be released with the <literal>stable</literal> release of Debian: in "
 "general, if a package has open release-critical bugs filed on it, it won't "
 "get into <literal>testing</literal>, and consequently won't be released in "
-"<literal> stable</literal>."
+"<literal>stable</literal>."
 msgstr ""
 
-# type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2687
+#: pkgs.dbk:2711
 msgid ""
 "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 "
+"<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>
 #. type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2695
+#: pkgs.dbk:2719
 msgid ""
 "How could installing a package into <literal>testing</literal> possibly "
 "break other packages?"
 msgstr ""
 
-# type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2698
+#: pkgs.dbk:2722
 msgid ""
 "The structure of the distribution archives is such that they can only "
 "contain one version of a package; a package is defined by its name.  So when "
 "the source package <literal>acmefoo</literal> is installed into "
 "<literal>testing</literal>, along with its binary packages <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."
+"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>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2706
+#: pkgs.dbk:2730
 msgid ""
 "However, the old version may have provided a binary package with an old "
 "soname of a library, such as <literal>libacme-foo0</literal>.  Removing the "
@@ -4003,7 +4201,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2712
+#: pkgs.dbk:2736
 msgid ""
 "Evidently, this mainly affects packages which provide changing sets of "
 "binary packages in different versions (in turn, mainly libraries).  However, "
@@ -4013,7 +4211,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2718
+#: pkgs.dbk:2742
 msgid ""
 "When the set of binary packages provided by a source package change in this "
 "way, all the packages that depended on the old binaries will have to be "
@@ -4028,7 +4226,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2729
+#: pkgs.dbk:2753
 msgid ""
 "If you are having problems with complicated groups of packages like this, "
 "contact &email-debian-devel; or &email-debian-release; for help."