X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=po4a%2Fja%2Fresources.po;h=60b5a2d4050305311e57905e643ba529704ccced;hb=3a21fdf32d7e222798e8a195548300a58a2f0594;hp=e8d687929742818ed89b2b370d8fa670d22eef92;hpb=c7d61e4985455a42c953a58a661b26f1f9c679af;p=developers-reference.git

diff --git a/po4a/ja/resources.po b/po4a/ja/resources.po
index e8d6879..60b5a2d 100644
--- a/po4a/ja/resources.po
+++ b/po4a/ja/resources.po
@@ -1,13 +1,14 @@
 # Debian Developer's Reference (Japanese)
-# (C) Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2008-2010.
+# (C) Hideki Yamane <henrich@debian.org>, 2008-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: developers-reference 3.4.4\n"
-"POT-Creation-Date: 2010-02-16 05:45+0900\n"
-"PO-Revision-Date: 2010-02-16 06:17+0900\n"
-"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Project-Id-Version: developers-reference 3.4.7\n"
+"POT-Creation-Date: 2012-01-11 11:49-0400\n"
+"PO-Revision-Date: 2010-10-15 10:14+0900\n"
+"Last-Translator: Hideki Yamane <henrich@debian.org>\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"
@@ -53,11 +54,11 @@ msgid ""
 msgstr ""
 "Debian 開発者 (それにユーザ) の間で交わされるやり取りの大半は "
 "<literal><ulink url=\"http://&lists-host;/\">&lists-host;</ulink></literal> "
-"で提供している広範囲に渡るメーリングリスト群で行われています。どうやって購読"
-"／解除するのか、どうやって投稿するか（あるいはしないのか）、どこで過去の投稿"
-"を見つけるのか、どうやって過去の投稿の中から探すのか、どうやってメーリングリ"
-"スト管理者と連絡をとるのか、その他メーリングリストに関する様々な情報について"
-"は <ulink url=\"&url-debian-lists;\"></ulink> を参照してください。"
+"で提供されている広範囲に渡るメーリングリスト群で行われています。どうやって購"
+"読／解除するのか、どうやって投稿するか（あるいはしないのか）、どこで過去の投"
+"稿を見つけるのか、どうやって過去の投稿の中から探すのか、どうやってメーリング"
+"リスト管理者と連絡をとるのか、その他メーリングリストに関する様々な情報につい"
+"ては <ulink url=\"&url-debian-lists;\"></ulink> を参照してください。"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
@@ -296,8 +297,8 @@ msgstr ""
 "のチャンネルは Debian で作業する人達のためのチャンネルであって、サポート用の"
 "チャンネルではありません (そのためには <literal>#debian</literal> がありま"
 "す)。このチャンネルは、こっそり覗いてみたい (そして学びたい) 人に対してもオー"
-"プンでもあります。このチャンネルのトピックは、開発者にとって興味深い情報に"
-"溢れています。"
+"プンでもあります。このチャンネルのトピックは、開発者にとって興味深い情報に溢"
+"れています。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
@@ -327,7 +328,7 @@ msgid ""
 "channels are dedicated to an architecture or a set of packages: "
 "<literal>#debian-kde</literal>, <literal>#debian-dpkg</literal>, "
 "<literal>#debian-jr</literal>, <literal>#debian-edu</literal>, "
-"<literal>#debian-oo</literal> (OpenOffice package) ..."
+"<literal>#debian-oo</literal> (OpenOffice.org package)..."
 msgstr ""
 "他にも、特定の話題について専用のチャンネルがあります。<literal>#debian-bugs</"
 "literal> は、バグ潰しパーティ (BSP) を開催するために使われます。"
@@ -337,7 +338,7 @@ msgstr ""
 "ケージ群について話すため、他にも専用チャンネルがあります：<literal>#debian-"
 "kde</literal>、<literal>#debian-dpkg</literal>、<literal>#debian-jr</"
 "literal>、<literal>#debian-edu</literal>、<literal>#debian-oo</literal> "
-"(OpenOffice パッケージ) など…"
+"(OpenOffice.org パッケージ) など…"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
@@ -456,11 +457,11 @@ msgstr ""
 msgid ""
 "Please take care to protect your Debian passwords and SSH keys installed on "
 "Debian machines.  Avoid login or upload methods which send passwords over "
-"the Internet in the clear, such as telnet, FTP, POP etc."
+"the Internet in the clear, such as Telnet, FTP, POP etc."
 msgstr ""
 "Debian で利用しているパスワードと Debian のマシンにインストールしてある SSH "
 "鍵を保護することに注意してください。ログインやアップロードの際にパスワードを"
-"インターネット越しに平文で送るような telnet や FTP や POP などの利用方法は避"
+"インターネット越しに平文で送るような Telnet や FTP や POP などの利用方法は避"
 "けてください。"
 
 # type: Content of: <chapter><section><para>
@@ -492,20 +493,22 @@ msgid ""
 "If you have a problem with the operation of a Debian server, and you think "
 "that the system operators need to be notified of this problem, you can check "
 "the list of open issues in the DSA queue of our request tracker at <ulink "
-"url=\"&url-rt;\" /> (you can login with user \"guest\" and password "
-"\"readonly\").  To report a new problem, simply send a mail to &email-rt-"
-"dsa; and make sure to put the string \"Debian RT\" somewhere in the subject."
+"url=\"&url-rt;\" /> (you can login with user \"debian\", its password is "
+"available at <filename>master.debian.org:&file-debian-rt-password;</"
+"filename>).  To report a new problem, simply send a mail to &email-rt-dsa; "
+"and make sure to put the string \"Debian RT\" somewhere in the subject."
 msgstr ""
 "Debian サーバでの作業について問題があり、システム管理者らに知らせる必要がある"
 "と考えた場合は、<ulink url=\"&url-rt;\" /> にあるリクエストトラッカーの DSA "
-"キューで公開されている問題のリストを確認できます (\"guest\" ユーザと "
-"\"readonly\" パスワードでログインできます)。新たな問題を報告するには、単に "
-"&email-rt-dsa; にメールを送ってください。\"Debian RT\" をサブジェクトのどこか"
-"に入れるのを忘れずに。"
+"キューで公開されている問題のリストを確認できます (\"debian\" ユーザと "
+"<filename>master.debian.org:&file-debian-rt-password;</filename> にあるパス"
+"ワードでログインできます)。新たな問題を報告するには、単に &email-rt-dsa; に"
+"メールを送ってください。\"Debian RT\" をサブジェクトのどこかに入れるのを忘れ"
+"ずに。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:246
+#: resources.dbk:247
 msgid ""
 "If you have a problem with a certain service, not related to the system "
 "administration (such as packages to be removed from the archive, suggestions "
@@ -520,7 +523,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:253
+#: resources.dbk:254
 msgid ""
 "Some of the core servers are restricted, but the information from there is "
 "mirrored to another server."
@@ -530,13 +533,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:257
+#: resources.dbk:258
 msgid "The bugs server"
 msgstr "バグ報告サーバ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:259
+#: resources.dbk:260
 msgid ""
 "<literal>&bugs-host;</literal> is the canonical location for the Bug "
 "Tracking System (BTS)."
@@ -546,15 +549,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:263 resources.dbk:281
-msgid "It is restricted; a mirror is available on <literal>merkel</literal>."
-msgstr ""
-"このサーバの利用は制限されています。ミラーが <literal>merkel</literal> 上で利"
-"用可能です。"
-
-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: resources.dbk:266
+#: resources.dbk:264
 msgid ""
 "If you plan on doing some statistical analysis or processing of Debian bugs, "
 "this would be the place to do it.  Please describe your plans on &email-"
@@ -567,13 +562,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:274
+#: resources.dbk:272
 msgid "The ftp-master server"
 msgstr "ftp-master サーバ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:276
+#: resources.dbk:274
 msgid ""
 "The <literal>&ftp-master-host;</literal> server holds the canonical copy of "
 "the Debian archive.  Generally, package uploaded to &ftp-upload-host; end up "
@@ -586,12 +581,22 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:284
+#: resources.dbk:279
+msgid ""
+"It is restricted; a mirror is available on <literal>&ftp-master-mirror;</"
+"literal>."
+msgstr ""
+"このサーバの利用は制限されています。ミラーが <literal>&ftp-master-mirror;</"
+"literal> 上で利用可能です。"
+
+# type: Content of: <chapter><section><section><para>
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:282
 msgid ""
 "Problems with the Debian FTP archive generally need to be reported as bugs "
 "against the <systemitem role=\"package\">&ftp-debian-org;</systemitem> "
 "pseudo-package or an email to &email-ftpmaster;, but also see the procedures "
-"in <xref linkend=\"archive-manip\"/> ."
+"in <xref linkend=\"archive-manip\"/>."
 msgstr ""
 "Debian FTP アーカイブについて問題がある場合、通常 <systemitem role=\"package"
 "\">&ftp-debian-org;</systemitem> 擬似パッケージに対するバグ報告を行うか、"
@@ -600,13 +605,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:292
+#: resources.dbk:290
 msgid "The www-master server"
 msgstr "www-master サーバ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:294
+#: resources.dbk:292
 msgid ""
 "The main web server is <literal>www-master.debian.org</literal>.  It holds "
 "the official web pages, the face of Debian for most newbies."
@@ -616,7 +621,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:298
+#: resources.dbk:296
 msgid ""
 "If you find a problem with the Debian web server, you should generally "
 "submit a bug against the pseudo-package, <systemitem role=\"package\">www."
@@ -632,13 +637,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:307
+#: resources.dbk:305
 msgid "The people web server"
 msgstr "people ウェブサーバ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:309
+#: resources.dbk:307
 msgid ""
 "<literal>people.debian.org</literal> is the server used for developers' own "
 "web pages about anything related to Debian."
@@ -648,7 +653,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:313
+#: resources.dbk:311
 msgid ""
 "If you have some Debian-specific information which you want to serve on the "
 "web, you can do this by putting material in the <filename>public_html</"
@@ -664,7 +669,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:320
+#: resources.dbk:318
 msgid ""
 "You should only use this particular location because it will be backed up, "
 "whereas on other hosts it won't."
@@ -674,7 +679,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:324
+#: resources.dbk:322
 msgid ""
 "Usually the only reason to use a different host is when you need to publish "
 "materials subject to the U.S.  export restrictions, in which case you can "
@@ -686,29 +691,29 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:329
+#: resources.dbk:327
 msgid "Send mail to &email-debian-devel; if you have any questions."
 msgstr "何か質問がある場合は、&email-debian-devel; にメールして下さい。"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:334
+#: resources.dbk:332
 msgid "The VCS servers"
 msgstr "VCS (バージョン管理システム) サーバ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:336
+#: resources.dbk:334
 msgid ""
 "If you need to use a Version Control System for any of your Debian work, you "
-"can use one the existing repositories hosted on Alioth or you can request a "
-"new project and ask for the VCS repository of your choice.  Alioth supports "
-"CVS (cvs.alioth.debian.org/cvs.debian.org), Subversion (svn.debian.org), "
-"Arch (tla/baz, both on arch.debian.org), Bazaar (bzr.debian.org), Darcs "
-"(darcs.debian.org), Mercurial (hg.debian.org) and Git (git.debian.org).  "
-"Checkout <ulink url=\"&url-alioth-pkg;\" /> if you plan to maintain packages "
-"in a VCS repository. See <xref linkend=\"alioth\"/> for information on the "
-"services provided by Alioth."
+"can use one of the existing repositories hosted on Alioth or you can request "
+"a new project and ask for the VCS repository of your choice.  Alioth "
+"supports CVS (cvs.alioth.debian.org/cvs.debian.org), Subversion (svn.debian."
+"org), Arch (tla/baz, both on arch.debian.org), Bazaar (bzr.debian.org), "
+"Darcs (darcs.debian.org), Mercurial (hg.debian.org) and Git (git.debian."
+"org).  Checkout <ulink url=\"&url-alioth-pkg;\" /> if you plan to maintain "
+"packages in a VCS repository. See <xref linkend=\"alioth\"/> for information "
+"on the services provided by Alioth."
 msgstr ""
 "あなたが行っている Debian に関連する作業にバージョン管理システムが必要であれ"
 "ば、Alioth にホストされている既存のリポジトリを使うことも新しいプロジェクトを"
@@ -722,13 +727,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:349
+#: resources.dbk:347
 msgid "chroots to different distributions"
 msgstr "複数のディストリビューション利用のために chroot を使う"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:351
+#: resources.dbk:349
 msgid ""
 "On some machines, there are chroots to different distributions available.  "
 "You can use them like this:"
@@ -738,7 +743,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
-#: resources.dbk:355
+#: resources.dbk:353
 #, no-wrap
 msgid ""
 "vore$ dchroot unstable\n"
@@ -749,11 +754,11 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:359
+#: resources.dbk:357
 msgid ""
 "In all chroots, the normal user home directories are available.  You can "
-"find out which chroots are available via <literal>&url-devel-machines;</"
-"literal>."
+"find out which chroots are available via <ulink url=\"&url-devel-machines;"
+"\"></ulink>."
 msgstr ""
 "全ての chroot 環境内で、一般ユーザの home ディレクトリが利用可能になっていま"
 "す。どの chroot が利用可能かについては <ulink url=\"&url-devel-machines;"
@@ -761,13 +766,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: resources.dbk:368
+#: resources.dbk:366
 msgid "The Developers Database"
 msgstr "開発者データベース"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:370
+#: resources.dbk:368
 msgid ""
 "The Developers Database, at <ulink url=\"&url-debian-db;\"></ulink>, is an "
 "LDAP directory for managing Debian developer attributes.  You can use this "
@@ -783,7 +788,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:378
+#: resources.dbk:376
 msgid ""
 "Developers can <ulink url=\"&url-debian-db-login;\">log into the database</"
 "ulink> to change various information about themselves, such as:"
@@ -793,25 +798,25 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:384
+#: resources.dbk:382
 msgid "forwarding address for your debian.org email"
 msgstr "debian.org アドレス宛のメールを転送するアドレス"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:389
+#: resources.dbk:387
 msgid "subscription to debian-private"
 msgstr "debian-private の購読"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:394
+#: resources.dbk:392
 msgid "whether you are on vacation"
 msgstr "休暇中かどうか"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:399
+#: resources.dbk:397
 msgid ""
 "personal information such as your address, country, the latitude and "
 "longitude of the place where you live for use in <ulink url=\"&url-worldmap;"
@@ -824,13 +829,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:407
+#: resources.dbk:405
 msgid "password and preferred shell on Debian Project machines"
 msgstr "Debian プロジェクトのマシン上でのパスワードと優先的に指定するシェル"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:412
+#: resources.dbk:410
 msgid ""
 "Most of the information is not accessible to the public, naturally.  For "
 "more information please read the online documentation that you can find at "
@@ -842,7 +847,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:417
+#: resources.dbk:415
 msgid ""
 "Developers can also submit their SSH keys to be used for authorization on "
 "the official Debian machines, and even add new *.debian.net DNS entries.  "
@@ -855,31 +860,31 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: resources.dbk:425
+#: resources.dbk:423
 msgid "The Debian archive"
 msgstr "Debian アーカイブ"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:427
+#: resources.dbk:425
 msgid ""
 "The &debian-formal; distribution consists of a lot of packages (currently "
 "around &number-of-pkgs; source packages) and a few additional files (such as "
 "documentation and installation disk images)."
 msgstr ""
-"&debian-formal; ディストリビューションは大量のパッケージ (現在約 "
-"&number-of-pkgs; 個) と幾つかの追加ファイル (ドキュメントやインストール用"
-"ディスクイメージなど) から成り立っています。"
+"&debian-formal; ディストリビューションは大量のパッケージ (現在約 &number-of-"
+"pkgs; 個) と幾つかの追加ファイル (ドキュメントやインストール用ディスクイメー"
+"ジなど) から成り立っています。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:432
+#: resources.dbk:430
 msgid "Here is an example directory tree of a complete Debian archive:"
 msgstr "以下が完全な Debian アーカイブのディレクトリツリーの例です："
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:436
+#: resources.dbk:434
 msgid ""
 "As you can see, the top-level directory contains two directories, "
 "<filename>dists/</filename> and <filename>pool/</filename>.  The latter is a "
@@ -909,7 +914,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:450
+#: resources.dbk:448
 msgid ""
 "<filename>dists/stable</filename> contains three directories, namely "
 "<filename>main</filename>, <filename>contrib</filename>, and <filename>non-"
@@ -921,40 +926,40 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:455
+#: resources.dbk:453
 msgid ""
 "In each of the areas, there is a directory for the source packages "
 "(<filename>source</filename>) and a directory for each supported "
-"architecture (<filename>binary-i386</filename>, <filename>binary-m68k</"
+"architecture (<filename>binary-i386</filename>, <filename>binary-amd64</"
 "filename>, etc.)."
 msgstr ""
 "それぞれ、source パッケージ (<filename>source</filename>) のディレクトリとサ"
 "ポートしている各アーキテクチャ (<filename>binary-i386</filename>、"
-"<filename>binary-m68k</filename> など) のディレクトリがあります。"
+"<filename>binary-amd64</filename> など) のディレクトリがあります。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:460
+#: resources.dbk:458
 msgid ""
 "The <filename>main</filename> area contains additional directories which "
 "hold the disk images and some essential pieces of documentation required for "
 "installing the Debian distribution on a specific architecture "
-"(<filename>disks-i386</filename>, <filename>disks-m68k</filename>, etc.)."
+"(<filename>disks-i386</filename>, <filename>disks-amd64</filename>, etc.)."
 msgstr ""
-"<filename>main</filename> はディスクイメージと特定のアーキテクチャで Debian "
-"をインストールする際に必要となるドキュメントの基本部分が入っている追加ディレ"
-"クトリを含んでいます (<filename>disks-i386</filename>、<filename>disks-m68k</"
-"filename> など)。"
+"<filename>main</filename> は特定のアーキテクチャ (<filename>disks-i386</"
+"filename>、<filename>disks-amd64</filename> など)上で Debian ディストリビュー"
+"ションをインストールする際に必要となるディスクイメージと主要なドキュメントの"
+"基本部分が入っている追加ディレクトリを含んでいます。"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:466
+#: resources.dbk:464
 msgid "Sections"
 msgstr "セクション"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:468
+#: resources.dbk:466
 msgid ""
 "The <literal>main</literal> section of the Debian archive is what makes up "
 "the <emphasis role=\"strong\">official &debian-formal; distribution</"
@@ -972,7 +977,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:476
+#: resources.dbk:474
 msgid ""
 "Every package in the main section must fully comply with the <ulink url="
 "\"&url-dfsg;\">Debian Free Software Guidelines</ulink> (DFSG) and with all "
@@ -988,7 +993,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:484
+#: resources.dbk:482
 msgid ""
 "Packages in the <literal>contrib</literal> section have to comply with the "
 "DFSG, but may fail other requirements.  For instance, they may depend on non-"
@@ -1000,7 +1005,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:489
+#: resources.dbk:487
 msgid ""
 "Packages which do not conform to the DFSG are placed in the <literal>non-"
 "free</literal> section.  These packages are not considered as part of the "
@@ -1016,7 +1021,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:496
+#: resources.dbk:494
 msgid ""
 "The <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> contains "
 "a more exact definition of the three sections.  The above discussion is just "
@@ -1028,7 +1033,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:501
+#: resources.dbk:499
 msgid ""
 "The separation of the three sections at the top-level of the archive is "
 "important for all people who want to distribute Debian, either via FTP "
@@ -1046,7 +1051,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:509
+#: resources.dbk:507
 msgid ""
 "On the other hand, a CD-ROM vendor could easily check the individual package "
 "licenses of the packages in <literal>non-free</literal> and include as many "
@@ -1060,7 +1065,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:515
+#: resources.dbk:513
 msgid ""
 "Note that the term section is also used to refer to categories which "
 "simplify the organization and browsing of available packages, e.g.  "
@@ -1078,13 +1083,13 @@ msgstr ""
 
 # type: Content of: <chapter>port<section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:525
+#: resources.dbk:523
 msgid "Architectures"
 msgstr "アーキテクチャ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:527
+#: resources.dbk:525
 msgid ""
 "In the first days, the Linux kernel was only available for Intel i386 (or "
 "greater) platforms, and so was Debian.  But as Linux became more and more "
@@ -1093,43 +1098,45 @@ msgid ""
 "decided to build some ports based on other Unix kernels, like <literal>hurd</"
 "literal> and <literal>kfreebsd</literal>."
 msgstr ""
-"はじめのうちは、Linux カーネルは Intel i386 (またはそれより新しい) プラットフォーム"
-"用のみが利用可能で、Debian も同様でした。しかし、Linux は日に日に広まり、カー"
-"ネルも他のアーキテクチャへと移植され、そして Debian はそれらのサポートを始めました。"
-"そして、沢山のハードウェアをサポートするだけでは飽き足らず、Debian は <literal>"
-"hurd</literal> や <literal>kfreebsd</literal> のような他の Unix カーネルをベース"
-"にした移植版を作成することを決めました。"
+"はじめのうちは、Linux カーネルは Intel i386 (またはそれより新しい) プラット"
+"フォーム用のみが利用可能で、Debian も同様でした。しかし、Linux は日に日に広ま"
+"り、カーネルも他のアーキテクチャへと移植され、そして Debian はそれらのサポー"
+"トを始めました。そして、沢山のハードウェアをサポートするだけでは飽き足らず、"
+"Debian は <literal>hurd</literal> や <literal>kfreebsd</literal> のような他"
+"の Unix カーネルをベースにした移植版を作成することを決めました。"
 
 # type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: resources.dbk:535
 # debian 5.0
+#. type: Content of: <chapter><section><section><para>
+#: resources.dbk:533
 msgid ""
 "&debian-formal; 1.3 was only available as <literal>i386</literal>.  Debian "
 "2.0 shipped for <literal>i386</literal> and <literal>m68k</literal> "
 "architectures.  Debian 2.1 shipped for the <literal>i386</literal>, "
 "<literal>m68k</literal>, <literal>alpha</literal>, and <literal>sparc</"
-"literal> architectures.  Since then Debian has grown hugely.  Debian 5 "
-"supports a total of twelve architectures: <literal>alpha</literal>, "
-"<literal>amd64</literal>, <literal>arm</literal>, <literal>armel</literal>, "
-"<literal>hppa</literal>, <literal>i386</literal>, <literal>ia64</literal>, "
+"literal> architectures.  Since then Debian has grown hugely.  Debian 6 "
+"supports a total of nine Linux architectures (<literal>amd64</literal>, "
+"<literal>armel</literal>, <literal>i386</literal>, <literal>ia64</literal>, "
 "<literal>mips</literal>, <literal>mipsel</literal>, <literal>powerpc</"
-"literal>, <literal>s390</literal>, <literal>sparc</literal>."
+"literal>, <literal>s390</literal>, <literal>sparc</literal>) and two "
+"kFreeBSD architectures (<literal>kfreebsd-i386</literal> and "
+"<literal>kfreebsd-amd64</literal>)."
 msgstr ""
 "&debian-formal; 1.3 では <literal>i386</literal> のみが利用可能でした。"
 "Debian 2.0 では、<literal>i386</literal> と <literal>m68k</literal> アーキテ"
 "クチャがリリースされました。Debian 2.1 では、<literal>i386</literal>、"
 "<literal>m68k</literal>、<literal>alpha</literal>、そして <literal>sparc</"
-"literal> アーキテクチャがリリースされました。そして、Debian は巨大に成長"
-"しました。Debian 5.0 は、合計 12 個のアーキテクチャをサポートしています: "
-"<literal>alpha</literal>, <literal>amd64</literal>, <literal>arm</literal>, "
-"<literal>armel</literal>, <literal>hppa</literal>, <literal>i386</literal>, "
-"<literal>ia64</literal>, <literal>mips</literal>, <literal>mipsel</literal>, "
-"<literal>powerpc</literal>, <literal>s390</literal>, <literal>sparc</literal> です。"
+"literal> アーキテクチャがリリースされました。そして、Debian は巨大に成長しま"
+"した。Debian 6 は、合計 9 個の Linux アーキテクチャ (<literal>amd64</"
+"literal>, <literal>armel</literal>, <literal>i386</literal>, <literal>ia64</"
+"literal>, <literal>mips</literal>, <literal>mipsel</literal>, "
+"<literal>powerpc</literal>, <literal>s390</literal>, <literal>sparc</"
+"literal>、そして 2 つの kFreeBSD アーキテクチャ (<literal>kfreebsd-i386</"
+"literal> および <literal>kfreebsd-amd64</literal>) をサポートしています。"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:548
+#: resources.dbk:546
 msgid ""
 "Information for developers and users about the specific ports are available "
 "at the <ulink url=\"&url-debian-ports;\">Debian Ports web pages</ulink>."
@@ -1139,13 +1146,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:554
+#: resources.dbk:552
 msgid "Packages"
 msgstr "パッケージ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:556
+#: resources.dbk:554
 msgid ""
 "There are two types of Debian packages, namely <literal>source</literal> and "
 "<literal>binary</literal> packages."
@@ -1154,7 +1161,7 @@ msgstr ""
 "<literal>バイナリ</literal>パッケージです。"
 
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:560
+#: resources.dbk:558
 msgid ""
 "Depending on the format of the source package, it will consist of one or "
 "more files in addition to the mandatory <filename>.dsc</filename> file:"
@@ -1164,7 +1171,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para><itemizedlist><listitem><para>
-#: resources.dbk:564
+#: resources.dbk:562
 msgid ""
 "with format “1.0”, it has either a <filename>.tar.gz</filename> file or both "
 "an <filename>.orig.tar.gz</filename> and a <filename>.diff.gz</filename> "
@@ -1175,58 +1182,57 @@ msgstr ""
 "つを持っています。"
 
 #. type: Content of: <chapter><section><section><para><itemizedlist><listitem><para>
-#: resources.dbk:567
+#: resources.dbk:565
 msgid ""
-"with format “3.0 (quilt)”, it has a mandatory <filename>.orig.tar.{gz,bz2,"
-"lzma}</filename> upstream tarball, multiple optional <filename>.orig-"
-"<replaceable>component</replaceable>.tar.{gz,bz2,lzma}</filename> additional "
-"upstream tarballs and a mandatory <filename>debian.tar.{gz,bz2,lzma}</"
+"with format “3.0 (quilt)”, it has a mandatory <filename>.orig.tar.{gz,bz2,xz}"
+"</filename> upstream tarball, multiple optional <filename>.orig-"
+"<replaceable>component</replaceable>.tar.{gz,bz2,xz}</filename> additional "
+"upstream tarballs and a mandatory <filename>debian.tar.{gz,bz2,xz}</"
 "filename> debian tarball;"
 msgstr ""
 "フォーマット“3.0 (quilt)”では、必須となる開発元の tarball である <filename>."
-"orig.tar.{gz,bz2,lzma}</filename>、それからオプションで、開発元の追加 "
-"tarball である <filename>.orig-<replaceable>component</replaceable>.tar.{gz,"
-"bz2,lzma}</filename> をいくつか、そして必須の debian tarball、"
-"<filename>debian.tar.{gz,bz2,lzma}</filename> です。"
+"orig.tar.{gz,bz2,xz}</filename>、それからオプションで、開発元の追加 tarball "
+"である <filename>.orig-<replaceable>component</replaceable>.tar.{gz,bz2,xz}</"
+"filename> をいくつか、そして必須の debian tarball、<filename>debian.tar.{gz,"
+"bz2,xz}</filename> です。"
 
 #. type: Content of: <chapter><section><section><para><itemizedlist><listitem><para>
-#: resources.dbk:573
+#: resources.dbk:571
 msgid ""
-"with format “3.0 (native)”, it has only a single <filename>.tar.{gz,bz2,lzma}"
-"</filename> tarball."
+"with format “3.0 (native)”, it has only a single <filename>.tar.{gz,bz2,xz}</"
+"filename> tarball."
 msgstr ""
-"フォーマット“3.0 (native)”では、単一の <filename>.tar.{gz,bz2,lzma}</"
-"filename> tarball のみを持っています。"
+"フォーマット“3.0 (native)”では、単一の <filename>.tar.{gz,bz2,xz}</filename> "
+"tarball のみを持っています。"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:578
+#: resources.dbk:576
 msgid ""
 "If a package is developed specially for Debian and is not distributed "
-"outside of Debian, there is just one <filename>.tar.{gz,bz2,lzma}</filename> "
+"outside of Debian, there is just one <filename>.tar.{gz,bz2,xz}</filename> "
 "file which contains the sources of the program, it's called a “native” "
 "source package.  If a package is distributed elsewhere too, the <filename>."
-"orig.tar.{gz,bz2,lzma}</filename> file stores the so-called "
-"<literal>upstream source code</literal>, that is the source code that's "
-"distributed by the <literal>upstream maintainer</literal> (often the author "
-"of the software). In this case, the <filename>.diff.gz</filename> or the "
-"<filename>debian.tar.{gz,bz2,lzma}</filename> contains the changes made by "
-"the Debian maintainer."
+"orig.tar.{gz,bz2,xz}</filename> file stores the so-called <literal>upstream "
+"source code</literal>, that is the source code that's distributed by the "
+"<literal>upstream maintainer</literal> (often the author of the software). "
+"In this case, the <filename>.diff.gz</filename> or the <filename>debian.tar."
+"{gz,bz2,xz}</filename> contains the changes made by the Debian maintainer."
 msgstr ""
 "パッケージが特に Debian 用に作られていて Debian 以外で利用されていない場合"
-"は、プログラムのソースを含んだ単純な 1 つの <filename>.tar.{gz,bz2,lzma}</"
+"は、プログラムのソースを含んだ単純な 1 つの <filename>.tar.{gz,bz2,xz}</"
 "filename> ファイルがあるだけで、“native”ソースパッケージと呼ばれます。パッ"
-"ケージが他でも配布されている場合は、<filename>.orig.tar.{gz,bz2,lzma}</"
+"ケージが他でも配布されている場合は、<filename>.orig.tar.{gz,bz2,xz}</"
 "filename> は <literal>upstream ソースコード</literal>と呼ばれるものを保持して"
 "います (訳注: upstream = 開発元)。<literal>upstream ソースコード</literal>は "
 "<literal>upstream メンテナ</literal> (大抵の場合はソフトウェアの作者) によっ"
 "て配布されているソースコードです。この場合、<filename>.diff.gz</filename> や"
-"<filename>debian.tar.{gz,bz2,lzma}</filename> は、Debian パッケージメンテナに"
+"<filename>debian.tar.{gz,bz2,xz}</filename> は、Debian パッケージメンテナに"
 "よって加えられた変更を含んでいます。"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:591
+#: resources.dbk:589
 msgid ""
 "The <filename>.dsc</filename> file lists all the files in the source package "
 "together with checksums (<command>md5sums</command>) and some additional "
@@ -1238,13 +1244,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:598
+#: resources.dbk:596
 msgid "Distributions"
 msgstr "ディストリビューション"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:600
+#: resources.dbk:598
 msgid ""
 "The directory system described in the previous chapter is itself contained "
 "within <literal>distribution directories</literal>.  Each distribution is "
@@ -1258,7 +1264,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:606
+#: resources.dbk:604
 msgid ""
 "To summarize, the Debian archive has a root directory within an FTP server.  "
 "For instance, at the mirror site, <literal>ftp.us.debian.org</literal>, the "
@@ -1274,7 +1280,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:613
+#: resources.dbk:611
 msgid ""
 "A distribution comprises Debian source and binary packages, and the "
 "respective <filename>Sources</filename> and <filename>Packages</filename> "
@@ -1292,13 +1298,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: resources.dbk:621
+#: resources.dbk:619
 msgid "Stable, testing, and unstable"
 msgstr "安定版 (stable)、テスト版 (testing)、不安定版 (unstable)"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:623
+#: resources.dbk:621
 msgid ""
 "There are always distributions called <literal>stable</literal> (residing in "
 "<filename>dists/stable</filename>), <literal>testing</literal> (residing in "
@@ -1315,7 +1321,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:630
+#: resources.dbk:628
 msgid ""
 "Active development is done in the <literal>unstable</literal> distribution "
 "(that's why this distribution is sometimes called the <literal>development "
@@ -1335,14 +1341,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:639
+#: resources.dbk:637
 msgid ""
 "The <link linkend=\"testing\">testing</link> distribution is generated "
 "automatically by taking packages from <literal>unstable</literal> if they "
 "satisfy certain criteria.  Those criteria should ensure a good quality for "
-"packages within <literal>testing</literal>.  The update to <literal>testing "
-"</literal> is launched twice each day, right after the new packages have "
-"been installed.  See <xref linkend=\"testing\"/> ."
+"packages within <literal>testing</literal>.  The update to <literal>testing</"
+"literal> is launched twice each day, right after the new packages have been "
+"installed.  See <xref linkend=\"testing\"/>."
 msgstr ""
 "<link linkend=\"testing\">テスト版 (testing)</link> ディストリビューション"
 "は、パッケージが特定の判定規準を満たした際に<literal>不安定版</literal>から自"
@@ -1354,7 +1360,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:647
+#: resources.dbk:645
 msgid ""
 "After a period of development, once the release manager deems fit, the "
 "<literal>testing</literal> distribution is frozen, meaning that the policies "
@@ -1370,7 +1376,7 @@ msgid ""
 "literal>, and a new copy is created for the new <literal>testing</literal>, "
 "and the previous <literal>stable</literal> is renamed to <literal>oldstable</"
 "literal> and stays there until it is finally archived.  On archiving, the "
-"contents are moved to <literal>&archive-host;</literal>)."
+"contents are moved to <literal>&archive-host;</literal>."
 msgstr ""
 "一定の開発期間後、リリースマネージャが適当であると決定すると、<literal>テスト"
 "版 (testing)</literal> ディストリビューションはフリーズされます。これは、"
@@ -1391,7 +1397,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:664
+#: resources.dbk:662
 msgid ""
 "This development cycle is based on the assumption that the "
 "<literal>unstable</literal> distribution becomes <literal>stable</literal> "
@@ -1404,7 +1410,7 @@ msgid ""
 "updates</filename> directory.  Those packages in <filename>proposed-updates</"
 "filename> that pass muster are periodically moved as a batch into the stable "
 "distribution and the revision level of the stable distribution is "
-"incremented (e.g., ‘3.0’ becomes ‘3.0r1’, ‘2.2r4’ becomes ‘2.2r5’, and so "
+"incremented (e.g., ‘6.0’ becomes ‘6.0.1’, ‘5.0.7’ becomes ‘5.0.8’, and so "
 "forth).  Please refer to <link linkend=\"upload-stable\">uploads to the "
 "<literal>stable</literal> distribution</link> for details."
 msgstr ""
@@ -1419,14 +1425,13 @@ msgstr ""
 "updates</filename> ディレクトリにて参照可能です。<filename>proposed-updates</"
 "filename> にある合格したこれらのパッケージは、定期的にまとめて安定版ディスト"
 "リビューションに移動され、安定版ディストリビューションのリビジョンレベルが 1 "
-"つ増えることになります (例: ‘3.0’ は ‘3.0r1’ に、‘2.2r4’ は ‘2.2r5’ になり、"
-"以下同様)。詳細に付いては、<link linkend=\"upload-stable\"><literal>安定版 "
-"(stable)</literal> ディストリビューションへのアップロード</link>を参照してく"
-"ださい。"
+"つ増えることになります (例: ‘6.0’ が ‘6.0.1’ に、‘5.0’ が ‘5.0.8’ に、以下同"
+"様)。詳細に付いては、<link linkend=\"upload-stable\"><literal>安定版 (stable)"
+"</literal> ディストリビューションへのアップロード</link>を参照してください。"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:681
+#: resources.dbk:679
 msgid ""
 "Note that development under <literal>unstable</literal> continues during the "
 "freeze period, since the <literal>unstable</literal> distribution remains in "
@@ -1439,13 +1444,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: resources.dbk:688
+#: resources.dbk:686
 msgid "More information about the testing distribution"
 msgstr "テスト版ディストリビューションについてのさらなる情報"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:690
+#: resources.dbk:688
 msgid ""
 "Packages are usually installed into the <literal>testing</literal> "
 "distribution after they have undergone some degree of testing in "
@@ -1457,7 +1462,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:694
+#: resources.dbk:692
 msgid ""
 "For more details, please see the <link linkend=\"testing\">information about "
 "the testing distribution</link>."
@@ -1467,13 +1472,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: resources.dbk:700
+#: resources.dbk:698
 msgid "Experimental"
 msgstr "試験版 (experimental)"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:702
+#: resources.dbk:700
 msgid ""
 "The <literal>experimental</literal> distribution is a special distribution.  "
 "It is not a full distribution in the same sense as <literal>stable</"
@@ -1499,7 +1504,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:714
+#: resources.dbk:712
 msgid ""
 "These are the <citerefentry> <refentrytitle>sources.list</refentrytitle> "
 "<manvolnum>5</manvolnum> </citerefentry> lines for <literal>experimental</"
@@ -1511,7 +1516,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><programlisting>
 #. type: Content of: <chapter><section><section><section><programlisting>
-#: resources.dbk:719
+#: resources.dbk:717
 #, no-wrap
 msgid ""
 "deb http://ftp.<replaceable>xy</replaceable>.debian.org/debian/ experimental main\n"
@@ -1522,7 +1527,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:723
+#: resources.dbk:721
 msgid ""
 "If there is a chance that the software could do grave damage to a system, it "
 "is likely to be better to put it into <literal>experimental</literal>.  For "
@@ -1536,7 +1541,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:729
+#: resources.dbk:727
 msgid ""
 "Whenever there is a new upstream version of a package that introduces new "
 "features but breaks a lot of old ones, it should either not be uploaded, or "
@@ -1560,7 +1565,7 @@ msgstr ""
 # type: Content of: <chapter><section><section><section><para>
 # propagate
 #. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:739
+#: resources.dbk:737
 msgid ""
 "Some experimental software can still go into <literal>unstable</literal>, "
 "with a few warnings in the description, but that isn't recommended because "
@@ -1568,7 +1573,7 @@ msgid ""
 "<literal>testing</literal> and thus to <literal>stable</literal>.  You "
 "should not be afraid to use <literal>experimental</literal> since it does "
 "not cause any pain to the ftpmasters, the experimental packages are "
-"automatically removed once you upload the package in <literal>unstable</"
+"periodically removed once you upload the package in <literal>unstable</"
 "literal> with a higher version number."
 msgstr ""
 "試験版 (experimental) のソフトウェアは<literal>不安定版 (unstable)</literal> "
@@ -1579,11 +1584,11 @@ msgstr ""
 "(experimental)</literal> を使うのをためらうべきではありません。何故なら "
 "ftpmaster には何の苦痛も与えませんし、試験版 (experimental) のパッケージは一"
 "旦<literal>不安定版 (unstable)</literal> により大きなバージョン番号でアップ"
-"ロードされると自動的に削除されるからです。"
+"ロードされると定期的に削除されるからです。"
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:749
+#: resources.dbk:747
 msgid ""
 "New software which isn't likely to damage your system can go directly into "
 "<literal>unstable</literal>."
@@ -1593,7 +1598,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:753
+#: resources.dbk:751
 msgid ""
 "An alternative to <literal>experimental</literal> is to use your personal "
 "web space on <literal>people.debian.org</literal>."
@@ -1601,29 +1606,15 @@ msgstr ""
 "<literal>試験版 (experimental)</literal> の代わりとなる方法は、"
 "<literal>people.debian.org</literal> 上の個人的な web ページを使うことです。"
 
-# type: Content of: <chapter><section><section><section><para>
-#. type: Content of: <chapter><section><section><section><para>
-#: resources.dbk:757
-msgid ""
-"When uploading to <literal>unstable</literal> a package which had bugs fixed "
-"in <literal>experimental</literal>, please consider using the option "
-"<literal>-v</literal> to <command>dpkg-buildpackage</command> to finally get "
-"them closed."
-msgstr ""
-"<literal>試験版 (experimental)</literal> のバグを修正したパッケージを"
-"<literal>不安定版 (unstable)</literal> にアップロードする際、最終的にバグをク"
-"ローズするために <command>dpkg-buildpackage</command> で <literal>-v</"
-"literal> オプションの利用を検討してください。"
-
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:767
+#: resources.dbk:759
 msgid "Release code names"
 msgstr "リリースのコードネーム"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:769
+#: resources.dbk:761
 msgid ""
 "Every released Debian distribution has a <literal>code name</literal>: "
 "Debian 1.1 is called <literal>buzz</literal>; Debian 1.2, <literal>rex</"
@@ -1631,15 +1622,16 @@ msgid ""
 "literal>; Debian 2.1, <literal>slink</literal>; Debian 2.2, <literal>potato</"
 "literal>; Debian 3.0, <literal>woody</literal>; Debian 3.1, <literal>sarge</"
 "literal>; Debian 4.0, <literal>etch</literal>; Debian 5.0, <literal>lenny</"
-"literal> and the next release will be called <literal>squeeze</literal>.  "
-"There is also a ``pseudo-distribution'', called <literal>sid</literal>, "
-"which is the current <literal>unstable</literal> distribution; since "
-"packages are moved from <literal>unstable</literal> to <literal>testing</"
-"literal> as they approach stability, <literal>sid</literal> itself is never "
-"released.  As well as the usual contents of a Debian distribution, "
-"<literal>sid</literal> contains packages for architectures which are not yet "
-"officially supported or released by Debian.  These architectures are planned "
-"to be integrated into the mainstream distribution at some future date."
+"literal>; Debian 6.0, <literal>squeeze</literal> and the next release will "
+"be called <literal>wheezy</literal>.  There is also a ``pseudo-"
+"distribution'', called <literal>sid</literal>, which is the current "
+"<literal>unstable</literal> distribution; since packages are moved from "
+"<literal>unstable</literal> to <literal>testing</literal> as they approach "
+"stability, <literal>sid</literal> itself is never released.  As well as the "
+"usual contents of a Debian distribution, <literal>sid</literal> contains "
+"packages for architectures which are not yet officially supported or "
+"released by Debian.  These architectures are planned to be integrated into "
+"the mainstream distribution at some future date."
 msgstr ""
 "リリースされた Debian ディストリビューションは全て<literal>コードネーム</"
 "literal>を持っています： Debian 1.1 は <literal>buzz</literal>、Debian 1.2 "
@@ -1647,20 +1639,20 @@ msgstr ""
 "は <literal>hamm</literal>、Debian 2.1 は <literal>slink</literal>、Debian "
 "2.2 は <literal>potato</literal>、Debian 3.0 は <literal>woody</literal>、"
 "Debian 3.1 は <literal>sarge</literal>、Debian 4.0 は <literal>etch</"
-"literal>、Debian 5.0 は <literal>lenny</literal>、そして次のリリースは"
-"<literal>squeeze</literal> と呼ばれています。<literal>sid</literal> と呼ばれ"
-"る「擬似ディストリビューション」もあり、これは現在の <literal>unstable</"
-"literal> ディストリビューションを指します。パッケージは安定に近づくと "
-"<literal>unstable</literal> から <literal>testing</literal> へと移動されるの"
-"で、<literal>sid</literal> そのものは決してリリースされません。通常の Debian "
-"ディストリビューションの内容同様に、<literal>sid</literal> は Debian ではまだ"
-"公式にサポートあるいはリリースされていないアーキテクチャのパッケージを含んで"
-"います。これらのアーキテクチャは、いつか主流ディストリビューションに統合され"
-"る予定です。"
+"literal>、Debian 5.0 は <literal>lenny</literal>、Debian 6.0 は "
+"<literal>squeeze</literal>、そして次のリリースは <literal>wheezy</literal> と"
+"呼ばれています。<literal>sid</literal> と呼ばれる「擬似ディストリビューショ"
+"ン」もあり、これは現在の <literal>unstable</literal> ディストリビューションを"
+"指します。パッケージは安定に近づくと <literal>unstable</literal> から "
+"<literal>testing</literal> へと移動されるので、<literal>sid</literal> そのも"
+"のは決してリリースされません。通常の Debian ディストリビューションの内容同様"
+"に、<literal>sid</literal> は Debian ではまだ公式にサポートあるいはリリースさ"
+"れていないアーキテクチャのパッケージを含んでいます。これらのアーキテクチャ"
+"は、いつか主流ディストリビューションに統合される予定です。"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:787
+#: resources.dbk:780
 msgid ""
 "Since Debian has an open development model (i.e., everyone can participate "
 "and follow the development) even the <literal>unstable</literal> and "
@@ -1682,7 +1674,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:797
+#: resources.dbk:790
 msgid ""
 "On the other hand, if we called the distribution directories <literal>Debian-"
 "x.y</literal> from the beginning, people would think that Debian release "
@@ -1700,35 +1692,35 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:805
+#: resources.dbk:798
 msgid ""
 "Thus, the names of the distribution directories in the archive are "
 "determined by their code names and not their release status (e.g., "
-"`slink').  These names stay the same during the development period and after "
-"the release; symbolic links, which can be changed easily, indicate the "
+"`squeeze'). These names stay the same during the development period and "
+"after the release; symbolic links, which can be changed easily, indicate the "
 "currently released stable distribution.  That's why the real distribution "
 "directories use the <literal>code names</literal>, while symbolic links for "
 "<literal>stable</literal>, <literal>testing</literal>, and "
 "<literal>unstable</literal> point to the appropriate release directories."
 msgstr ""
 "従って、アーカイブ内のディストリビューションディレクトリの名前はリリースの状"
-"態ではなくコードネームで決定されます (例えば `slink' など)。これらの名称は開"
-"発期間中とリリース後も同じものであり続けます。そして、簡単に変更可能なシンボ"
-"リックリンクによって、現在の安定版リリースディストリビューションを示すことに"
-"なります。これが、<literal>stable</literal>、<literal>testing</literal>、"
+"態ではなくコードネームで決定されます (例えば `squeeze' など)。これらの名称は"
+"開発期間中とリリース後も同じものであり続けます。そして、簡単に変更可能なシン"
+"ボリックリンクによって、現在の安定版リリースディストリビューションを示すこと"
+"になります。これが、<literal>stable</literal>、<literal>testing</literal>、"
 "<literal>unstable</literal> へのシンボリックリンクがそれぞれ相応しいリリース"
 "ディレクトリを指しているのに対して、実際のディストリビューションディレクトリ"
 "では<literal>コードネーム</literal>を使っている理由です。"
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: resources.dbk:819
+#: resources.dbk:812
 msgid "Debian mirrors"
 msgstr "Debian ミラーサーバ"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:821
+#: resources.dbk:814
 msgid ""
 "The various download archives and the web site have several mirrors "
 "available in order to relieve our canonical servers from heavy load.  In "
@@ -1752,7 +1744,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:832
+#: resources.dbk:825
 msgid ""
 "All the information on Debian mirrors, including a list of the available "
 "public FTP/HTTP servers, can be found at <ulink url=\"&url-debian-mirrors;"
@@ -1767,7 +1759,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:839
+#: resources.dbk:832
 msgid ""
 "Note that mirrors are generally run by third-parties who are interested in "
 "helping Debian.  As such, developers generally do not have accounts on these "
@@ -1779,13 +1771,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: resources.dbk:846
+#: resources.dbk:839
 msgid "The Incoming system"
 msgstr "Incoming システム"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:848
+#: resources.dbk:841
 msgid ""
 "The Incoming system is responsible for collecting updated packages and "
 "installing them in the Debian archive.  It consists of a set of directories "
@@ -1797,7 +1789,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:853
+#: resources.dbk:846
 msgid ""
 "Packages are uploaded by all the maintainers into a directory called "
 "<filename>UploadQueue</filename>.  This directory is scanned every few "
@@ -1806,17 +1798,17 @@ msgid ""
 "changes</filename>-files are moved together with their corresponding files "
 "to the <filename>unchecked</filename> directory.  This directory is not "
 "visible for most Developers, as ftp-master is restricted; it is scanned "
-"every 15 minutes by the <command>katie</command> script, which verifies the "
-"integrity of the uploaded packages and their cryptographic signatures.  If "
-"the package is considered ready to be installed, it is moved into the "
-"<filename>accepted</filename> directory.  If this is the first upload of the "
-"package (or it has new binary packages), it is moved to the <filename>new</"
-"filename> directory, where it waits for approval by the ftpmasters.  If the "
-"package contains files to be installed by hand it is moved to the "
-"<filename>byhand</filename> directory, where it waits for manual "
-"installation by the ftpmasters.  Otherwise, if any error has been detected, "
-"the package is refused and is moved to the <filename>reject</filename> "
-"directory."
+"every 15 minutes by the <command>dak process-upload</command> script, which "
+"verifies the integrity of the uploaded packages and their cryptographic "
+"signatures.  If the package is considered ready to be installed, it is moved "
+"into the <filename>done</filename> directory.  If this is the first upload "
+"of the package (or it has new binary packages), it is moved to the "
+"<filename>new</filename> directory, where it waits for approval by the "
+"ftpmasters.  If the package contains files to be installed by hand it is "
+"moved to the <filename>byhand</filename> directory, where it waits for "
+"manual installation by the ftpmasters.  Otherwise, if any error has been "
+"detected, the package is refused and is moved to the <filename>reject</"
+"filename> directory."
 msgstr ""
 "全てのメンテナによってアップロードされたパッケージは <filename>UploadQueue</"
 "filename> というディレクトリに置かれます。このディレクトリは、毎分 "
@@ -1826,8 +1818,8 @@ msgstr ""
 "<filename>unchecked</filename> ディレクトリに移動されます。このディレクトリ"
 "は ftp-master の様に制限されており、ほとんどの開発者には見えるようにはなって"
 "いません。ディレクトリはアップロードされたパッケージと暗号署名の完全性を照合"
-"する <command>katie</command> スクリプトによって15分毎にスキャンされます。"
-"パッケージがインストール可能であると判断されると、<filename>accepted</"
+"する <command>dak process-upload</command> スクリプトによって15分毎にスキャン"
+"されます。パッケージがインストール可能であると判断されると、<filename>done</"
 "filename> ディレクトリに移動されます。これがパッケージの初アップロードの場合 "
 "(あるいは新たなバイナリパッケージを含んでいる場合)、ftpmaster による許可を待"
 "つ場所である <filename>new</filename> ディレクトリに移動されます。パッケージ"
@@ -1838,13 +1830,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:872
+#: resources.dbk:865
 msgid ""
 "Once the package is accepted, the system sends a confirmation mail to the "
 "maintainer and closes all the bugs marked as fixed by the upload, and the "
 "auto-builders may start recompiling it.  The package is now publicly "
 "accessible at <ulink url=\"&url-incoming;\"></ulink> until it is really "
-"installed in the Debian archive.  This happens only once a day (and is also "
+"installed in the Debian archive.  This happens four times a day (and is also "
 "called the `dinstall run' for historical reasons); the package is then "
 "removed from incoming and installed in the pool along with all the other "
 "packages.  Once all the other updates (generating new <filename>Packages</"
@@ -1856,38 +1848,37 @@ msgstr ""
 "ロードの際に修正済みとされたバグをクローズし、auto-builder がパッケージのリコ"
 "ンパイルを始めます。Debian アーカイブに実際にインストールされるまで、パッケー"
 "ジはすぐに <ulink url=\"&url-incoming;\"></ulink> にてアクセス可能になりま"
-"す。この作業は1日1回行われます (様々な経緯から `dinstall run' とも呼ばれてい"
-"ます)。そしてパッケージは incoming から削除され、他のパッケージ全てと共に "
-"pool にインストールされます。他のすべての更新 (例えば <filename>Packages</"
+"す。この作業は 1 日に 4 回行われます (様々な経緯から `dinstall run' とも呼ば"
+"れています)。そしてパッケージは incoming から削除され、他のパッケージ全てと共"
+"に pool にインストールされます。他のすべての更新 (例えば <filename>Packages</"
 "filename> インデックスファイルや <filename>Sources</filename> インデックス"
 "ファイル) が作成されると、一次ミラー全てを更新する特別なスクリプトが呼び出さ"
 "れます。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:884
+#: resources.dbk:877
 msgid ""
 "The archive maintenance software will also send the OpenPGP/GnuPG signed "
 "<filename>.changes</filename> file that you uploaded to the appropriate "
-"mailing lists.  If a package is released with the <literal>Distribution:</"
+"mailing lists.  If a package is released with the <literal>Distribution</"
 "literal> set to <literal>stable</literal>, the announcement is sent to "
-"&email-debian-changes;.  If a package is released with <literal>Distribution:"
-"</literal> set to <literal>unstable</literal> or <literal>experimental</"
-"literal>, the announcement will be posted to &email-debian-devel-changes; "
-"instead."
+"&email-debian-changes;.  If a package is released with "
+"<literal>Distribution</literal> set to <literal>unstable</literal> or "
+"<literal>experimental</literal>, the announcement will be posted to &email-"
+"debian-devel-changes; instead."
 msgstr ""
 "アーカイブメンテナンスのソフトウェアは、あなたがアップロードした OpenPGP/"
 "GnuPG で署名された <filename>.changes</filename> ファイルも適切なメーリングリ"
-"ストへと送信します。パッケージが <literal>Distribution:</literal> として "
-"<literal>stable</literal> が設定されてリリースされた場合、案内は &email-"
-"debian-changes; に送られます。パッケージの <literal>Distribution:</literal> "
-"として <literal>unstable</literal> や <literal>experimental</literal> が設定"
-"されている場合、案内は代わりに &email-debian-devel-changes; へと投稿されま"
-"す。"
+"ストへと送信します。パッケージの <literal>Distribution</literal> が"
+"<literal>stable</literal> に設定されてリリースされた場合、案内は &email-"
+"debian-changes; に送られます。パッケージの <literal>Distribution</literal> と"
+"して <literal>unstable</literal> や <literal>experimental</literal> が設定さ"
+"れている場合、案内は代わりに &email-debian-devel-changes; へと投稿されます。"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:894
+#: resources.dbk:887
 msgid ""
 "Though ftp-master is restricted, a copy of the installation is available to "
 "all developers on <literal>&ftp-master-mirror;</literal>."
@@ -1898,19 +1889,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: resources.dbk:957
+#: resources.dbk:950
 msgid "Package information"
 msgstr "パッケージ情報"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:959
+#: resources.dbk:952
 msgid "On the web"
 msgstr "ウェブ上から"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:961
+#: resources.dbk:954
 msgid ""
 "Each package has several dedicated web pages.  <literal>http://&packages-"
 "host;/<replaceable>package-name</replaceable></literal> displays each "
@@ -1926,7 +1917,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:968
+#: resources.dbk:961
 msgid ""
 "The bug tracking system tracks bugs for each package.  You can view the bugs "
 "of a given package at the URL <literal>http://&bugs-host;/"
@@ -1938,17 +1929,17 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:975
+#: resources.dbk:968
 msgid "The <command>dak ls</command> utility"
 msgstr "<command>dak ls</command> ユーティリティ"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:977
+#: resources.dbk:970
 msgid ""
 "<command>dak ls</command> is part of the dak suite of tools, listing "
 "available package versions for all known distributions and architectures.  "
-"The <command>dak</command> tool is available on <literal>&ftp-master-host; </"
+"The <command>dak</command> tool is available on <literal>&ftp-master-host;</"
 "literal>, and on the mirror on <literal>&ftp-master-mirror;</literal>.  It "
 "uses a single argument corresponding to a package name. An example will "
 "explain it better:"
@@ -1962,7 +1953,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
-#: resources.dbk:985
+#: resources.dbk:978
 #, no-wrap
 msgid ""
 "$ dak ls evince\n"
@@ -1983,7 +1974,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:994
+#: resources.dbk:987
 msgid ""
 "In this example, you can see that the version in <literal>unstable</literal> "
 "differs from the version in <literal>testing</literal> and that there has "
@@ -1998,13 +1989,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: resources.dbk:1004
+#: resources.dbk:997
 msgid "The Package Tracking System"
 msgstr "パッケージ追跡システム"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:1006
+#: resources.dbk:999
 msgid ""
 "The Package Tracking System (PTS) is an email-based tool to track the "
 "activity of a source package.  This really means that you can get the same "
@@ -2018,7 +2009,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:1011
+#: resources.dbk:1004
 msgid ""
 "Each email sent through the PTS is classified under one of the keywords "
 "listed below.  This will let you select the mails that you want to receive."
@@ -2028,31 +2019,31 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:1015
+#: resources.dbk:1008
 msgid "By default you will get:"
 msgstr "デフォルトで受け取るもの:"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1019
+#: resources.dbk:1012
 msgid "<literal>bts</literal>"
 msgstr "<literal>bts</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1022
+#: resources.dbk:1015
 msgid "All the bug reports and following discussions."
 msgstr "バグ報告とそれに続くディスカッション全て。"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1027
+#: resources.dbk:1020
 msgid "<literal>bts-control</literal>"
 msgstr "<literal>bts-control</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1030
+#: resources.dbk:1023
 msgid ""
 "The email notifications from <email>control@&bugs-host;</email> about bug "
 "report status changes."
@@ -2062,44 +2053,44 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1036
+#: resources.dbk:1029
 msgid "<literal>upload-source</literal>"
 msgstr "<literal>upload-source</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1039
+#: resources.dbk:1032
 msgid ""
-"The email notification from <command>katie</command> when an uploaded source "
+"The email notification from <command>dak</command> when an uploaded source "
 "package is accepted."
 msgstr ""
-"アップロードされたソースパッケージが受理された際の <command>katie</command> "
-"からのメール通知。"
+"アップロードされたソースパッケージが受理された際の <command>dak</command> か"
+"らのメール通知。"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1045
+#: resources.dbk:1038
 msgid "<literal>katie-other</literal>"
 msgstr "<literal>katie-other</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1048
+#: resources.dbk:1041
 msgid ""
-"Other warning and error emails from <command>katie</command> (such as an "
+"Other warning and error emails from <command>dak</command> (such as an "
 "override disparity for the section and/or the priority field)."
 msgstr ""
-"<command>katie</command> からの他の警告／エラーメール (セクション (section) "
-"や優先度 (priority) フィールドの相違の上書きなど)。"
+"<command>dak</command> からの他の警告／エラーメール (セクション (section) や"
+"優先度 (priority) フィールドの相違の上書きなど)。"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1054
+#: resources.dbk:1047
 msgid "<literal>buildd</literal>"
 msgstr "<literal>buildd</literal>"
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1057
+#: resources.dbk:1050
 msgid ""
 "Build failures notifications sent by the network of build daemons, they "
 "contain a pointer to the build logs for analysis."
@@ -2109,13 +2100,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1063
+#: resources.dbk:1056
 msgid "<literal>default</literal>"
 msgstr "<literal>default</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1066
+#: resources.dbk:1059
 msgid ""
 "Any non-automatic email sent to the PTS by people who wanted to contact the "
 "subscribers of the package.  This can be done by sending mail to "
@@ -2131,13 +2122,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1075
+#: resources.dbk:1068
 msgid "<literal>contact</literal>"
 msgstr "<literal>contact</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1078
+#: resources.dbk:1071
 msgid ""
 "Mails sent to the maintainer through the *@packages.debian.org email aliases."
 msgstr ""
@@ -2145,12 +2136,12 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1084
+#: resources.dbk:1077
 msgid "<literal>summary</literal>"
 msgstr "<literal>summary</literal>"
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1087
+#: resources.dbk:1080
 msgid ""
 "Regular summary emails about the package's status, including progression "
 "into <literal>testing</literal>, <ulink url=\"&url-dehs;\">DEHS</ulink> "
@@ -2164,19 +2155,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:1097
+#: resources.dbk:1090
 msgid "You can also decide to receive additional information:"
 msgstr "受け取るかどうかを決められる追加情報:"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1101
+#: resources.dbk:1094
 msgid "<literal>upload-binary</literal>"
 msgstr "<literal>upload-binary</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1104
+#: resources.dbk:1097
 msgid ""
 "The email notification from <command>katie</command> when an uploaded binary "
 "package is accepted.  In other words, whenever a build daemon or a porter "
@@ -2191,13 +2182,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1112
+#: resources.dbk:1105
 msgid "<literal>cvs</literal>"
 msgstr "<literal>cvs</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1115
+#: resources.dbk:1108
 msgid ""
 "VCS commit notifications, if the package has a VCS repository and the "
 "maintainer has set up forwarding of commit notifications to the PTS. The "
@@ -2211,13 +2202,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1123
+#: resources.dbk:1116
 msgid "<literal>ddtp</literal>"
 msgstr "<literal>ddtp</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1126
+#: resources.dbk:1119
 msgid ""
 "Translations of descriptions or debconf templates submitted to the Debian "
 "Description Translation Project."
@@ -2227,28 +2218,41 @@ msgstr ""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: resources.dbk:1132
+#: resources.dbk:1125
 msgid "<literal>derivatives</literal>"
 msgstr "<literal>derivatives</literal>"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1135
+#: resources.dbk:1128
 msgid ""
 "Information about changes made to the package in derivative distributions "
 "(for example Ubuntu)."
 msgstr ""
 "派生ディストリビューションでのパッケージに加えられた変更の情報 (例 Ubuntu)。"
 
+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#. type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: resources.dbk:1134
+msgid "<literal>derivatives-bugs</literal>"
+msgstr "<literal>derivatives-bugs</literal>"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: resources.dbk:1137
+msgid ""
+"Bugs reports and comments from derivative distributions (for example Ubuntu)."
+msgstr "派生ディストリビューションでのバグレポートやコメント (例 Ubuntu)。"
+
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:1142
+#: resources.dbk:1143
 msgid "The PTS email interface"
 msgstr "PTS メールインターフェイス"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1144
+#: resources.dbk:1145
 msgid ""
 "You can control your subscription(s) to the PTS by sending various commands "
 "to <email>pts@qa.debian.org</email>."
@@ -2258,13 +2262,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1149
+#: resources.dbk:1150
 msgid "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr "<literal>subscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1152
+#: resources.dbk:1153
 msgid ""
 "Subscribes <replaceable>email</replaceable> to communications related to the "
 "source package <replaceable>sourcepackage</replaceable>.  Sender address is "
@@ -2282,13 +2286,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1162
+#: resources.dbk:1163
 msgid "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr "<literal>unsubscribe &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1165
+#: resources.dbk:1166
 msgid ""
 "Removes a previous subscription to the source package "
 "<replaceable>sourcepackage</replaceable> using the specified email address "
@@ -2300,13 +2304,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1172
+#: resources.dbk:1173
 msgid "<literal>unsubscribeall [&lt;email&gt;]</literal>"
 msgstr "<literal>unsubscribeall [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1175
+#: resources.dbk:1176
 msgid ""
 "Removes all subscriptions of the specified email address or the sender "
 "address if the second argument is left out."
@@ -2316,13 +2320,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1181
+#: resources.dbk:1182
 msgid "<literal>which [&lt;email&gt;]</literal>"
 msgstr "<literal>which [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1184
+#: resources.dbk:1185
 msgid ""
 "Lists all subscriptions for the sender or the email address optionally "
 "specified."
@@ -2331,13 +2335,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1190
+#: resources.dbk:1191
 msgid "<literal>keyword [&lt;email&gt;]</literal>"
 msgstr "<literal>keyword [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1193
+#: resources.dbk:1194
 msgid ""
 "Tells you the keywords that you are accepting.  For an explanation of "
 "keywords, <link linkend=\"pkg-tracking-system\">see above</link>.  Here's a "
@@ -2349,14 +2353,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1200
+#: resources.dbk:1201
 msgid ""
 "<literal>bts</literal>: mails coming from the Debian Bug Tracking System"
 msgstr "<literal>bts</literal>: Debian バグ追跡システムからのメール"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1205
+#: resources.dbk:1206
 msgid ""
 "<literal>bts-control</literal>: reply to mails sent to &email-bts-control;"
 msgstr ""
@@ -2364,7 +2368,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1211
+#: resources.dbk:1212
 msgid ""
 "<literal>summary</literal>: automatic summary mails about the state of a "
 "package"
@@ -2372,7 +2376,7 @@ msgstr "<literal>summary</literal>: パッケージ状態の自動サマリメ
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1217
+#: resources.dbk:1218
 msgid ""
 "<literal>contact</literal>: mails sent to the maintainer through the "
 "*@packages.debian.org aliases"
@@ -2382,20 +2386,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1223
+#: resources.dbk:1224
 msgid "<literal>cvs</literal>: notification of VCS commits"
 msgstr "<literal>cvs</literal>: VCS へのコミット通知"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1228
+#: resources.dbk:1229
 msgid ""
 "<literal>ddtp</literal>: translations of descriptions and debconf templates"
 msgstr "<literal>ddtp</literal>: description や debconf テンプレートの翻訳"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1233
+#: resources.dbk:1234
 msgid ""
 "<literal>derivatives</literal>: changes made on the package by derivative "
 "distributions"
@@ -2405,7 +2409,17 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1239
+#: resources.dbk:1240
+msgid ""
+"<literal>derivatives-bugs</literal>: bugs reports and comments from "
+"derivative distributions"
+msgstr ""
+"<literal>derivatives-bugs</literal>: 派生ディストリビューションからのバグレ"
+"ポートやコメント"
+
+# type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
+#: resources.dbk:1246
 msgid ""
 "<literal>upload-source</literal>: announce of a new source upload that has "
 "been accepted"
@@ -2415,7 +2429,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1245
+#: resources.dbk:1252
 msgid ""
 "<literal>upload-binary</literal>: announce of a new binary-only upload "
 "(porting)"
@@ -2425,7 +2439,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1251
+#: resources.dbk:1258
 msgid ""
 "<literal>katie-other</literal>: other mails from ftpmasters (override "
 "disparity, etc.)"
@@ -2435,14 +2449,14 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1257
+#: resources.dbk:1264
 msgid ""
 "<literal>buildd</literal>: build failures notifications from build daemons"
 msgstr "<literal>buildd</literal>: ビルドデーモンからのビルド失敗の通知"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para>
-#: resources.dbk:1262
+#: resources.dbk:1269
 msgid ""
 "<literal>default</literal>: all the other mails (those which aren't "
 "automatic)"
@@ -2450,13 +2464,13 @@ msgstr "<literal>default</literal>: 他のすべてのメール (自動ではな
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1269
+#: resources.dbk:1276
 msgid "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 msgstr "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;]</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1272
+#: resources.dbk:1279
 msgid ""
 "Same as the previous item but for the given source package, since you may "
 "select a different set of keywords for each source package."
@@ -2466,7 +2480,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1278
+#: resources.dbk:1285
 msgid ""
 "<literal>keyword [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</literal>"
 msgstr ""
@@ -2474,7 +2488,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1281
+#: resources.dbk:1288
 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the default set of "
@@ -2486,7 +2500,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1288
+#: resources.dbk:1295
 msgid ""
 "<literal>keywordall [&lt;email&gt;] {+|-|=} &lt;list of keywords&gt;</"
 "literal>"
@@ -2496,7 +2510,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1291
+#: resources.dbk:1298
 msgid ""
 "Accept (+) or refuse (-) mails classified under the given keyword(s).  "
 "Define the list (=) of accepted keywords.  This changes the set of accepted "
@@ -2508,7 +2522,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1298
+#: resources.dbk:1305
 msgid ""
 "<literal>keyword &lt;sourcepackage&gt; [&lt;email&gt;] {+|-|=} &lt;list of "
 "keywords&gt;</literal>"
@@ -2518,7 +2532,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1301
+#: resources.dbk:1308
 msgid ""
 "Same as previous item but overrides the keywords list for the indicated "
 "source package."
@@ -2528,20 +2542,20 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><term>
-#: resources.dbk:1307
+#: resources.dbk:1314
 msgid "<literal>quit | thanks | --</literal>"
 msgstr "<literal>quit | thanks | --</literal>"
 
 # type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><section><variablelist><varlistentry><listitem><para>
-#: resources.dbk:1310
+#: resources.dbk:1317
 msgid "Stops processing commands.  All following lines are ignored by the bot."
 msgstr ""
 "コマンド処理を終了します。これ以下の全ての行は bot からは無視されます。"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1316
+#: resources.dbk:1323
 msgid ""
 "The <command>pts-subscribe</command> command-line utility (from the "
 "<systemitem role=\"package\">devscripts</systemitem> package) can be handy "
@@ -2555,13 +2569,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:1324
+#: resources.dbk:1331
 msgid "Filtering PTS mails"
 msgstr "PTS からのメールを振り分ける"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1326
+#: resources.dbk:1333
 msgid ""
 "Once you are subscribed to a package, you will get the mails sent to "
 "<literal><replaceable>sourcepackage</replaceable>@&pts-host;</literal>.  "
@@ -2579,7 +2593,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1334
+#: resources.dbk:1341
 msgid ""
 "Here is an example of added headers for a source upload notification on the "
 "<systemitem role=\"package\">dpkg</systemitem> package:"
@@ -2589,7 +2603,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
-#: resources.dbk:1338
+#: resources.dbk:1345
 #, no-wrap
 msgid ""
 "X-Loop: dpkg@&pts-host;\n"
@@ -2604,13 +2618,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:1346
+#: resources.dbk:1353
 msgid "Forwarding VCS commits in the PTS"
 msgstr "PTS での VCS コミットを転送する"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1348
+#: resources.dbk:1355
 msgid ""
 "If you use a publicly accessible VCS repository for maintaining your Debian "
 "package, you may want to forward the commit notification to the PTS so that "
@@ -2623,7 +2637,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1354
+#: resources.dbk:1361
 msgid ""
 "Once you set up the VCS repository to generate commit notifications, you "
 "just have to make sure it sends a copy of those mails to "
@@ -2642,7 +2656,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1363
+#: resources.dbk:1370
 msgid ""
 "For Subversion repositories, the usage of svnmailer is recommended.  See "
 "<ulink url=\"&url-alioth-pkg;\" /> for an example on how to do it."
@@ -2652,19 +2666,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:1369
+#: resources.dbk:1376
 msgid "The PTS web interface"
 msgstr "PTS ウェブインターフェイス"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1371
+#: resources.dbk:1378
 msgid ""
 "The PTS has a web interface at <ulink url=\"http://&pts-host;/\"></ulink> "
 "that puts together a lot of information about each source package.  It "
 "features many useful links (BTS, QA stats, contact information, DDTP "
 "translation status, buildd logs) and gathers much more information from "
-"various places (30 latest changelog entries, testing status, ...).  It's a "
+"various places (30 latest changelog entries, testing status, etc.).  It's a "
 "very useful tool if you want to know what's going on with a specific source "
 "package.  Furthermore there's a form that allows easy subscription to the "
 "PTS via email."
@@ -2678,7 +2692,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1381
+#: resources.dbk:1388
 msgid ""
 "You can jump directly to the web page concerning a specific source package "
 "with a URL like <literal>http://&pts-host;/<replaceable>sourcepackage</"
@@ -2690,7 +2704,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1386
+#: resources.dbk:1393
 msgid ""
 "This web interface has been designed like a portal for the development of "
 "packages: you can add custom content on your packages' pages.  You can add "
@@ -2704,13 +2718,13 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1392
+#: resources.dbk:1399
 msgid "Static news items can be used to indicate:"
 msgstr "固定ニュースは以下を表示するのに利用できます:"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1397
+#: resources.dbk:1404
 msgid ""
 "the availability of a project hosted on <link linkend=\"alioth\">Alioth</"
 "link> for co-maintaining the package"
@@ -2720,25 +2734,25 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1403
+#: resources.dbk:1410
 msgid "a link to the upstream web site"
 msgstr "upstream のウェブサイトへのリンク"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1408
+#: resources.dbk:1415
 msgid "a link to the upstream bug tracker"
 msgstr "upstream のバグ追跡システムへのリンク"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1413
+#: resources.dbk:1420
 msgid "the existence of an IRC channel dedicated to the software"
 msgstr "ソフトウェア専用 IRC チャンネルの存在"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1418
+#: resources.dbk:1425
 msgid ""
 "any other available resource that could be useful in the maintenance of the "
 "package"
@@ -2746,56 +2760,56 @@ msgstr "パッケージのメンテナンスについて、他の利用可能な
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1424
+#: resources.dbk:1431
 msgid "Usual news items may be used to announce that:"
 msgstr "通常のニュースは以下のアナウンスに使われます:"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1429
+#: resources.dbk:1436
 msgid "beta packages are available for testing"
 msgstr "テスト用にベータ版パッケージが準備できたこと"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1434
+#: resources.dbk:1441
 msgid "final packages are expected for next week"
 msgstr "来週に最終的なパッケージが期待されている"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1439
+#: resources.dbk:1446
 msgid "the packaging is about to be redone from scratch"
 msgstr "パッケージをスクラッチから再構築中"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1444
+#: resources.dbk:1451
 msgid "backports are available"
 msgstr "バックポート版が利用可能"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1449
+#: resources.dbk:1456
 msgid ""
 "the maintainer is on vacation (if they wish to publish this information)"
 msgstr "メンテナが休暇中 (この情報を公開したい場合に表示)"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1454
+#: resources.dbk:1461
 msgid "a NMU is being worked on"
 msgstr "NMU 進行中"
 
 # type: Content of: <chapter><section><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: resources.dbk:1459
+#: resources.dbk:1466
 msgid "something important will affect the package"
 msgstr "何かパッケージに重要な影響を与える事柄"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1464
+#: resources.dbk:1471
 msgid ""
 "Both kinds of news are generated in a similar manner: you just have to send "
 "an email either to <email>pts-static-news@qa.debian.org</email> or to "
@@ -2817,19 +2831,19 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1475
+#: resources.dbk:1482
 msgid ""
 "Here are a few examples of valid mails used to generate news items in the "
-"PTS.  The first one adds a link to the cvsweb interface of debian-cd in the "
+"PTS.  The first one adds a link to the viewsvn interface of debian-cd in the "
 "Static information section:"
 msgstr ""
 "PTS 中のニュース項目の生成に使われる正しいメールの例を幾つか挙げます。最初の1"
-"つ目は Static information section 中の debian-cd の cvsweb インターフェイスへ"
-"のリンクを付け加えるものです:"
+"つ目は Static information section 中の debian-cd の viewsvn インターフェイス"
+"へのリンクを付け加えるものです:"
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
-#: resources.dbk:1480
+#: resources.dbk:1487
 #, no-wrap
 msgid ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
@@ -2848,7 +2862,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1488
+#: resources.dbk:1495
 msgid ""
 "The second one is an announcement sent to a mailing list which is also sent "
 "to the PTS so that it is published on the PTS web page of the package.  Note "
@@ -2860,7 +2874,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><section><screen>
 #. type: Content of: <chapter><section><section><screen>
-#: resources.dbk:1493
+#: resources.dbk:1500
 #, no-wrap
 msgid ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
@@ -2878,20 +2892,17 @@ msgstr ""
 "From: Raphael Hertzog &lt;hertzog@debian.org&gt;\n"
 "To: debian-gtk-gnome@&lists-host;\n"
 "Bcc: pts-news@qa.debian.org\n"
-"Subject: Galeon 2.0 backported for woody (woody 用 Galeon 2.0 バックポート)\n"
+"Subject: Galeon 2.0 backported for woody\n"
 "X-PTS-Package: galeon\n"
 "\n"
-"Hello gnomers! (やぁ、gnome が大好きな皆さん!)\n"
+"Hello gnomers!\n"
 "\n"
 "I'm glad to announce that galeon has been backported for woody. You'll find\n"
 "everything here:\n"
-"(galeon を woody 用にバックポートしたのをお知らせできるのを嬉しく思います。\n"
-"詳しくは以下を参照してください):\n"
-"...\n"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1506
+#: resources.dbk:1513
 msgid ""
 "Think twice before adding a news item to the PTS because you won't be able "
 "to remove it later and you won't be able to edit it either.  The only thing "
@@ -2905,13 +2916,13 @@ msgstr ""
 # type: Content of: <chapter><section><title>
 # ページ名が訳されないのでそのままにしてある
 #. type: Content of: <chapter><section><title>
-#: resources.dbk:1516
+#: resources.dbk:1523
 msgid "Developer's packages overview"
 msgstr "Developer's packages overview"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:1518
+#: resources.dbk:1525
 msgid ""
 "A QA (quality assurance) web portal is available at <ulink url=\"&url-ddpo;"
 "\"></ulink> which displays a table listing all the packages of a single "
@@ -2929,7 +2940,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:1527
+#: resources.dbk:1534
 msgid ""
 "It is a good idea to look up your own data regularly so that you don't "
 "forget any open bugs, and so that you don't forget which packages are your "
@@ -2940,30 +2951,30 @@ msgstr ""
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: resources.dbk:1534
+#: resources.dbk:1541
 msgid "Debian's FusionForge installation: Alioth"
 msgstr "Debian での FusionForge の導入例: Alioth"
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:1536
+#: resources.dbk:1543
 msgid ""
 "Alioth is a Debian service based on a slightly modified version of the "
 "FusionForge software (which evolved from SourceForge and GForge). This "
 "software offers developers access to easy-to-use tools such as bug trackers, "
 "patch manager, project/task managers, file hosting services, mailing lists, "
-"CVS repositories etc.  All these tools are managed via a web interface."
+"VCS repositories etc.  All these tools are managed via a web interface."
 msgstr ""
 "Alioth は FusionForge (SourceForge と GForge から派生したソフトウェア) に多少"
 "変更を加えたものを基にした Debian のサービスです。このソフトは開発者が容易に"
 "使えるバグトラッキングシステム、パッチ管理、プロジェクト／タスク管理、ファイ"
-"ルのアップロード、メーリングリスト、CVS リポジトリなどのツールを提供します。"
+"ルのアップロード、メーリングリスト、VCS リポジトリなどのツールを提供します。"
 "これらの機能全てはウェブインターフェイスから管理します。"
 
 # type: Content of: <chapter><section><para>
 # FIXME: too long line...
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:1543
+#: resources.dbk:1550
 msgid ""
 "It is intended to provide facilities to free software projects backed or led "
 "by Debian, facilitate contributions from external developers to projects "
@@ -2980,7 +2991,7 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:1550
+#: resources.dbk:1557
 msgid ""
 "All Debian developers automatically have an account on Alioth.  They can "
 "activate it by using the recover password facility.  External developers can "
@@ -2992,49 +3003,49 @@ msgstr ""
 
 # type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: resources.dbk:1555
+#: resources.dbk:1562
 msgid "For more information please visit the following links:"
 msgstr "詳細な情報については、以下のリンクを参照下さい："
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:1558
+#: resources.dbk:1565
 msgid "<ulink url=\"&url-alioth-wiki;\" />"
 msgstr "<ulink url=\"&url-alioth-wiki;\" />"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:1559
+#: resources.dbk:1566
 msgid "<ulink url=\"&url-alioth-faq;\" />"
 msgstr "<ulink url=\"&url-alioth-faq;\" />"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:1560
+#: resources.dbk:1567
 msgid "<ulink url=\"&url-alioth-pkg;\" />"
 msgstr "<ulink url=\"&url-alioth-pkg;\" />"
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: resources.dbk:1561
+#: resources.dbk:1568
 msgid "<ulink url=\"&url-alioth;\" />"
 msgstr "<ulink url=\"&url-alioth;\" />"
 
 # type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: resources.dbk:1566
+#: resources.dbk:1573
 msgid "Goodies for Developers"
 msgstr "開発者への特典"
 
 # type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:1568
+#: resources.dbk:1575
 msgid "LWN Subscriptions"
 msgstr "LWN の購読"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1570
+#: resources.dbk:1577
 msgid ""
 "Since October of 2002, HP has sponsored a subscription to LWN for all "
 "interested Debian developers.  Details on how to get access to this benefit "
@@ -3047,13 +3058,13 @@ msgstr ""
 "い。"
 
 #. type: Content of: <chapter><section><section><title>
-#: resources.dbk:1577
+#: resources.dbk:1584
 msgid "Gandi.net Hosting Discount"
 msgstr "Gandi.net ホスティング割引"
 
 # type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: resources.dbk:1579
+#: resources.dbk:1586
 msgid ""
 "As of November 2008, Gandi.net offers a discount rate on their VPS hosting "
 "for Debian Developers.  See <ulink url=\"http://&lists-host;/debian-devel-"
@@ -3063,6 +3074,18 @@ msgstr ""
 "で提供しています。<ulink url=\"http://&lists-host;/debian-devel-"
 "announce/2008/11/msg00004.html\"></ulink>を参照してください。"
 
+# type: Content of: <chapter><section><section><section><para>
+#~ msgid ""
+#~ "When uploading to <literal>unstable</literal> a package which had bugs "
+#~ "fixed in <literal>experimental</literal>, please consider using the "
+#~ "option <literal>-v</literal> to <command>dpkg-buildpackage</command> to "
+#~ "finally get them closed."
+#~ msgstr ""
+#~ "<literal>試験版 (experimental)</literal> のバグを修正したパッケージを"
+#~ "<literal>不安定版 (unstable)</literal> にアップロードする際、最終的にバグ"
+#~ "をクローズするために <command>dpkg-buildpackage</command> で <literal>-v</"
+#~ "literal> オプションの利用を検討してください。"
+
 # type: Content of: <chapter><section><section><para>
 #~ msgid ""
 #~ "The Linux 2.0 kernel supports Intel x86, DEC Alpha, SPARC, Motorola 680x0 "