X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/c55451ff2e5a098a6431dfd1be322f7113a86002..191f736c1fa737e0513e8e00c736b8488ee87f7c:/doc/po/ja.po?ds=sidebyside

diff --git a/doc/po/ja.po b/doc/po/ja.po
index ba04b200f..92949fd4e 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -1,46 +1,47 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of apt package man pages
+# Copyright (C) 2003-2010 Debian Japanese List <debian-japanese@lists.debian.org>
+# This file is distributed under the same license as the apt package.
 #
+# Translators:
+# KURASAWA Nozomu, 2003-2006, 2009-2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
-"PO-Revision-Date: 2009-07-30 22:55+0900\n"
+"Project-Id-Version: apt 0.7.25.3\n"
+"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+"POT-Creation-Date: 2012-05-24 15:57+0300\n"
+"PO-Revision-Date: 2010-09-07 07:38+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-# type: TH
 #. type: TH
 #: apt.8:17
 #, no-wrap
 msgid "apt"
 msgstr "apt"
 
-# type: TH
 #. type: TH
 #: apt.8:17
 #, no-wrap
 msgid "16 June 1998"
 msgstr "16 June 1998"
 
-# type: TH
 #. type: TH
 #: apt.8:17
 #, no-wrap
-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "Debian"
+msgstr "Debian"
 
 # type: SH
 #. type: SH
 #: apt.8:18
 #, no-wrap
 msgid "NAME"
-msgstr "名称"
+msgstr "名前"
 
 # type: Plain text
 #. type: Plain text
@@ -77,41 +78,21 @@ msgid ""
 "(8)  for the command line or B<synaptic>(8)  for the X Window System. Some "
 "options are only implemented in B<apt-get>(8)  though."
 msgstr ""
-"APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理には、コ"
-"マンドライン用には B<aptitude>(8)、X Window System 用には B<synaptic>(8) と"
-"いった、いくつかのフロントエンドが用意されています。しかし、いくつかのオプ"
-"ションは B<apt-get>(8) にしか実装されていません。"
+"APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理のため"
+"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の B<synaptic>"
+"(8) といった、いくつかのフロントエンドが用意されています。いくつかのオプショ"
+"ンは B<apt-get>(8) にしか実装されていません。"
 
 # type: SH
 #. type: SH
 #: apt.8:31
 #, no-wrap
-msgid "OPTIONS"
-msgstr "オプション"
-
-# type: Plain text
-#. type: Plain text
-#: apt.8:33 apt.8:35
-msgid "None."
-msgstr "なし。"
-
-# type: SH
-#. type: SH
-#: apt.8:33
-#, no-wrap
-msgid "FILES"
-msgstr "ファイル"
-
-# type: SH
-#. type: SH
-#: apt.8:35
-#, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 # type: Plain text
 #. type: Plain text
-#: apt.8:42
+#: apt.8:38
 msgid ""
 "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
 "B<apt_preferences>(5), B<apt-secure>(8)"
@@ -121,33 +102,33 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: apt.8:42
+#: apt.8:38
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr "診断メッセージ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Plain text
-#: apt.8:44
+#: apt.8:40
 msgid "apt returns zero on normal operation, decimal 100 on error."
 msgstr "apt は正常終了時に 0 を返します。エラー時には十進の 100 を返します。"
 
 # type: SH
 #. type: SH
-#: apt.8:44
+#: apt.8:40
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 # type: Plain text
 #. type: Plain text
-#: apt.8:46
+#: apt.8:42
 msgid "This manpage isn't even started."
 msgstr "このマニュアルページは、始まってさえいません。"
 
 # type: Plain text
 #. type: Plain text
-#: apt.8:55
+#: apt.8:51
 msgid ""
 "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
 "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
@@ -159,570 +140,22 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: apt.8:55
+#: apt.8:51
 #, no-wrap
 msgid "AUTHOR"
 msgstr "著者"
 
 # type: Plain text
 #. type: Plain text
-#: apt.8:56
+#: apt.8:52
 msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
 msgstr ""
-"apt は the APT team E<lt>apt@packages.debian.orgE<gt> によって書かれました。"
-
-#. type: Plain text
-#: apt.ent:2
-msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
-
-#. type: Plain text
-#: apt.ent:10
-msgid ""
-"<!-- Some common paths.. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> <!"
-"ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex "
-"\"<filename>&docdir;examples/configure-index.gz</filename>\"> <!ENTITY "
-"aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/var/"
-"lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">"
-msgstr ""
-"<!-- Some common paths.. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> <!"
-"ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex "
-"\"<filename>&docdir;examples/configure-index.gz</filename>\"> <!ENTITY "
-"aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/var/"
-"lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">"
-
-#. type: Plain text
-#: apt.ent:17
-#, no-wrap
-msgid ""
-"<!-- Cross references to other man pages -->\n"
-"<!ENTITY apt-conf \"<citerefentry>\n"
-"    <refentrytitle><filename>apt.conf</filename></refentrytitle>\n"
-"    <manvolnum>5</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!-- Cross references to other man pages -->\n"
-"<!ENTITY apt-conf \"<citerefentry>\n"
-"    <refentrytitle><filename>apt.conf</filename></refentrytitle>\n"
-"    <manvolnum>5</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:23
-#, no-wrap
-msgid ""
-"<!ENTITY apt-get \"<citerefentry>\n"
-"    <refentrytitle><command>apt-get</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-get \"<citerefentry>\n"
-"    <refentrytitle><command>apt-get</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:29
-#, no-wrap
-msgid ""
-"<!ENTITY apt-config \"<citerefentry>\n"
-"    <refentrytitle><command>apt-config</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-config \"<citerefentry>\n"
-"    <refentrytitle><command>apt-config</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:35
-#, no-wrap
-msgid ""
-"<!ENTITY apt-cdrom \"<citerefentry>\n"
-"    <refentrytitle><command>apt-cdrom</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-cdrom \"<citerefentry>\n"
-"    <refentrytitle><command>apt-cdrom</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:41
-#, no-wrap
-msgid ""
-"<!ENTITY apt-cache \"<citerefentry>\n"
-"    <refentrytitle><command>apt-cache</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-cache \"<citerefentry>\n"
-"    <refentrytitle><command>apt-cache</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:47
-#, no-wrap
-msgid ""
-"<!ENTITY apt-preferences \"<citerefentry>\n"
-"    <refentrytitle><command>apt_preferences</command></refentrytitle>\n"
-"    <manvolnum>5</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-preferences \"<citerefentry>\n"
-"    <refentrytitle><command>apt_preferences</command></refentrytitle>\n"
-"    <manvolnum>5</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:53
-#, no-wrap
-msgid ""
-"<!ENTITY apt-key \"<citerefentry>\n"
-"    <refentrytitle><command>apt-key</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-key \"<citerefentry>\n"
-"    <refentrytitle><command>apt-key</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:59
-#, no-wrap
-msgid ""
-"<!ENTITY apt-secure \"<citerefentry>\n"
-"    <refentrytitle>apt-secure</refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-secure \"<citerefentry>\n"
-"    <refentrytitle>apt-secure</refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:65
-#, no-wrap
-msgid ""
-"<!ENTITY apt-ftparchive \"<citerefentry>\n"
-"    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY apt-ftparchive \"<citerefentry>\n"
-"    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:72
-#, no-wrap
-msgid ""
-"<!ENTITY sources-list \"<citerefentry>\n"
-"    <refentrytitle><filename>sources.list</filename></refentrytitle>\n"
-"    <manvolnum>5</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY sources-list \"<citerefentry>\n"
-"    <refentrytitle><filename>sources.list</filename></refentrytitle>\n"
-"    <manvolnum>5</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:78
-#, no-wrap
-msgid ""
-"<!ENTITY reportbug \"<citerefentry>\n"
-"    <refentrytitle><command>reportbug</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY reportbug \"<citerefentry>\n"
-"    <refentrytitle><command>reportbug</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:84
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg \"<citerefentry>\n"
-#| "    <refentrytitle><command>dpkg</command></refentrytitle>\n"
-#| "    <manvolnum>8</manvolnum>\n"
-#| "  </citerefentry>\"\n"
-#| ">\n"
-msgid ""
-"<!ENTITY dpkg \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY dpkg \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:90
-#, no-wrap
-msgid ""
-"<!ENTITY dpkg-buildpackage \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY dpkg-buildpackage \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:96
-#, no-wrap
-msgid ""
-"<!ENTITY gzip \"<citerefentry>\n"
-"    <refentrytitle><command>gzip</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY gzip \"<citerefentry>\n"
-"    <refentrytitle><command>gzip</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:102
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
-#| "    <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-#| "    <manvolnum>8</manvolnum>\n"
-#| "  </citerefentry>\"\n"
-#| ">\n"
-msgid ""
-"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:108
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scansources \"<citerefentry>\n"
-#| "    <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-#| "    <manvolnum>8</manvolnum>\n"
-#| "  </citerefentry>\"\n"
-#| ">\n"
-msgid ""
-"<!ENTITY dpkg-scansources \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY dpkg-scansources \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:114
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dselect \"<citerefentry>\n"
-#| "    <refentrytitle><command>dselect</command></refentrytitle>\n"
-#| "    <manvolnum>8</manvolnum>\n"
-#| "  </citerefentry>\"\n"
-#| ">\n"
-msgid ""
-"<!ENTITY dselect \"<citerefentry>\n"
-"    <refentrytitle><command>dselect</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY dselect \"<citerefentry>\n"
-"    <refentrytitle><command>dselect</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:120
-#, no-wrap
-msgid ""
-"<!ENTITY aptitude \"<citerefentry>\n"
-"    <refentrytitle><command>aptitude</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY aptitude \"<citerefentry>\n"
-"    <refentrytitle><command>aptitude</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:126
-#, no-wrap
-msgid ""
-"<!ENTITY synaptic \"<citerefentry>\n"
-"    <refentrytitle><command>synaptic</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY synaptic \"<citerefentry>\n"
-"    <refentrytitle><command>synaptic</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:132
-#, no-wrap
-msgid ""
-"<!ENTITY debsign \"<citerefentry>\n"
-"    <refentrytitle><command>debsign</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY debsign \"<citerefentry>\n"
-"    <refentrytitle><command>debsign</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:138
-#, no-wrap
-msgid ""
-"<!ENTITY debsig-verify \"<citerefentry>\n"
-"    <refentrytitle><command>debsig-verify</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY debsig-verify \"<citerefentry>\n"
-"    <refentrytitle><command>debsig-verify</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:144
-#, no-wrap
-msgid ""
-"<!ENTITY gpg \"<citerefentry>\n"
-"    <refentrytitle><command>gpg</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY gpg \"<citerefentry>\n"
-"    <refentrytitle><command>gpg</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:150
-#, no-wrap
-msgid ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:156
-#, no-wrap
-msgid ""
-"<!ENTITY wajig \"<citerefentry>\n"
-"    <refentrytitle><command>wajig</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY wajig \"<citerefentry>\n"
-"    <refentrytitle><command>wajig</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:168
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!-- Boiler plate docinfo section -->\n"
-#| "<!ENTITY apt-docinfo \"\n"
-#| " <refentryinfo>\n"
-#| "   <address><email>apt@packages.debian.org</email></address>\n"
-#| "   <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>\n"
-#| "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
-#| "   <date>28 October 2008</date>\n"
-#| "   <productname>Linux</productname>\n"
-msgid ""
-"<!-- Boiler plate docinfo section -->\n"
-"<!ENTITY apt-docinfo \"\n"
-" <refentryinfo>\n"
-"   <address><email>apt@packages.debian.org</email></address>\n"
-"   <author>\n"
-"     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
-"     <contrib></contrib>\n"
-"   </author>\n"
-"   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
-"   <date>28 October 2008</date>\n"
-"   <productname>Linux</productname>\n"
-msgstr ""
-"<!-- Boiler plate docinfo section -->\n"
-"<!ENTITY apt-docinfo \"\n"
-" <refentryinfo>\n"
-"   <address><email>apt@packages.debian.org</email></address>\n"
-"   <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>\n"
-"   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
-"   <date>28 October 2008</date>\n"
-"   <productname>Linux</productname>\n"
-
-#. type: Plain text
-#: apt.ent:171
-#, no-wrap
-msgid ""
-" </refentryinfo>\n"
-"\"> \n"
-msgstr ""
-" </refentryinfo>\n"
-"\"> \n"
+"apt は APT チーム E<lt>apt@packages.debian.orgE<gt> によって書かれました。"
 
 #. type: Plain text
-#: apt.ent:177
+#: apt.ent:7
 #, no-wrap
 msgid ""
-"<!ENTITY apt-email \"\n"
-"   <address>\n"
-"    <email>apt@packages.debian.org</email>\n"
-"   </address>\n"
-"\">\n"
-msgstr ""
-"<!ENTITY apt-email \"\n"
-"   <address>\n"
-"    <email>apt@packages.debian.org</email>\n"
-"   </address>\n"
-"\">\n"
-
-#. type: Plain text
-#: apt.ent:185
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY apt-author.jgunthorpe \"\n"
-#| "   <author>\n"
-#| "    <firstname>Jason</firstname>\n"
-#| "    <surname>Gunthorpe</surname>\n"
-#| "   </author>\n"
-#| "\">\n"
-msgid ""
-"<!ENTITY apt-author.jgunthorpe \"\n"
-"   <author>\n"
-"    <firstname>Jason</firstname>\n"
-"    <surname>Gunthorpe</surname>\n"
-"    <contrib></contrib>\n"
-"   </author>\n"
-"\">\n"
-msgstr ""
-"<!ENTITY apt-author.jgunthorpe \"\n"
-"   <author>\n"
-"    <firstname>Jason</firstname>\n"
-"    <surname>Gunthorpe</surname>\n"
-"   </author>\n"
-"\">\n"
-
-#. type: Plain text
-#: apt.ent:193
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY apt-author.moconnor \"\n"
-#| "   <author>\n"
-#| "    <firstname>Mike</firstname>\n"
-#| "    <surname>O'Connor</surname>\n"
-#| "   </author>\n"
-#| "\">\n"
-msgid ""
-"<!ENTITY apt-author.moconnor \"\n"
-"   <author>\n"
-"    <firstname>Mike</firstname>\n"
-"    <surname>O'Connor</surname>\n"
-"    <contrib></contrib>\n"
-"   </author>\n"
-"\">\n"
-msgstr ""
-"<!ENTITY apt-author.moconnor \"\n"
-"   <author>\n"
-"    <firstname>Mike</firstname>\n"
-"    <surname>O'Connor</surname>\n"
-"   </author>\n"
-"\">\n"
-
-#. type: Plain text
-#: apt.ent:200
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY apt-author.team \"\n"
-#| "   <author>\n"
-#| "    <othername>APT team</othername>\n"
-#| "   </author>\n"
-#| "\">\n"
-msgid ""
 "<!ENTITY apt-author.team \"\n"
 "   <author>\n"
 "    <othername>APT team</othername>\n"
@@ -732,42 +165,13 @@ msgid ""
 msgstr ""
 "<!ENTITY apt-author.team \"\n"
 "   <author>\n"
-"    <othername>APT team</othername>\n"
+"    <othername>APT チーム</othername>\n"
+"    <contrib></contrib>\n"
 "   </author>\n"
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:204 apt.ent:215
-#, no-wrap
-msgid ""
-"<!ENTITY apt-product \"\n"
-"   <productname>Linux</productname>\n"
-"\">\n"
-msgstr ""
-"<!ENTITY apt-product \"\n"
-"   <productname>Linux</productname>\n"
-"\">\n"
-
-#. type: Plain text
-#: apt.ent:211
-#, no-wrap
-msgid ""
-"<!ENTITY apt-copyright \"\n"
-"    <copyright>\n"
-"     <holder>Jason Gunthorpe</holder>\n"
-"     <year>1998-2001</year>\n"
-"    </copyright>\n"
-"\">\n"
-msgstr ""
-"<!ENTITY apt-copyright \"\n"
-"    <copyright>\n"
-"     <holder>Jason Gunthorpe</holder>\n"
-"     <year>1998-2001</year>\n"
-"    </copyright>\n"
-"\">\n"
-
-#. type: Plain text
-#: apt.ent:221
+#: apt.ent:13
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -778,18 +182,18 @@ msgid ""
 msgstr ""
 "<!ENTITY apt-qapage \"\n"
 "\t<para>\n"
-"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>QA Page</ulink>\n"
+"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>QA ページ</ulink>\n"
 "\t</para>\n"
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:24
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>. \n"
+"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
 "   If you wish to report a bug in APT, please see\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
 "   &reportbug; command.\n"
@@ -809,7 +213,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:240
+#: apt.ent:32
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -823,13 +227,13 @@ msgstr ""
 "<!-- Boiler plate Author section -->\n"
 "<!ENTITY manauthor \"\n"
 " <refsect1><title>著者</title>\n"
-"   <para>APT は APT team <email>apt@packages.debian.org</email> によって書かれました。\n"
+"   <para>APT は APT チーム <email>apt@packages.debian.org</email> によって書かれました。\n"
 "   </para>\n"
 " </refsect1>\n"
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:42
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -853,7 +257,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:258
+#: apt.ent:50
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -864,7 +268,7 @@ msgid ""
 "     </listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
-"     <varlistentry>\n"
+"          <varlistentry>\n"
 "      <term><option>-v</option></term>\n"
 "      <term><option>--version</option></term>\n"
 "      <listitem><para>プログラムのバージョンを表示します。\n"
@@ -873,7 +277,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:268
+#: apt.ent:62
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -881,7 +285,9 @@ msgid ""
 "      <term><option>--config-file</option></term>\n"
 "     <listitem><para>Configuration File; Specify a configuration file to use. \n"
 "     The program will read the default configuration file and then this \n"
-"     configuration file. See &apt-conf; for syntax information.     \n"
+"     configuration file. If configuration settings need to be set before the\n"
+"     default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
+"     environment variable. See &apt-conf; for syntax information.\n"
 "     </para>\n"
 "     </listitem>\n"
 "     </varlistentry>\n"
@@ -890,14 +296,15 @@ msgstr ""
 "      <term><option>-c</option></term>\n"
 "      <term><option>--config-file</option></term>\n"
 "     <listitem><para>設定ファイル。 使用する設定ファイルを指定します。\n"
-"     この設定ファイルが読めない場合はデフォルトの設定ファイルを読み込みます。\n"
-"     文法については &apt-conf; を参照してください。\n"
+"     このプログラムは、デフォルト設定ファイルを読んでから、この設定ファイルを読みます。\n"
+"     この設定をデフォルト設定ファイルよりも前に読む必要がある場合、\n"
+"     <envar>APT_CONFIG</envar> 環境変数に指定してください。構文については &apt-conf; をご覧ください。\n"
 "     </para>\n"
 "     </listitem>\n"
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:280
+#: apt.ent:74
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -912,19 +319,20 @@ msgid ""
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
-"     <varlistentry>\n"
+"          <varlistentry>\n"
 "      <term><option>-o</option></term>\n"
 "      <term><option>--option</option></term>\n"
 "     <listitem><para>設定オプションのセット。任意の設定オプションをセットします。\n"
-"     文法は <option>-o Foo::Bar=bar</option> となります。\n"
+"     構文 <option>-o Foo::Bar=bar</option> となります。\n"
 "     異なるオプションを設定するため、<option>-o</option> と <option>--option</option> は、\n"
-"     複数回使用できます。     </para>\n"
+"     複数回使用できます。\n"
+"     </para>\n"
 "     </listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:291
+#: apt.ent:85
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -948,9 +356,10 @@ msgstr ""
 "   などのようにして上書きできます。\n"
 "   </para>\n"
 "\">\n"
+"\n"
 
 #. type: Plain text
-#: apt.ent:297
+#: apt.ent:91
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -959,9 +368,14 @@ msgid ""
 "     Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
+"<!ENTITY file-aptconf \"\n"
+"     <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
+"     <listitem><para>APT 設定ファイル。\n"
+"     設定項目 - <literal>Dir::Etc::Main</literal></para></listitem>\n"
+"     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:303
+#: apt.ent:97
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -970,9 +384,14 @@ msgid ""
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
+"     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
+"     <listitem><para>APT 設定ファイル断片。\n"
+"     設定項目 - <literal>Dir::Etc::Parts</literal></para></listitem>\n"
+"     </varlistentry>\n"
+"\">\n"
 
 #. type: Plain text
-#: apt.ent:309
+#: apt.ent:103
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -981,25 +400,39 @@ msgid ""
 "     Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
+"<!ENTITY file-cachearchives \"\n"
+"     <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
+"     <listitem><para>取得済みパッケージファイル格納エリア。\n"
+"     設定項目 - <literal>Dir::Cache::Archives</literal></para></listitem>\n"
+"     </varlistentry>\n"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:315
+#: apt.ent:109
 #, fuzzy, no-wrap
-#| msgid "Storage area for package files in transit.  Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial)."
+#| msgid ""
+#| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+#| "     <listitem><para>Storage area for package files in transit.\n"
+#| "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+#| "     </varlistentry>\n"
+#| "\">\n"
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
 "     <listitem><para>Storage area for package files in transit.\n"
-"     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+"     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
+"     </varlistentry>\n"
+"\">\n"
+msgstr ""
+"     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+"     <listitem><para>取得中パッケージファイル格納エリア。\n"
+"     設定項目 -  <literal>Dir::Cache::Archives</literal> (必然的に不完全)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
-msgstr "取得中パッケージファイル格納エリア。設定項目 - <literal>Dir::Cache::Archives</literal> (必然的に不完全)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:325
-#, fuzzy, no-wrap
-#| msgid "Version preferences file.  This is where you would specify \"pinning\", i.e. a preference to get certain packages from a separate source or from a different version of a distribution.  Configuration Item: <literal>Dir::Etc::Preferences</literal>."
+#: apt.ent:119
+#, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
 "     <varlistentry><term><filename>/etc/apt/preferences</filename></term>\n"
@@ -1010,10 +443,18 @@ msgid ""
 "     or from a different version of a distribution.\n"
 "     Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
-msgstr "バージョン優先ファイル。ここに \"pin\" の設定を行います。つまり、別々の取得元や異なるディストリビューションのバージョンの、どこからパッケージを取得するかを設定します。設定項目 - <literal>Dir::Etc::Preferences</literal>"
+msgstr ""
+"<!ENTITY file-preferences \"\n"
+"     <varlistentry><term><filename>/etc/apt/preferences</filename></term>\n"
+"     <listitem><para>バージョン選択ファイル。\n"
+"     ここに &quot;pinning&quot;の設定を行います。\n"
+"     つまり、別々の取得元や異なるディストリビューションのバージョンの、\n"
+"     どこからパッケージを取得するかを設定します。\n"
+"     設定項目 -  <literal>Dir::Etc::Preferences</literal></para></listitem>\n"
+"     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:331
+#: apt.ent:125
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -1022,9 +463,14 @@ msgid ""
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
+"     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
+"     <listitem><para>バージョン選択ファイル断片。\n"
+"     設定項目 - <literal>Dir::Etc::PreferencesParts</literal></para></listitem>\n"
+"     </varlistentry>\n"
+"\">\n"
 
 #. type: Plain text
-#: apt.ent:337
+#: apt.ent:131
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -1033,9 +479,14 @@ msgid ""
 "     Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
+"<!ENTITY file-sourceslist \"\n"
+"     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
+"     <listitem><para>パッケージ取得元の場所。\n"
+"     設定項目 - <literal>Dir::Etc::SourceList</literal></para></listitem>\n"
+"     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:343
+#: apt.ent:137
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1044,12 +495,16 @@ msgid ""
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
+"     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+"     <listitem><para>パッケージ取得元の場所のファイル断片\n"
+"     設定項目 - <literal>Dir::Etc::SourceParts</literal></para></listitem>\n"
+"     </varlistentry>\n"
+"\">\n"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:350
-#, fuzzy, no-wrap
-#| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
+#: apt.ent:144
+#, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
 "     <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
@@ -1057,118 +512,299 @@ msgid ""
 "     &sources-list;\n"
 "     Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
-msgstr "&sources-list; に指定した、パッケージリソースごとの状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal>"
+msgstr ""
+"<!ENTITY file-statelists \"\n"
+"     <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
+"     <listitem><para>&sources-list; に指定した、パッケージリソースごとの状態情報格納エリア。\n"
+"     設定項目 - <literal>Dir::State::Lists</literal></para></listitem>\n"
+"     </varlistentry>\n"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:355
+#: apt.ent:150
 #, fuzzy, no-wrap
-#| msgid "Storage area for state information in transit.  Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)."
+#| msgid ""
+#| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+#| "     <listitem><para>Storage area for state information in transit.\n"
+#| "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+#| "     </varlistentry>\n"
+#| "\">\n"
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
 "     <listitem><para>Storage area for state information in transit.\n"
-"     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+"     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
-msgstr "取得中状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)"
-
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
-#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
-"February 2004</date>"
 msgstr ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
-"February 2004</date>"
-
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-cache.8.xml:22 apt-cache.8.xml:29
-msgid "apt-cache"
-msgstr "apt-cache"
+"     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+"     <listitem><para>取得中状態情報格納エリア。\n"
+"     設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)</para></listitem>\n"
+"     </varlistentry>\n"
+"\">\n"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Plain text
+#: apt.ent:156
+#, no-wrap
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+"     <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+"     <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+"     Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+"     </varlistentry>\n"
+msgstr ""
+"<!ENTITY file-trustedgpg \"\n"
+"     <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+"     <listitem><para>ローカルで信頼済みキーのキーリング、新規キーはここに追加します。\n"
+"     設定項目 - <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+"     </varlistentry>\n"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Plain text
+#: apt.ent:163
+#, no-wrap
+msgid ""
+"     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+"     <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+"     be stored here (by other packages or the administrator).\n"
+"     Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+"     </varlistentry>\n"
+"\">\n"
+msgstr ""
+"     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+"     <listitem><para>信頼済みキーのファイル断片、追加キーリングは (他のパッケージや管理者により) ここに格納します。\n"
+"     設定項目 - <literal>Dir::Etc::TrustedParts</literal></para></listitem>\n"
+"     </varlistentry>\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:171
+#, no-wrap
+msgid ""
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Status list of auto-installed packages.\n"
+"      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
+msgstr ""
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>自動インストールされたパッケージの状態一覧です。\n"
+"      設定項目 - <literal>Dir::State::extended_states</literal>\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:175
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
+"     to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
+"<!ENTITY translation-title \"TRANSLATION\">\n"
+msgstr ""
+"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
+"     to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
+"<!ENTITY translation-title \"翻訳\">\n"
+
+#. type: Plain text
+#: apt.ent:184
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
+"     to the translation in the past, who is responsible now and maybe further information\n"
+"     specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+"     The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+"     2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+"     Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
+"     to the translation in the past, who is responsible now and maybe further information\n"
+"     specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+"     倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006,2009-2010),\n"
+"     Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:195
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+"     in a shipped manpage newer/modified paragraphs will maybe appear in english in\n"
+"     the generated manpage. This sentence is therefore here to tell the reader that this\n"
+"     is not a mistake by the translator - obviously the target is that at least for stable\n"
+"     releases this sentence is not needed. :) -->\n"
+"<!ENTITY translation-english \"\n"
+"     Note that this translated document may contain untranslated parts.\n"
+"     This is done on purpose, to avoid losing content when the\n"
+"     translation is lagging behind the original content.\n"
+"\">\n"
+msgstr ""
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+"     in a shipped manpage newer/modified paragraphs will maybe appear in english in\n"
+"     the generated manpage. This sentence is therefore here to tell the reader that this\n"
+"     is not a mistake by the translator - obviously the target is that at least for stable\n"
+"     releases this sentence is not needed. :) -->\n"
+"<!ENTITY translation-english \"\n"
+"     この翻訳文書には未訳部分が含まれていることに注意してください。\n"
+"     翻訳がオリジナルに追従できていない場合、\n"
+"     内容を失わないようにこのようにしています。\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:198
+msgid ""
+"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:201
+msgid ""
+"<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+"synopsis-config-file \"config_file\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:204
+msgid ""
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"\"target_release\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:207
+msgid ""
+"<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+"synopsis-architecture \"architecture\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:210
+msgid ""
+"<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+"--> <!ENTITY synopsis-pkg \"pkg\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:213
+msgid ""
+"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+"ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:216
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+"pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:219
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+"awesome --> <!ENTITY synopsis-regex \"regex\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:222
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:225
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+"apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+"\"temporary_directory\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:228
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+"synopsis-filename \"filename\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:231
+msgid ""
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:234
+msgid ""
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"packages path override-file pathprefix --> <!ENTITY synopsis-override "
+"\"override-file\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:237
+msgid ""
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+"\"pathprefix\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:240
+msgid ""
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"generate section --> <!ENTITY synopsis-section \"section\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:243
+msgid ""
+"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-cache.8.xml:23 apt-cdrom.8.xml:22 apt-config.8.xml:23 apt-get.8.xml:23
-#: apt-key.8.xml:15 apt-mark.8.xml:23 apt-secure.8.xml:15
+#: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26
+#: apt-key.8.xml:25 apt-mark.8.xml:26 apt-secure.8.xml:25
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt-cache.8.xml:24 apt-cdrom.8.xml:23 apt-config.8.xml:24
-#: apt-extracttemplates.1.xml:24 apt-ftparchive.1.xml:24 apt-get.8.xml:24
-#: apt-key.8.xml:16 apt-mark.8.xml:24 apt-secure.8.xml:16
-#: apt-sortpkgs.1.xml:24 apt.conf.5.xml:30 apt_preferences.5.xml:23
-#: sources.list.5.xml:24
+#: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27
+#: apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27
+#: apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26
+#: apt-sortpkgs.1.xml:27 apt.conf.5.xml:32 apt_preferences.5.xml:26
+#: sources.list.5.xml:27
 msgid "APT"
-msgstr ""
+msgstr "APT"
 
-# type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:30
-msgid "APT package handling utility -- cache manipulator"
-msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作ツール"
-
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:36
-msgid ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>add <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
-"replaceable></arg></arg> <arg>gencaches</arg> <arg>showpkg <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>showsrc <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</"
-"arg> <arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
-"replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
-"\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </group>"
-msgstr ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>add <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
-"replaceable></arg></arg> <arg>gencaches</arg> <arg>showpkg <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>showsrc <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</"
-"arg> <arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
-"replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
-"\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </group>"
+#: apt-cache.8.xml:33
+msgid "query the APT cache"
+msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
-#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40
-#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
-#: sources.list.5.xml:33
+#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+#: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+#: apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50
+#: apt-sortpkgs.1.xml:38 apt.conf.5.xml:41 apt_preferences.5.xml:36
+#: sources.list.5.xml:36
 msgid "Description"
 msgstr "説明"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:63
+#: apt-cache.8.xml:39
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -1182,7 +818,8 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:68 apt-get.8.xml:131
+#: apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44
+#: apt-ftparchive.1.xml:54 apt-get.8.xml:44
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -1190,48 +827,23 @@ msgstr ""
 "<option>-h</option> オプションや <option>--help</option> オプションを除き、以"
 "下に挙げるコマンドが必要です。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:72
-msgid "add <replaceable>file(s)</replaceable>"
-msgstr "add <replaceable>file(s)</replaceable>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:73
+#: apt-cache.8.xml:49
 msgid ""
-"<literal>add</literal> adds the named package index files to the package "
-"cache.  This is for debugging only."
+"<literal>gencaches</literal> creates APT's package cache. This is done "
+"implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
-"<literal>add</literal> は、パッケージキャッシュに指定したパッケージインデック"
-"スファイルを追加します。デバッグ専用です。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:77
-msgid "gencaches"
-msgstr "gencaches"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:78
-msgid ""
-"<literal>gencaches</literal> performs the same operation as <command>apt-get "
-"check</command>. It builds the source and package caches from the sources in "
-"&sources-list; and from <filename>/var/lib/dpkg/status</filename>."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+#: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
+#: apt-cache.8.xml:224 apt-cache.8.xml:236
+msgid "&synopsis-pkg;"
 msgstr ""
-"<literal>gencaches</literal> は、<command>apt-get check</command> と同じ動作"
-"を提供します。これは &sources-list; 内の取得元と <filename>/var/lib/dpkg/"
-"status</filename>から、ソースとパッケージのキャッシュを構築します。"
-
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:84
-msgid "showpkg <replaceable>pkg(s)</replaceable>"
-msgstr "showpkg <replaceable>pkg(s)</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:85
+#: apt-cache.8.xml:54
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1254,7 +866,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:97
+#: apt-cache.8.xml:66
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1278,10 +890,11 @@ msgstr ""
 "Provides:\n"
 "2.1-12 - \n"
 "Reverse Provides: \n"
+" \n"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:109
+#: apt-cache.8.xml:78
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -1299,14 +912,9 @@ msgstr ""
 "altdev はインストールする必要はありません。出力の残りの部分の意味については、"
 "apt のソースコードを調べるのが最良でしょう。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:118
-msgid "stats"
-msgstr "stats"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:87
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -1316,7 +924,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:121
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -1326,7 +934,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:125
+#: apt-cache.8.xml:94
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1339,60 +947,53 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:131
+#: apt-cache.8.xml:100
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
 "virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
-"package; several packages provide \"mail-transport-agent\", but there is no "
-"package named \"mail-transport-agent\"."
+"\"mail-transport-agent\" in the Debian system is a pure virtual package; "
+"several packages provide \"mail-transport-agent\", but there is no package "
+"named \"mail-transport-agent\"."
 msgstr ""
 "<literal>純粋仮想パッケージ</literal>は、仮想パッケージ名としてのみ存在する"
 "パッケージ (仮想パッケージ名のみを「提供」し、実際にはいかなるパッケージもそ"
-"の名称を持たない) の数を表します。例えば、Debian GNU/Linux システムでは "
-"\"mail-transport-agent\" は純粋仮想パッケージです。\"mail-transport-agent\" "
-"を提供するパッケージはいくつもありますが、\"mail-transport-agent\" という名称"
-"のパッケージはありません。"
+"の名称を持たない) の数を表します。例えば、Debian システムでは \"mail-"
+"transport-agent\" は純粋仮想パッケージです。\"mail-transport-agent\" を提供す"
+"るパッケージはいくつもありますが、\"mail-transport-agent\" という名称のパッ"
+"ケージはありません。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:139
+#: apt-cache.8.xml:108
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
-"one package, xless, provides \"X11-text-viewer\"."
+"Debian system, \"X11-text-viewer\" is a virtual package, but only one "
+"package, xless, provides \"X11-text-viewer\"."
 msgstr ""
 "<literal>単一仮想パッケージ</literal>は、特定の仮想パッケージ名を提供するパッ"
-"ケージが、ただ一つの場合の数を表します。例えば、Debian GNU/Linux システムで"
-"は、\"X11-text-viewer\" は仮想パッケージですが、\"X11-text-viewer\" を提供す"
-"るパッケージは、xless パッケージのみということです。"
+"ケージが、ただ一つの場合の数を表します。例えば、Debian システムでは、\"X11-"
+"text-viewer\" は仮想パッケージですが、\"X11-text-viewer\" を提供するパッケー"
+"ジは、xless パッケージのみということです。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:114
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
-"\" is both an actual package, and provided by the debconf-tiny package."
+"as the package name. For instance, in the Debian system, \"debconf\" is both "
+"an actual package, and provided by the debconf-tiny package."
 msgstr ""
 "<literal>複合仮想パッケージ</literal>は、その仮想パッケージ名を提供するパッ"
 "ケージが複数あるか、またパッケージ名と同じ仮想パッケージ名を持つパッケージ数"
-"を表します。例えば、Debian GNU/Linux システムでは、debconf は実際のパッケージ"
-"名でもありますが、debconf-tiny によって提供もされています。"
+"を表します。例えば、Debian システムでは、debconf は実際のパッケージ名でもあり"
+"ますが、debconf-tiny によって提供もされています。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:152
-#, fuzzy
-#| msgid ""
-#| "<literal>Missing</literal> is the number of package names that were "
-#| "referenced in a dependency but were not provided by any package. Missing "
-#| "packages may be in evidence if a full distribution is not accessed, or if "
-#| "a package (real or virtual) has been dropped from the distribution. "
-#| "Usually they are referenced from Conflicts or Breaks statements."
+#: apt-cache.8.xml:121
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -1401,20 +1002,27 @@ msgid ""
 "they are referenced from Conflicts or Breaks statements."
 msgstr ""
 "<literal>欠落</literal>は、依存関係中には存在するのに、どのパッケージにも提供"
-"されていないパッケージ名の数を表します。このパッケージがあるということは、全"
-"ディストリビューションにアクセスできていないか、(実ないし仮想) パッケージが"
-"ディストリビューションからはずされてしまった可能性もあります。通常では、構文"
-"が矛盾するとこのようになります。"
+"されていないパッケージ名の数を表します。欠落パッケージは、全ディストリビュー"
+"ションにアクセスできていないか、(実ないし仮想) パッケージがディストリビュー"
+"ションからはずされたという兆候かもしれません。通常、構文が競合や破損するとこ"
+"のようになります。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:159
+#: apt-cache.8.xml:128
+#, fuzzy
+#| msgid ""
+#| "<literal>Total distinct</literal> versions is the number of package "
+#| "versions found in the cache; this value is therefore at least equal to "
+#| "the number of total package names. If more than one distribution (both "
+#| "\"stable\" and \"unstable\", for instance), is being accessed, this value "
+#| "can be considerably larger than the number of total package names."
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
-"total package names. If more than one distribution (both \"stable\" and "
-"\"unstable\", for instance), is being accessed, this value can be "
-"considerably larger than the number of total package names."
+"total package names. If more than one distribution is being accessed (for "
+"instance, \"stable\" and \"unstable\"), this value can be considerably "
+"larger than the number of total package names."
 msgstr ""
 "<literal>個別バージョン総数</literal>は、キャッシュに存在するパッケージのバー"
 "ジョンの数を表します。そのため、この値は最小でもパッケージ名総数と一致しま"
@@ -1423,7 +1031,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:135
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -1431,32 +1039,26 @@ msgstr ""
 "<literal>依存関係総数</literal>は、キャッシュにあるすべてのパッケージで要求さ"
 "れた依存関係の数です。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:173
-msgid "showsrc <replaceable>pkg(s)</replaceable>"
-msgstr "showsrc <replaceable>pkg(s)</replaceable>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:174
+#: apt-cache.8.xml:143
+#, fuzzy
+#| msgid ""
+#| "<literal>showsrc</literal> displays all the source package records that "
+#| "match the given package names. All versions are shown, as well as all "
+#| "records that declare the name to be a Binary."
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
-"records that declare the name to be a Binary."
+"records that declare the name to be a binary package."
 msgstr ""
 "<literal>showsrc</literal> は、指定したパッケージ名に一致するソースパッケージ"
 "を、すべて表示します。バイナリになるときの名称を宣言したレコードと同様に、す"
 "べてのバージョンについて表示します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:179 apt-config.8.xml:84
-msgid "dump"
-msgstr "dump"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:180
+#: apt-cache.8.xml:149
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -1464,14 +1066,9 @@ msgstr ""
 "<literal>dump</literal> は、キャッシュ内のパッケージそれぞれについて、短い一"
 "覧を表示します。主にデバッグ用です。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:184
-msgid "dumpavail"
-msgstr "dumpavail"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:185
+#: apt-cache.8.xml:154
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
@@ -1479,14 +1076,9 @@ msgstr ""
 "<literal>dumpavail</literal> は、標準出力に利用可能なものの一覧を出力しま"
 "す。 &dpkg; と共に使用すると便利ですし、&dselect; でも使用されます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:189
-msgid "unmet"
-msgstr "unmet"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:190
+#: apt-cache.8.xml:159
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -1494,15 +1086,9 @@ msgstr ""
 "<literal>unmet</literal> は、パッケージキャッシュ内にある、不適当な依存関係の"
 "概要を表示します。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:194
-msgid "show <replaceable>pkg(s)</replaceable>"
-msgstr "show <replaceable>pkg(s)</replaceable>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:195
+#: apt-cache.8.xml:164
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -1510,25 +1096,35 @@ msgstr ""
 "<literal>show</literal> は、<command>dpkg --print-avail</command> と同様の機"
 "能を実行します。これは、指定したパッケージのパッケージレコードの表示です。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:200
-msgid "search <replaceable>regex [ regex ... ]</replaceable>"
-msgstr "search <replaceable>regex [ regex ... ]</replaceable>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:169
+msgid "&synopsis-regex;"
+msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:201
+#: apt-cache.8.xml:170
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see "
+#| "<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
+#| "<manvolnum>7</manvolnum></citerefentry>.  It searches the package names "
+#| "and the descriptions for an occurrence of the regular expression and "
+#| "prints out the package name and the short description, including virtual "
+#| "package names.  If <option>--full</option> is given then output identical "
+#| "to <literal>show</literal> is produced for each matched package, and if "
+#| "<option>--names-only</option> is given then the long description is not "
+#| "searched, only the package name is."
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
-"package lists for the POSIX regex pattern given, see "
-"<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-"<manvolnum>7</manvolnum></citerefentry>.  It searches the package names and "
-"the descriptions for an occurrence of the regular expression and prints out "
-"the package name and the short description, including virtual package "
-"names.  If <option>--full</option> is given then output identical to "
-"<literal>show</literal> is produced for each matched package, and if "
-"<option>--names-only</option> is given then the long description is not "
-"searched, only the package name is."
+"package lists for the POSIX regex pattern given, see &regex;.  It searches "
+"the package names and the descriptions for an occurrence of the regular "
+"expression and prints out the package name and the short description, "
+"including virtual package names.  If <option>--full</option> is given then "
+"output identical to <literal>show</literal> is produced for each matched "
+"package, and if <option>--names-only</option> is given then the long "
+"description is not searched, only the package name is."
 msgstr ""
 "<literal>search</literal> は、与えられた POSIX の正規表現 "
 "(<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
@@ -1542,21 +1138,15 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:214
+#: apt-cache.8.xml:181
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgstr "空白で区切った引数で、複数の検索パターンの and をとることができます。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:218
-msgid "depends <replaceable>pkg(s)</replaceable>"
-msgstr "depends <replaceable>pkg(s)</replaceable>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:219
+#: apt-cache.8.xml:186
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -1564,15 +1154,9 @@ msgstr ""
 "<literal>depends</literal> は、パッケージが持っている依存関係と、その依存関係"
 "を満たす他のパッケージの一覧を表示します。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:223
-msgid "rdepends <replaceable>pkg(s)</replaceable>"
-msgstr "rdepends <replaceable>pkg(s)</replaceable>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:224
+#: apt-cache.8.xml:191
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -1581,20 +1165,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:228
-msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
-msgstr "pkgnames <replaceable>[ prefix ]</replaceable>"
+#: apt-cache.8.xml:195
+msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
+msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:229
-#, fuzzy
-#| msgid ""
-#| "This command prints the name of each package in the system. The optional "
-#| "argument is a prefix match to filter the name list. The output is "
-#| "suitable for use in a shell tab complete function and the output is "
-#| "generated extremely quickly. This command is best used with the <option>--"
-#| "generate</option> option."
+#: apt-cache.8.xml:196
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -1602,28 +1179,25 @@ msgid ""
 "extremely quickly. This command is best used with the <option>--generate</"
 "option> option."
 msgstr ""
-"このコマンドは、システムでの各パッケージの名称を表示します。オプションの引数"
-"により、取得する一覧より先頭一致で抽出することができます。この出力はシェルの"
-"タブによる補完機能に使いやすく、また非常に速く生成されます。このコマンドは "
-"<option>--generate</option> オプションと共に使用すると非常に便利です。"
+"このコマンドは、APT が知っている各パッケージの名前を表示します。オプション引"
+"数は、名前一覧から先頭一致で抽出します。この出力はシェルのタブによる補完機能"
+"で使いやすく、また非常に拘束に生成されます。このコマンドは <option>--"
+"generate</option> オプションと共に使用すると非常に便利です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:234
+#: apt-cache.8.xml:201
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
 "the generated list."
 msgstr ""
-
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:239
-msgid "dotty <replaceable>pkg(s)</replaceable>"
-msgstr "dotty <replaceable>pkg(s)</replaceable>"
+"APT が知っているパッケージは、ダウンロード可能、インストール可能、インストー"
+"ル済みである必要がないことに注意してください。つまり、仮想パッケージも生成し"
+"た一覧にあります。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:240
+#: apt-cache.8.xml:207
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1643,12 +1217,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:249
+#: apt-cache.8.xml:216
+#, fuzzy
+#| msgid ""
+#| "The resulting nodes will have several shapes; normal packages are boxes, "
+#| "pure provides are triangles, mixed provides are diamonds, missing "
+#| "packages are hexagons. Orange boxes mean recursion was stopped [leaf "
+#| "packages], blue lines are pre-depends, green lines are conflicts."
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
-"pure provides are triangles, mixed provides are diamonds, missing packages "
-"are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue "
-"lines are pre-depends, green lines are conflicts."
+"pure virtual packages are triangles, mixed virtual packages are diamonds, "
+"missing packages are hexagons. Orange boxes mean recursion was stopped (leaf "
+"packages), blue lines are pre-depends, green lines are conflicts."
 msgstr ""
 "結果のノードは数種の形状をとります。通常パッケージは四角、純粋仮想パッケージ"
 "は三角、複合仮想パッケージは菱形、六角形は欠落パッケージをそれぞれ表します。"
@@ -1657,18 +1237,12 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:221
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr "注意) dotty は、パッケージのより大きなセットのグラフは描けません。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:257
-msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgstr "xvcg <replaceable>pkg(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:258
+#: apt-cache.8.xml:225
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -1678,13 +1252,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:262
-msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
-msgstr "policy <replaceable>[ pkg(s) ]</replaceable>"
+#: apt-cache.8.xml:229
+msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
+msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:263
+#: apt-cache.8.xml:230
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -1695,15 +1269,9 @@ msgstr ""
 "します。引数を指定しなかった場合、取得元ごとの優先順位を表示します。一方、"
 "パッケージ名を指定した場合、優先順の詳細情報を表示します。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:269
-msgid "madison <replaceable>/[ pkg(s) ]</replaceable>"
-msgstr "madison <replaceable>/[ pkg(s) ]</replaceable>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:270
+#: apt-cache.8.xml:237
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -1721,26 +1289,16 @@ msgstr ""
 "表示するだけです。"
 
 # type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#. type: Content of: <refentry><refsect1><title>
+#: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+#: apt-sortpkgs.1.xml:48
 msgid "options"
 msgstr "オプション"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
-msgid "<option>-p</option>"
-msgstr "<option>-p</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
-msgid "<option>--pkg-cache</option>"
-msgstr "<option>--pkg-cache</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:286
+#: apt-cache.8.xml:253
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -1750,20 +1308,9 @@ msgstr ""
 "すべての操作で使用される一次キャッシュです。設定項目 - <literal>Dir::Cache::"
 "pkgcache</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
-#: apt-sortpkgs.1.xml:58
-msgid "<option>-s</option>"
-msgstr "<option>-s</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291
-msgid "<option>--src-cache</option>"
-msgstr "<option>--src-cache</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:292
+#: apt-cache.8.xml:259
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1777,19 +1324,9 @@ msgstr ""
 "シュは、全パッケージファイルを再解析を避ける上で便利です。設定項目 - "
 "<literal>Dir::Cache::srcpkgcache</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
-msgid "<option>-q</option>"
-msgstr "<option>-q</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
-msgid "<option>--quiet</option>"
-msgstr "<option>--quiet</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:300
+#: apt-cache.8.xml:267
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1801,41 +1338,36 @@ msgstr ""
 "レベルを指定して、設定ファイルを上書きすることもできます。設定項目 - "
 "<literal>quiet</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:306
-msgid "<option>-i</option>"
-msgstr "<option>-i</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:306
-msgid "<option>--important</option>"
-msgstr "<option>--important</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:307
+#: apt-cache.8.xml:274
 msgid ""
-"Print only important dependencies; for use with unmet and depends. Causes "
-"only Depends and Pre-Depends relations to be printed.  Configuration Item: "
-"<literal>APT::Cache::Important</literal>."
+"Print only important dependencies; for use with <literal>unmet</literal> and "
+"<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
+"be printed.  Configuration Item: <literal>APT::Cache::Important</literal>."
 msgstr ""
-"「重要」依存関係のみ表示 - unmet や depends と共に使用します。これは「依存」"
-"関係と「先行依存」関係のみを表示するためです。設定項目 - <literal>APT::"
-"Cache::Important</literal>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
-msgid "<option>-f</option>"
-msgstr "<option>-f</option>"
+"「重要」依存関係のみ表示 - <literal>unmet</literal> や <literal>depends</"
+"literal> と共に使用します。これは「依存」関係と「先行依存」関係のみを表示する"
+"ためです。設定項目 - <literal>APT::Cache::Important</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
-msgid "<option>--full</option>"
-msgstr "<option>--full</option>"
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:288
+#, fuzzy
+msgid ""
+"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"print all dependencies. This can be tweaked with these flags which will omit "
+"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
+"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
+"Cache::ShowRecommends</literal>."
+msgstr ""
+"<literal>depends</literal> や <literal>rdepends</literal> で、指定した全パッ"
+"ケージを再帰的に一度に表示します。設定項目 - <literal>APT::Cache::"
+"RecurseDepends</literal>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:295
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1843,23 +1375,13 @@ msgstr ""
 "search 時に全パッケージレコードを表示します。設定項目 - <literal>APT::Cache::"
 "ShowFull</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131
-msgid "<option>-a</option>"
-msgstr "<option>-a</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317
-msgid "<option>--all-versions</option>"
-msgstr "<option>--all-versions</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:318
+#: apt-cache.8.xml:300
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
-"versions</option> is specified, only the candidate version will displayed "
+"versions</option> is specified, only the candidate version will be displayed "
 "(the one which would be selected for installation).  This option is only "
 "applicable to the <literal>show</literal> command.  Configuration Item: "
 "<literal>APT::Cache::AllVersions</literal>."
@@ -1870,19 +1392,9 @@ msgstr ""
 "の際に選択されるもの) だけ表示します。このオプションは、show コマンドでのみ適"
 "用できます。設定項目 - <literal>APT::Cache::AllVersions</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
-msgid "<option>-g</option>"
-msgstr "<option>-g</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
-msgid "<option>--generate</option>"
-msgstr "<option>--generate</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:309
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1893,19 +1405,9 @@ msgstr ""
 "option> を使用してください。設定項目 - <literal>APT::Cache::Generate</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
-msgid "<option>--names-only</option>"
-msgstr "<option>--names-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
-msgid "<option>-n</option>"
-msgstr "<option>-n</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:315
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1913,14 +1415,9 @@ msgstr ""
 "説明文ではなく、パッケージ名からのみ検索します。設定項目 - <literal>APT::"
 "Cache::NamesOnly</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
-msgid "<option>--all-names</option>"
-msgstr "<option>--all-names</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:320
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1929,14 +1426,9 @@ msgstr ""
 "<literal>pkgnames</literal> で、仮想パッケージや欠落依存関係を含めた全名称を"
 "表示します。設定項目 - <literal>APT::Cache::AllNames</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
-msgid "<option>--recurse</option>"
-msgstr "<option>--recurse</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:326
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1946,14 +1438,9 @@ msgstr ""
 "ケージを再帰的に一度に表示します。設定項目 - <literal>APT::Cache::"
 "RecurseDepends</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:349
-msgid "<option>--installed</option>"
-msgstr "<option>--installed</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:351
+#: apt-cache.8.xml:333
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1963,53 +1450,40 @@ msgstr ""
 "ストールされているパッケージに限定します。設定項目 - <literal>APT::Cache::"
 "Installed</literal>"
 
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
-#: apt-sortpkgs.1.xml:64
-msgid "&apt-commonoptions;"
-msgstr "&apt-commonoptions;"
-
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:343 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
+#: apt.conf.5.xml:1118 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "ファイル"
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:363
-msgid "&file-sourceslist; &file-statelists;"
-msgstr ""
-
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
-#: sources.list.5.xml:233
+#: apt-cache.8.xml:350 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+#: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
+#: sources.list.5.xml:252
 msgid "See Also"
 msgstr "関連項目"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:369
+#: apt-cache.8.xml:351
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
-#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:355 apt-cdrom.8.xml:149 apt-config.8.xml:114
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr "診断メッセージ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:356
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2017,109 +1491,67 @@ msgstr ""
 "<command>apt-cache</command> は正常終了時に 0 を返します。エラー時には十進の "
 "100 を返します。"
 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-cdrom.8.xml:13
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
-"February 2004</date>"
-msgstr ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
-"February 2004</date>"
-
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-cdrom.8.xml:21 apt-cdrom.8.xml:28
-msgid "apt-cdrom"
-msgstr "apt-cdrom"
-
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:29
-msgid "APT CDROM management utility"
-msgstr "APT CDROM 管理ユーティリティ"
-
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:35
-msgid ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
-"<arg>add</arg> <arg>ident</arg> </group>"
-msgstr ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
-"<arg>add</arg> <arg>ident</arg> </group>"
+#: apt-cdrom.8.xml:32
+msgid "APT CD-ROM management utility"
+msgstr "APT CD-ROM 管理ユーティリティ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:48
+#: apt-cdrom.8.xml:38
 msgid ""
-"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
+"<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
 "the structure of the disc as well as correcting for several possible mis-"
 "burns and verifying the index files."
 msgstr ""
 "<command>apt-cdrom</command> は利用可能な取得元として、APT のリストに新しい "
-"CDROM を追加するのに便利です。<command>apt-cdrom</command> は焼き損じを可能な"
+"CD-ROM を追加するのに便利です。<command>apt-cdrom</command> は焼き損じを可能な"
 "限り補正し、ディスク構造の確認を助けます。また、インデックスファイルの確認を"
 "行います。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:55
+#: apt-cdrom.8.xml:45
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
-"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
+"system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
 "must be inserted and scanned separately to account for possible mis-burns."
 msgstr ""
 "APT システムに手作業で CD を追加するのは難しいため、<command>apt-cdrom</"
 "command> が必要になります。その上、CD セットのディスクを 1 枚づつ、焼き損じを"
 "補正できるか評価しなければなりません。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:65
-msgid "add"
-msgstr "add"
-
-# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:56
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then procceed "
+"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
 "to scan it and copy the index files. If the disc does not have a proper "
-"<filename>disk</filename> directory you will be prompted for a descriptive "
+"<filename>.disk</filename> directory you will be prompted for a descriptive "
 "title."
 msgstr ""
-"<literal>add</literal> は、新しいディスクを取得元リストに追加します。CDROM デ"
-"バイスのアンマウント、ディスク挿入のプロンプトの表示の後に、ディスクのスキャ"
-"ンとインデックスファイルのコピーを行います。ディスクに正しい <filename>disk</"
+"<literal>add</literal> は、新しいディスクを取得元リストに追加します。CD-ROM デ"
+"バイスのアンマウント、ディスク挿入のプロンプト表示の後に、ディスクのスキャン"
+"とインデックスファイルのコピーを行います。ディスクに正しい <filename>.disk</"
 "filename> ディレクトリが存在しない場合、タイトルを入力するよう促します。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:64
 msgid ""
-"APT uses a CDROM ID to track which disc is currently in the drive and "
+"APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
 "filename>"
 msgstr ""
-"APT は、現在ドライブにあるディスクのトラックから取得した、CDROM ID を使用しま"
+"APT は、現在ドライブにあるディスクのトラックから取得した、CD-ROM ID を使用しま"
 "す。またその ID を、<filename>&statedir;/cdroms.list</filename> 内のデータ"
 "ベースで管理します。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:81
-msgid "ident"
-msgstr "ident"
-
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:82
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:72
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -2127,36 +1559,15 @@ msgstr ""
 "格納されているファイル名と現在のディスクが同一かどうかをレポートする、デバッ"
 "グツールです。"
 
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:61
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present.  <placeholder type=\"variablelist"
-"\" id=\"0\"/>"
-msgstr ""
-"<option>-h</option> オプションや <option>--help</option> オプションを除き、以"
-"下に挙げるコマンドが必要です。<placeholder type=\"variablelist\" id=\"0\"/>"
-
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:80 apt-key.8.xml:160
 msgid "Options"
 msgstr "オプション"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
-msgid "<option>-d</option>"
-msgstr "<option>-d</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95
-msgid "<option>--cdrom</option>"
-msgstr "<option>--cdrom</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:96
+#: apt-cdrom.8.xml:85
 msgid ""
 "Mount point; specify the location to mount the cdrom. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -2166,21 +1577,11 @@ msgstr ""
 "は、<filename>/etc/fstab</filename> に正しく設定されている必要があります。設"
 "定項目 - <literal>Acquire::cdrom::mount</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:104
-msgid "<option>-r</option>"
-msgstr "<option>-r</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:104
-msgid "<option>--rename</option>"
-msgstr "<option>--rename</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:105
+#: apt-cdrom.8.xml:94
 msgid ""
-"Rename a disc; change the label of a disk or override the disks given label. "
+"Rename a disc; change the label of a disc or override the disc's given label. "
 "This option will cause <command>apt-cdrom</command> to prompt for a new "
 "label.  Configuration Item: <literal>APT::CDROM::Rename</literal>."
 msgstr ""
@@ -2188,19 +1589,9 @@ msgstr ""
 "プションにより、<command>apt-cdrom</command> が新しいラベルを入力するよう促し"
 "ます。設定項目 - <literal>APT::CDROM::Rename</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113 apt-get.8.xml:347
-msgid "<option>-m</option>"
-msgstr "<option>-m</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113
-msgid "<option>--no-mount</option>"
-msgstr "<option>--no-mount</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:114
+#: apt-cdrom.8.xml:103
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -2210,14 +1601,9 @@ msgstr ""
 "アンマウントしないようにします。設定項目 - <literal>APT::CDROM::NoMount</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:121
-msgid "<option>--fast</option>"
-msgstr "<option>--fast</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:122
+#: apt-cdrom.8.xml:111
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -2229,14 +1615,9 @@ msgstr ""
 "ており、エラーを検出しなかった場合のみ使用すべきです。設定項目 - "
 "<literal>APT::CDROM::Fast</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:131
-msgid "<option>--thorough</option>"
-msgstr "<option>--thorough</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:132
+#: apt-cdrom.8.xml:121
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -2247,24 +1628,9 @@ msgstr ""
 "キャンするのに非常に時間がかかりますが、全パッケージファイルを抽出することが"
 "できます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:378
-msgid "<option>--just-print</option>"
-msgstr "<option>--just-print</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:380
-msgid "<option>--recon</option>"
-msgstr "<option>--recon</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:142 apt-get.8.xml:381
-msgid "<option>--no-act</option>"
-msgstr "<option>--no-act</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:143
+#: apt-cdrom.8.xml:132
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -2276,13 +1642,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:156
+#: apt-cdrom.8.xml:145
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:161
+#: apt-cdrom.8.xml:150
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2290,35 +1656,15 @@ msgstr ""
 "<command>apt-cdrom</command> は正常終了時に 0 を返します。エラー時には十進の "
 "100 を返します。"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-config.8.xml:22 apt-config.8.xml:29
-msgid "apt-config"
-msgstr "apt-config"
-
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:30
+#: apt-config.8.xml:33
 msgid "APT Configuration Query program"
 msgstr "APT 設定取得プログラム"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:36
-msgid ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>shell</arg> <arg>dump</arg> </group>"
-msgstr ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>shell</arg> <arg>dump</arg> </group>"
-
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:48
+#: apt-config.8.xml:39
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -2330,24 +1676,9 @@ msgstr ""
 "で、メイン設定ファイル <filename>/etc/apt/apt.conf</filename> にアクセスしま"
 "す。"
 
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:53 apt-ftparchive.1.xml:71
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present."
-msgstr ""
-"<option>-h</option> オプションや <option>--help</option> オプションを除き、以"
-"下に挙げるコマンドが必要です。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:58
-msgid "shell"
-msgstr "shell"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:60
+#: apt-config.8.xml:51
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -2362,7 +1693,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:68
+#: apt-config.8.xml:59
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -2372,10 +1703,11 @@ msgstr ""
 "OPTS=\"-f\"\n"
 "RES=`apt-config shell OPTS MyApp::options`\n"
 "eval $RES\n"
+"\n"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:73
+#: apt-config.8.xml:64
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -2385,7 +1717,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:77
+#: apt-config.8.xml:68
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -2397,20 +1729,44 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:86
+#: apt-config.8.xml:77
 msgid "Just show the contents of the configuration space."
 msgstr "設定箇所の内容を表示するだけです。"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:90
+msgid ""
+"Include options which have an empty value. This is the default, so use --no-"
+"empty to remove them from the output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-config.8.xml:95
+msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:96
+msgid ""
+"Defines the output of each config option. &percnt;t will be replaced with "
+"the name of the option, &percnt;f with the complete optionname and &percnt;v "
+"with the value of the option.  Use uppercase letters and special characters "
+"in the value will be encoded to ensure that it can e.g. be savely used in a "
+"quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
+"by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
+"&percnt;."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
-#: apt-sortpkgs.1.xml:70
+#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
+#: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:109
+#: apt-config.8.xml:115
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2418,42 +1774,22 @@ msgstr ""
 "<command>apt-config</command> は正常終了時に 0 を返します。エラー時には十進"
 "の 100 を返します。"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:29
-msgid "apt-extracttemplates"
-msgstr "apt-extracttemplates"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:23 apt-ftparchive.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
 msgid "1"
 msgstr "1"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:30
+#: apt-extracttemplates.1.xml:33
 msgid "Utility to extract DebConf config and templates from Debian packages"
 msgstr ""
 "Debian パッケージから DebConf 設定と DebConf テンプレートを抽出するユーティリ"
 "ティ"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:36
-msgid ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
-"arg>"
-msgstr ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
-"arg>"
-
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:44
+#: apt-extracttemplates.1.xml:39
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -2468,42 +1804,35 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:49
+#: apt-extracttemplates.1.xml:44
 msgid "package version template-file config-script"
 msgstr "package version template-file config-script"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:50
+#: apt-extracttemplates.1.xml:45
+#, fuzzy
+#| msgid ""
+#| "template-file and config-script are written to the temporary directory "
+#| "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
+#| "TempDir</literal>)  directory, with filenames of the form "
+#| "<filename>package.template.XXXX</filename> and <filename>package.config."
+#| "XXXX</filename>"
 msgid ""
 "template-file and config-script are written to the temporary directory "
-"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
-"literal>)  directory, with filenames of the form <filename>package.template."
-"XXXX</filename> and <filename>package.config.XXXX</filename>"
+"specified by the <option>-t</option> or <option>--tempdir</option> "
+"(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+"filenames of the form <filename>package.template.XXXX</filename> and "
+"<filename>package.config.XXXX</filename>"
 msgstr ""
 "テンプレートファイルや、設定スクリプトは、-t や --tempdir で指定した一時ディ"
 "レクトリ (<literal>APT::ExtractTemplates::TempDir</literal>) に書き出され、"
 "ファイル名は、<filename>package.template.XXXX</filename> や "
 "<filename>package.config.XXXX</filename> と言った形になります。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488
-msgid "<option>-t</option>"
-msgstr "<option>-t</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60
-msgid "<option>--tempdir</option>"
-msgstr "<option>--tempdir</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:62
-#, fuzzy
-#| msgid ""
-#| "Temporary directory in which to write extracted debconf template files "
-#| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::"
-#| "TempDir</literal>"
+#: apt-extracttemplates.1.xml:58
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2514,7 +1843,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:79
+#: apt-extracttemplates.1.xml:75
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -2522,95 +1851,15 @@ msgstr ""
 "<command>apt-extracttemplates</command> は正常終了時に 0 を返します。エラー時"
 "には十進の 100 を返します。"
 
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-ftparchive.1.xml:13
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-#| "November 2007</date>"
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
-"August 2009</date>"
-msgstr ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-"November 2007</date>"
-
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29
-msgid "apt-ftparchive"
-msgstr "apt-ftparchive"
-
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:30
+#: apt-ftparchive.1.xml:33
 msgid "Utility to generate index files"
 msgstr "インデックスファイル生成ユーティリティ"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:36
-#, fuzzy
-#| msgid ""
-#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#| "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
-#| "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
-#| "<group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#| "replaceable></arg><arg><replaceable>override</"
-#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
-#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
-#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
-#| "group>"
-msgid ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
-"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
-"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
-"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
-"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
-"replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
-"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
-msgstr ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group choice="
-"\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
-"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
-"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
-"replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
-"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
-
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:56
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -2623,7 +1872,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:43
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -2638,7 +1887,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:66
+#: apt-ftparchive.1.xml:49
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -2651,15 +1900,9 @@ msgstr ""
 "部プログラムにも依存しません。すべて生成する際には、ファイル変更点の検出と希"
 "望した圧縮出力ファイルの作成を自動的に実行します。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:75
-msgid "packages"
-msgstr "packages"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:60
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -2673,20 +1916,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr "<option>--db</option> オプションで、キャッシュ DB を指定できます。"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:85
-msgid "sources"
-msgstr "sources"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:87
+#: apt-ftparchive.1.xml:70
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -2700,7 +1937,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:92
+#: apt-ftparchive.1.xml:75
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -2710,14 +1947,9 @@ msgstr ""
 "ルを探します。使用するソースオーバーライドファイルを変更するのには、--source-"
 "override オプションを使用します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:97
-msgid "contents"
-msgstr "contents"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:99
+#: apt-ftparchive.1.xml:82
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -2733,55 +1965,44 @@ msgstr ""
 "ません。複数のパッケージが同じファイルを持つ場合、パッケージ名をカンマ区切り"
 "で出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:109
-msgid "release"
-msgstr "release"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:111
+#: apt-ftparchive.1.xml:94
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
-"directory tree. It recursively searches the given directory for Packages, "
-"Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and "
-"md5sum.txt files.  It then writes to stdout a Release file containing an MD5 "
-"digest and SHA1 digest for each file."
+"directory tree. It recursively searches the given directory for uncompressed "
+"<filename>Packages</filename> and <filename>Sources</filename> files and the "
+"ones compressed with <command>gzip</command>, <command>bzip2</command> or "
+"<command>lzma</command> as well as <filename>Release</filename> and "
+"<filename>md5sum.txt</filename> files by default (<literal>APT::FTPArchive::"
+"Release::Default-Patterns</literal>). Additional filename patterns can be "
+"added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
+"literal>.  It then writes to stdout a Release file containing a MD5, SHA1 "
+"and SHA256 digest for each file."
 msgstr ""
-"<literal>release</literal> コマンドは、ディレクトリツリーから Release ファイ"
-"ルを生成します。与えられたディレクトリから、Packages, Packages.gz, Packages."
-"bz2, Sources, Sources.gz, Sources.bz2, Release, md5sum.txt といったファイルを"
-"再帰検索します。その後、ファイルごとの MD5 ダイジェストと SHA1 ダイジェストを"
-"含んだ Release ファイルを、標準出力に書き出します。"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:118
+#: apt-ftparchive.1.xml:104
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
 "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
 "supported fields are: <literal>Origin</literal>, <literal>Label</literal>, "
 "<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
-"literal>, <literal>Date</literal>, <literal>Architectures</literal>, "
-"<literal>Components</literal>, <literal>Description</literal>."
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 msgstr ""
 "Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::"
 "Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::"
 "Origin</literal>) をとります。サポートするフィールドは、<literal>Origin</"
 "literal>, <literal>Label</literal>, <literal>Suite</literal>, "
 "<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</"
-"literal>, <literal>Architectures</literal>, <literal>Components</literal>, "
-"<literal>Description</literal> です。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:128
-msgid "generate"
-msgstr "generate"
+"literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, "
+"<literal>Components</literal>, <literal>Description</literal> です。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:130
+#: apt-ftparchive.1.xml:117
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2794,14 +2015,9 @@ msgstr ""
 "は、必要な設定を維持する簡単な方法を提供すると共に、インデックスファイルをど"
 "のディレクトリから作成するかを指定する、柔軟な方法を提供します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:137 apt-get.8.xml:292
-msgid "clean"
-msgstr "clean"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:139
+#: apt-ftparchive.1.xml:126
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -2811,13 +2027,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:145
+#: apt-ftparchive.1.xml:132
 msgid "The Generate Configuration"
 msgstr "Generate 設定"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:134
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2828,35 +2044,30 @@ msgid ""
 msgstr ""
 "<literal>generate</literal> コマンドは、生成するアーカイブに関する記述をした"
 "設定ファイルを使用します。設定ファイルは、bind 8 や dhcpd といった ISC ツール"
-"に見られるような、ISC 設定フォーマットに従います。&apt-conf; に、文法の説明が"
+"に見られるような、ISC 設定フォーマットに従います。&apt-conf; に、構文の説明が"
 "あります。Generate 設定はセクション法で解析しますが、&apt-conf; はツリー法で"
 "解析するのに注意してください。これはスコープタグの扱い方に違いがあるだけで"
 "す。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
 "generate 設定には 4 個の独立したセクションがあります。以下それぞれ説明しま"
 "す。"
 
-# type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:157
-msgid "Dir Section"
-msgstr "Dir セクション"
+#: apt-ftparchive.1.xml:144
+#, fuzzy
+#| msgid "the <literal>Origin:</literal> line"
+msgid "<literal>Dir</literal> Section"
+msgstr "<literal>Origin:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:159
-#, fuzzy
-#| msgid ""
-#| "The <literal>Dir</literal> section defines the standard directories "
-#| "needed to locate the files required during the generation process. These "
-#| "directories are prepended to certain relative paths defined in later "
-#| "sections to produce a complete an absolute path."
+#: apt-ftparchive.1.xml:146
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2864,18 +2075,12 @@ msgid ""
 "to produce a complete an absolute path."
 msgstr ""
 "<literal>Dir</literal> セクションは、生成プロセスで必要なファイルを配置するた"
-"めの、標準ディレクトリを定義します。このディレクトリは、完全な絶対パスを生成"
-"するため、後のセクションで定義される相対パスの前に結合します。"
-
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:164
-msgid "ArchiveDir"
-msgstr "ArchiveDir"
+"めに必要な、標準ディレクトリを定義します。このディレクトリは、完全な絶対パス"
+"を生成するため、後のセクションで定義される相対パスの前に結合されます。"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:166
+#: apt-ftparchive.1.xml:153
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2884,37 +2089,21 @@ msgstr ""
 "FTP アーカイブのルートを指定します。標準的な Debian 設定では、このディレクト"
 "リには <filename>ls-LR</filename> と dist ノードがあります。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:171
-msgid "OverrideDir"
-msgstr "OverrideDir"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:173
+#: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr "オーバーライドファイルの場所を指定します。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:176
-msgid "CacheDir"
-msgstr "CacheDir"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr "キャッシュファイルの場所を指定します。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:181
-msgid "FileListDir"
-msgstr "FileListDir"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:183
+#: apt-ftparchive.1.xml:170
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -2922,15 +2111,16 @@ msgstr ""
 "<literal>FileList</literal> 設定が以下で使用されている場合、ファイルリスト"
 "ファイルの場所を指定します。"
 
-# type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:189
-msgid "Default Section"
-msgstr "Default セクション"
+#: apt-ftparchive.1.xml:176
+#, fuzzy
+#| msgid "the <literal>Label:</literal> line"
+msgid "<literal>Default</literal> Section"
+msgstr "<literal>Label:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:178
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2940,15 +2130,9 @@ msgstr ""
 "器の動作を制御する設定も行います。他のセクションでは、ここにあるデフォルト値"
 "を、セクションごとの設定で上書きします。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:195
-msgid "Packages::Compress"
-msgstr "Packages::Compress"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:184
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2959,14 +2143,9 @@ msgstr ""
 "とつは '.' (圧縮なし), 'gzip', 'bzip2' が入る、空白区切りの文字列です。圧縮方"
 "法のデフォルトはすべて '. gzip' です。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
-msgid "Packages::Extensions"
-msgstr "Packages::Extensions"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:192
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -2974,14 +2153,9 @@ msgstr ""
 "パッケージファイル拡張子のデフォルト値を列挙します。このデフォルト値は '."
 "deb' です。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:209
-msgid "Sources::Compress"
-msgstr "Sources::Compress"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:198
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -2989,14 +2163,9 @@ msgstr ""
 "<literal>Packages::Compress</literal> と同様に、Sources ファイルの圧縮方法を"
 "指定します。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:215
-msgid "Sources::Extensions"
-msgstr "Sources::Extensions"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:204
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -3004,14 +2173,9 @@ msgstr ""
 "ソースファイル拡張子のデフォルト値を列挙します。このデフォルト値は '.dsc' で"
 "す。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:221
-msgid "Contents::Compress"
-msgstr "Contents::Compress"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:210
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -3019,14 +2183,18 @@ msgstr ""
 "<literal>Packages::Compress</literal> と同様に、Contents ファイルの圧縮方法を"
 "指定します。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
-msgid "DeLinkLimit"
-msgstr "DeLinkLimit"
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:216
+msgid ""
+"This is similar to <literal>Packages::Compress</literal> except that it "
+"controls the compression for the Translation-en master file."
+msgstr ""
+"<literal>Packages::Compress</literal> と同様に、Translation-en マスターファイ"
+"ルの圧縮を制御します。"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:222
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -3036,15 +2204,9 @@ msgstr ""
 "指定します。セクションごとの <literal>External-Links</literal> 設定と合わせて"
 "使います。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
-msgid "FileMode"
-msgstr "FileMode"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:229
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -3052,15 +2214,23 @@ msgstr ""
 "作成したインデックスファイルのモードを指定します。デフォルトは 0644 です。全"
 "インデックスファイルは、umask を無視してこのモードを使用します。"
 
-# type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
+msgid ""
+"Sets if long descriptions should be included in the Packages file or split "
+"out into a master Translation-en file."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:243
-msgid "TreeDefault Section"
-msgstr "TreeDefault セクション"
+#: apt-ftparchive.1.xml:242
+#, fuzzy
+#| msgid "the <literal>Label:</literal> line"
+msgid "<literal>TreeDefault</literal> Section"
+msgstr "<literal>Label:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:245
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -3070,14 +2240,9 @@ msgstr ""
 "数はすべて置換変数であり、文字列 $(DIST), $(SECTION), $(ARCH) をそれぞれの値"
 "に展開します。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:250
-msgid "MaxContentsChange"
-msgstr "MaxContentsChange"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:252
+#: apt-ftparchive.1.xml:251
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -3086,15 +2251,9 @@ msgstr ""
 "日毎に生成する contents ファイルをキロバイト単位で設定します。contents ファイ"
 "ルをラウンドロビンし、数日経つとすべて再生成します。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:257
-msgid "ContentsAge"
-msgstr "ContentsAge"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:259
+#: apt-ftparchive.1.xml:258
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -3109,15 +2268,9 @@ msgstr ""
 "とが発生します。新しい .deb ファイルをインストールしたい場合、保留を解除で"
 "き、少なくとも新しいファイルが必要です。デフォルトは 10 で、単位は日です。"
 
-# type: Content of: <refentry><refsect1><refsect2><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:268
-msgid "Directory"
-msgstr "Directory"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:269
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3125,15 +2278,9 @@ msgstr ""
 ".deb ディレクトリツリーの先頭を設定します。デフォルトは <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename> です。"
 
-# type: Content of: <refentry><refsect1><refsect2><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:274
-msgid "SrcDirectory"
-msgstr "SrcDirectory"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:276
+#: apt-ftparchive.1.xml:275
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -3141,15 +2288,9 @@ msgstr ""
 "ソースパッケージディレクトリツリーの先頭を設定します。デフォルトは <filename>"
 "$(DIST)/$(SECTION)/source/</filename> です。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
-msgid "Packages"
-msgstr "Packages"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:282
+#: apt-ftparchive.1.xml:281
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -3157,30 +2298,27 @@ msgstr ""
 "Packages ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/Packages</filename> です。"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
-msgid "Sources"
-msgstr "Sources"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:287
 msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgstr ""
-"Packages ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
+"Sources ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
 "$(SECTION)/source/Sources</filename> です。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:292
-msgid "InternalPrefix"
-msgstr "InternalPrefix"
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:293
+msgid ""
+"Set the output Translation-en master file with the long descriptions if they "
+"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
+"$(SECTION)/i18n/Translation-en</filename>"
+msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:300
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -3189,15 +2327,9 @@ msgstr ""
 "外部リンクではなく、内部リンクと見なす判断材料となる、パスのプレフィックスを"
 "設定します。デフォルトは、<filename>$(DIST)/$(SECTION)/</filename> です。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
-msgid "Contents"
-msgstr "Contents"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:307
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3209,25 +2341,15 @@ msgstr ""
 "Contents ファイルにまとめられる設定 (デフォルト) の場合、<command>apt-"
 "ftparchive</command> は自動でパッケージファイルをまとめます。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:308
-msgid "Contents::Header"
-msgstr "Contents::Header"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:310
+#: apt-ftparchive.1.xml:316
 msgid "Sets header file to prepend to the contents output."
 msgstr "contents の出力に付けるヘッダファイルを設定します。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
-msgid "BinCacheDB"
-msgstr "BinCacheDB"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:315
+#: apt-ftparchive.1.xml:321
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -3235,15 +2357,9 @@ msgstr ""
 "このセクションで使用するバイナリキャッシュデータベースを設定します。複数のセ"
 "クションで同じデータベースを共有できます。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
-msgid "FileList"
-msgstr "FileList"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:327
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3253,15 +2369,9 @@ msgstr ""
 "み込むファイル一覧ファイルを指定します。相対ファイル名は、アーカイブディレク"
 "トリが先頭につきます。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326
-msgid "SourceFileList"
-msgstr "SourceFileList"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:334
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3272,15 +2382,16 @@ msgstr ""
 "み込むファイル一覧ファイルを指定します。相対ファイル名は、アーカイブディレク"
 "トリが先頭につきます。ソースインデックスを処理する際に使用します。"
 
-# type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:336
-msgid "Tree Section"
-msgstr "Tree セクション"
+#: apt-ftparchive.1.xml:342
+#, fuzzy
+#| msgid "the <literal>Label:</literal> line"
+msgid "<literal>Tree</literal> Section"
+msgstr "<literal>Label:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:338
+#: apt-ftparchive.1.xml:344
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -3293,23 +2404,22 @@ msgstr ""
 "との複数のアーキテクチャを定義します。使用する正確なパスは、"
 "<literal>Directory</literal> 変数で定義されます。"
 
-# type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:343
+#: apt-ftparchive.1.xml:349
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
-"setting such as <filename>dists/woody</filename>."
+"setting such as <filename>dists/&stable-codename;</filename>."
 msgstr ""
 "<literal>Tree</literal> セクションは、<literal>$(DIST)</literal> 変数で設定さ"
 "れているスコープタグをとり、ツリーのルート (<literal>ArchiveDir</literal>が先"
-"頭につくパス) を定義します。通常、この設定は <filename>dists/woody</"
-"filename> のようになります。"
+"頭につくパス) を定義します。通常、この設定は <filename>dists/&stable-"
+"codename;</filename> のようになります。"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -3318,38 +2428,36 @@ msgstr ""
 "<literal>TreeDefault</literal> セクションで定義される設定はすべて、3 個の新し"
 "い変数と同様に、<literal>Tree</literal> セクションで使用できます。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><informalexample>
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
-msgid ""
-"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to:"
-msgstr ""
-"<literal>Tree</literal> セクションを処理する際、<command>apt-ftparchive</"
-"command> は以下のような操作を行います。"
-
 # type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
-#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
-#: apt-ftparchive.1.xml:354
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+#: apt-ftparchive.1.xml:360
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
 "   for j in Architectures do\n"
 "      Generate for DIST=scope SECTION=i ARCH=j\n"
+"     "
 msgstr ""
 "for i in Sections do \n"
 "   for j in Architectures do\n"
 "      Generate for DIST=scope SECTION=i ARCH=j\n"
+"     "
 
-# type: Content of: <refentry><refsect1><refsect2><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:360
-msgid "Sections"
-msgstr "Sections"
+# type: Content of: <refentry><refsect1><refsect2><para><informalexample>
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:357
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
+msgstr ""
+"<literal>Tree</literal> セクションを処理する際、<command>apt-ftparchive</"
+"command> は以下のような操作を行います。<placeholder type=\"programlisting\" "
+"id=\"0\"/>"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -3358,15 +2466,9 @@ msgstr ""
 "distribution 以下に現れるセクションを、空白区切りで指定したリストです。通常、"
 "<literal>main contrib non-free</literal>のようになります。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:367
-msgid "Architectures"
-msgstr "Architectures"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:369
+#: apt-ftparchive.1.xml:375
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -3376,15 +2478,9 @@ msgstr ""
 "す。特殊アーキテクチャ 'source' は、ソースアーカイブのツリーであることを示し"
 "ます。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
-msgid "BinOverride"
-msgstr "BinOverride"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:376
+#: apt-ftparchive.1.xml:388
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -3392,15 +2488,9 @@ msgstr ""
 "バイナリオーバーライドファイルを設定します。このオーバーライドファイルには、"
 "セクション、優先度、メンテナのアドレスといった情報が含まれています。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
-msgid "SrcOverride"
-msgstr "SrcOverride"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:394
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -3408,39 +2498,29 @@ msgstr ""
 "ソースオーバーライドファイルを設定します。このオーバーライドファイルには、セ"
 "クションの情報が含まれています。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
-msgid "ExtraOverride"
-msgstr "ExtraOverride"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr "バイナリ特別オーバーライドファイルを設定します。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
-msgid "SrcExtraOverride"
-msgstr "SrcExtraOverride"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
 msgstr "ソース特別オーバーライドファイルを設定します。"
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:398
-msgid "BinDirectory Section"
+#: apt-ftparchive.1.xml:410
+#, fuzzy
+#| msgid "BinDirectory Section"
+msgid "<literal>BinDirectory</literal> Section"
 msgstr "BinDirectory セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:400
+#: apt-ftparchive.1.xml:412
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -3455,13 +2535,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:420
 msgid "Sets the Packages file output."
 msgstr "Packages ファイルの出力先を設定します。"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:413
+#: apt-ftparchive.1.xml:425
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -3471,59 +2551,49 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419
+#: apt-ftparchive.1.xml:431
 msgid "Sets the Contents file output. (optional)"
 msgstr "Contents ファイルの出力先を設定します。(オプション)"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:436
 msgid "Sets the binary override file."
 msgstr "バイナリオーバーライドファイルを設定します。"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:429
+#: apt-ftparchive.1.xml:441
 msgid "Sets the source override file."
 msgstr "ソースオーバーライドファイルを設定します。"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:456
 msgid "Sets the cache DB."
 msgstr "キャッシュ DB を設定します。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:447
-msgid "PathPrefix"
-msgstr "PathPrefix"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:449
+#: apt-ftparchive.1.xml:461
 msgid "Appends a path to all the output paths."
 msgstr "全出力パスに付加するパス。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:452
-msgid "FileList, SourceFileList"
-msgstr "FileList, SourceFileList"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:454
+#: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
 msgstr "ファイル一覧ファイルを指定します。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:461
+#: apt-ftparchive.1.xml:473
 msgid "The Binary Override File"
 msgstr "バイナリオーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -3538,20 +2608,20 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:480
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:482
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:479
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3569,13 +2639,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:490
 msgid "The Source Override File"
 msgstr "ソースオーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -3587,13 +2657,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:497
 msgid "The Extra Override File"
 msgstr "特別オーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -3602,31 +2672,40 @@ msgstr ""
 "特別オーバーライドファイルは、出力中に任意のタグを追加・置換できるようにしま"
 "す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:496
-msgid "<option>--md5</option>"
-msgstr "<option>--md5</option>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:498
-msgid ""
-"Generate MD5 sums. This defaults to on, when turned off the generated index "
-"files will not have MD5Sum fields where possible.  Configuration Item: "
-"<literal>APT::FTPArchive::MD5</literal>"
+#: apt-ftparchive.1.xml:510
+#, fuzzy
+#| msgid ""
+#| "Values for the additional metadata fields in the Release file are taken "
+#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
+#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
+#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
+#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
+#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
+#| "literal>, <literal>Description</literal>."
+msgid ""
+"Generate the given checksum. These options default to on, when turned off "
+"the generated index files will not have the checksum fields where possible.  "
+"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
+"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
+"replaceable>::<replaceable>Checksum</replaceable></literal> where "
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 msgstr ""
-"MD5 sum を生成します。デフォルトで on になっており、off にすると生成したイン"
-"デックスファイルに MD5Sum フィールドがありません。設定項目 - <literal>APT::"
-"FTPArchive::MD5</literal>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:503
-msgid "<option>--db</option>"
-msgstr "<option>--db</option>"
+"Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::"
+"Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::"
+"Origin</literal>) をとります。サポートするフィールドは、<literal>Origin</"
+"literal>, <literal>Label</literal>, <literal>Suite</literal>, "
+"<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</"
+"literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, "
+"<literal>Components</literal>, <literal>Description</literal> です。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:505
+#: apt-ftparchive.1.xml:521
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3636,7 +2715,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:527
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3648,14 +2727,9 @@ msgstr ""
 "ベルを指定して、設定ファイルを上書きすることもできます。設定項目 - "
 "<literal>quiet</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:517
-msgid "<option>--delink</option>"
-msgstr "<option>--delink</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:519
+#: apt-ftparchive.1.xml:535
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3667,14 +2741,9 @@ msgstr ""
 "off にするには <option>--no-delink</option> としてください。設定項目 - "
 "<literal>APT::FTPArchive::DeLinkAct</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:525
-msgid "<option>--contents</option>"
-msgstr "<option>--contents</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:527
+#: apt-ftparchive.1.xml:543
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3688,14 +2757,9 @@ msgstr ""
 "Contents ファイルも作成できます。デフォルトは on です。設定項目 - "
 "<literal>APT::FTPArchive::Contents</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:535
-msgid "<option>--source-override</option>"
-msgstr "<option>--source-override</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:553
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3704,14 +2768,9 @@ msgstr ""
 "<literal>sources</literal> コマンドで使用する、ソースオーバーライドファイルを"
 "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
-msgid "<option>--readonly</option>"
-msgstr "<option>--readonly</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:559
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3719,40 +2778,69 @@ msgstr ""
 "キャッシュデータベースを読み取り専用にします。設定項目 - <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:547
-#, fuzzy
-#| msgid "<option>--version</option>"
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr "<option>--version</option>"
-
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml:564
+#, fuzzy
+msgid ""
+"Accept in the <literal>packages</literal> and <literal>contents</literal> "
+"commands only package files matching <literal>*_arch.deb</literal> or "
+"<literal>*_all.deb</literal> instead of all package files in the given "
+"path.  Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
+msgstr ""
+"コマンドが <literal>install</literal> か <literal>remove</literal> である場"
+"合、このオプションは使用していないパッケージを削除し、<literal>autoremove</"
+"literal> のように動作します。設定項目 - <literal>APT::Get::AutomaticRemove</"
+"literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:572
+msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed.  Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:584
+#, fuzzy
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
 "&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
-"that it is currently not possible to create these files with <command>apt-"
-"ftparchive</command>."
+"that the <filename>Translation-en</filename> master file can only be created "
+"in the generate command."
 msgstr ""
+"この設定オプションはデフォルトで \"<literal>true</literal>\" で、&apt-"
+"ftparchive; が <filename>Translation</filename> ファイルも生成した場合にのみ "
+"<literal>\"false\"</literal> に設定してください。現在 <command>apt-"
+"ftparchive</command> は、このファイルを生成できないことに注意してください。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
-#: sources.list.5.xml:193
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
+#: sources.list.5.xml:211
 msgid "Examples"
 msgstr "サンプル"
 
 # type: Content of: <refentry><refsect1><para><programlisting>
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:602
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
-msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgstr ""
+"<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+"\n"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:598
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3762,7 +2850,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:612
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3770,146 +2858,28 @@ msgstr ""
 "<command>apt-ftparchive</command> は正常終了時に 0 を返します。エラー時には十"
 "進の 100 を返します。"
 
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-get.8.xml:13
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
-"November 2008</date>"
-msgstr ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
-"November 2008</date>"
-
-# type: Content of: <refentry><refnamediv><refname>
-#. type: <heading></heading>
-#: apt-get.8.xml:22 apt-get.8.xml:29 guide.sgml:96
-msgid "apt-get"
-msgstr "apt-get"
-
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:30
+#: apt-get.8.xml:33
 msgid "APT package handling utility -- command-line interface"
 msgstr "APT パッケージ操作ユーティリティ -- コマンドラインインターフェース"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:36
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#| "<arg> <option>-t=</option> <group choice='req'> <arg choice='plain'> "
-#| "<replaceable>target_release_name</replaceable> </arg> <arg "
-#| "choice='plain'> <replaceable>target_release_number_expression</"
-#| "replaceable> </arg> <arg choice='plain'> "
-#| "<replaceable>target_release_codename</replaceable> </arg> </group> </arg> "
-#| "<group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-#| "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
-#| "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "<group choice='req'> <arg choice='plain'> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-#| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-#| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> </arg> </arg> <arg "
-#| "choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>check</"
-#| "arg> <arg choice='plain'>clean</arg> <arg choice='plain'>autoclean</arg> "
-#| "<arg choice='plain'>autoremove</arg> <arg choice='plain'> <group "
-#| "choice='req'> <arg choice='plain'>-v</arg> <arg choice='plain'>--version</"
-#| "arg> </group> </arg> <arg choice='plain'> <group choice='req'> <arg "
-#| "choice='plain'>-h</arg> <arg choice='plain'>--help</arg> </group> </arg> "
-#| "</group>"
-msgid ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
-"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <group choice='req'> <arg choice='plain'> "
-"<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> "
-"<replaceable>target_release_number_expression</replaceable> </arg> <arg "
-"choice='plain'> <replaceable>target_release_codename</replaceable> </arg> </"
-"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
-"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group "
-"choice='req'> <arg choice='plain'> =<replaceable>pkg_version_number</"
-"replaceable> </arg> <arg choice='plain'> /<replaceable>target_release_name</"
-"replaceable> </arg> <arg choice='plain'> /"
-"<replaceable>target_release_codename</replaceable> </arg> </group> </arg> </"
-"arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>purge <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-msgstr ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
-"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <group choice='req'> <arg choice='plain'> "
-"<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> "
-"<replaceable>target_release_number_expression</replaceable> </arg> <arg "
-"choice='plain'> <replaceable>target_release_codename</replaceable> </arg> </"
-"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
-"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group "
-"choice='req'> <arg choice='plain'> =<replaceable>pkg_version_number</"
-"replaceable> </arg> <arg choice='plain'> /<replaceable>target_release_name</"
-"replaceable> </arg> <arg choice='plain'> /"
-"<replaceable>target_release_codename</replaceable> </arg> </group> </arg> </"
-"arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>purge <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable> <arg> =<replaceable>pkg_version_number</"
-"replaceable> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-
-# type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:126
+#: apt-get.8.xml:39
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
 "library.  Several \"front-end\" interfaces exist, such as &dselect;, "
-"&aptitude;, &synaptic;, &gnome-apt; and &wajig;."
+"&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 "<command>apt-get</command> は、パッケージを操作するコマンドラインツールで、"
 "APT ライブラリを用いる他のツールのユーザ側「バックエンド」といえるものです。"
 "「フロントエンド」インターフェースには、&dselect;, &aptitude;, &synaptic;, "
-"&gnome-apt;, &wajig; などがあります。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
-msgid "update"
-msgstr "update"
+"&wajig; などがあります。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:49
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -3930,15 +2900,9 @@ msgstr ""
 "upgrade</literal> を行う前に常に実行してください。前もってパッケージファイル"
 "のサイズを知ることができないため、全体の進捗メータは正しく表示されません。"
 
-# type: <tag></tag>
-#. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
-msgid "upgrade"
-msgstr "upgrade"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:148
+#: apt-get.8.xml:61
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -3960,15 +2924,9 @@ msgstr ""
 "<literal>update</literal> を実行しておき、<command>apt-get</command> にパッ"
 "ケージの新しいバージョンがあることを知らせる必要があります。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:160
-msgid "dselect-upgrade"
-msgstr "dselect-upgrade"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:74
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3977,22 +2935,15 @@ msgid ""
 "realize that state (for instance, the removal of old and the installation of "
 "new packages)."
 msgstr ""
-"<literal>dselect-upgrade</literal> は、伝統的な Debian GNU/Linux パッケージ管"
-"理フロントエンドの &dselect; と共に使用されます。<literal>dselect-upgrade</"
-"literal> は、&dselect; で作られた利用可能パッケージの<literal>Status</"
-"literal> フィールドの変更を追跡し、その状態を反映させるのに必要なアクションを"
-"実行します。(例えば、古いパッケージの削除や新しいパッケージのインストールな"
-"ど)"
-
-# type: <tag></tag>
-#. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
-msgid "dist-upgrade"
-msgstr "dist-upgrade"
+"<literal>dselect-upgrade</literal> は、伝統的な Debian パッケージ管理フロント"
+"エンドの &dselect; と共に使用されます。<literal>dselect-upgrade</literal> "
+"は、&dselect; で作られた利用可能パッケージの<literal>Status</literal> フィー"
+"ルドの変更を追跡し、その状態を反映させるのに必要なアクションを実行します。(例"
+"えば、古いパッケージの削除や新しいパッケージのインストールなど)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:171
+#: apt-get.8.xml:84
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -4014,33 +2965,27 @@ msgstr ""
 "向けに、一般的な設定を上書きする機構については、&apt-preferences; をご覧くだ"
 "さい。"
 
-# type: <tag></tag>
-#. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
-msgid "install"
-msgstr "install"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:185
+#: apt-get.8.xml:98
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
-"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
-"packages required by the package(s) specified for installation will also be "
-"retrieved and installed.  The <filename>/etc/apt/sources.list</filename> "
-"file is used to locate the desired packages. If a hyphen is appended to the "
-"package name (with no intervening space), the identified package will be "
-"removed if it is installed.  Similarly a plus sign can be used to designate "
-"a package to install. These latter features may be used to override "
-"decisions made by apt-get's conflict resolution system."
+"qualified filename (for instance, in a Debian system, libc6 would be the "
+"argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All packages "
+"required by the package(s) specified for installation will also be retrieved "
+"and installed.  The <filename>/etc/apt/sources.list</filename> file is used "
+"to locate the desired packages. If a hyphen is appended to the package name "
+"(with no intervening space), the identified package will be removed if it is "
+"installed.  Similarly a plus sign can be used to designate a package to "
+"install. These latter features may be used to override decisions made by apt-"
+"get's conflict resolution system."
 msgstr ""
 "<literal>install</literal> の後には、インストールするパッケージを 1 つ以上指"
 "定します。指定するパッケージは、完全なファイル名ではなくパッケージ名です (例"
-"えば Debian GNU/Linux システムでは、<literal>libc6_1.9.6-2.deb</literal> では"
-"なく libc6 を引数として与えます)。インストールするよう指定したすべてのパッ"
-"ケージに対し、取得・インストールを行います。<filename>/etc/apt/sources.list</"
+"えば Debian システムでは、<literal>libc6_1.9.6-2.deb</literal> ではなく "
+"libc6 を引数として与えます)。インストールするよう指定したすべてのパッケージに"
+"対し、取得・インストールを行います。<filename>/etc/apt/sources.list</"
 "filename> ファイルを、要求するパッケージの場所を特定するのに使用します。パッ"
 "ケージ名の後ろに (空白を含まず) ハイフンが追加されている場合、そのパッケージ"
 "がインストールされていれば削除します。同様に、インストールするパッケージを明"
@@ -4049,7 +2994,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:203
+#: apt-get.8.xml:116
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -4067,16 +3012,16 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:123
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
-"バージョン選択機構はダウングレード時にも使用できるため、注意して使用しなけれ"
-"ばなりません。"
+"バージョン選択機構はダウングレードにも使用できるため、注意して使用しなければ"
+"なりません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:126
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -4086,10 +3031,17 @@ msgid ""
 "you wish to upgrade, and if a newer version is available, it (and its "
 "dependencies, as described above) will be downloaded and installed."
 msgstr ""
+"システムにインストール済みのパッケージを、すべてアップグレードするのではな"
+"く、いくつかのパッケージをアップグレードする場合にも、このターゲットを使用で"
+"きます。現在インストールされているパッケージすべての最新版をインストールする "
+"\"upgrade\" ターゲットと異なり、\"install\" は指定したパッケージの最新版のみ"
+"をインストールします。単純にアップグレードしたいパッケージ名をしてください。"
+"より新しいバージョンが利用できる場合、そのパッケージ (と前述の依存関係にある"
+"パッケージ) をダウンロード・インストールします。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:137
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -4099,7 +3051,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:141
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -4115,14 +3067,9 @@ msgstr ""
 "は、'how-lo' や 'lowest' にマッチすることに注意してください。そうしたくなけれ"
 "ば、'^' や '$' を付けるか、もっと詳しい正規表現を指定してください。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:237
-msgid "remove"
-msgstr "remove"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:238
+#: apt-get.8.xml:151
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -4136,14 +3083,9 @@ msgstr ""
 "(間に空白を含まずに) 付加されると、識別されたパッケージを、削除ではなくインス"
 "トールします。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:245
-msgid "purge"
-msgstr "purge"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:159
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -4152,49 +3094,28 @@ msgstr ""
 "パッケージが削除かつ完全削除 (すべての設定ファイルも削除) されるのを除き、"
 "<literal>purge</literal> は <literal>remove</literal> と同じです。"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:250
-msgid "source"
-msgstr "source"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
-#, fuzzy
-#| msgid ""
-#| "<literal>source</literal> causes <command>apt-get</command> to fetch "
-#| "source packages. APT will examine the available packages to decide which "
-#| "source package to fetch. It will then find and download into the current "
-#| "directory the newest available version of that source package. Source "
-#| "packages are tracked separately from binary packages via <literal>deb-"
-#| "src</literal> type lines in the &sources-list; file. This probably will "
-#| "mean that you will not get the same source as the package you have "
-#| "installed or as you could install. If the --compile options is specified "
-#| "then the package will be compiled to a binary .deb using dpkg-"
-#| "buildpackage, if --download-only is specified then the source package "
-#| "will not be unpacked."
+#: apt-get.8.xml:164
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
 "package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
 "default release, set with the option <literal>APT::Default-Release</"
 "literal>, the <option>-t</option> option or per package with the "
 "<literal>pkg/release</literal> syntax, if possible."
 msgstr ""
-"<literal>source</literal> は、ソースパッケージを取得するのに <command>apt-"
-"get</command> します。APT はどのソースパッケージを取得するか決定するよう、利"
-"用可能なパッケージを検討します。その後、最新の利用可能なソースパッケージを見"
-"つけ、カレントディレクトリへダウンロードします。バイナリパッケージとは別に "
-"&sources-list; ファイルの<literal>deb-src</literal> 行から、ソースパッケージ"
-"を追跡します。これは、インストールした (またはインストールできる) パッケージ"
-"と、取得元を変えることができることを示しています。--compile オプションが指定"
-"された場合、dpkg-buildpackage を用いてバイナリ .deb ファイルへコンパイルを行"
-"います。--download-only の場合はソースパッケージを展開しません。"
+"<literal>source</literal> は、<command>apt-get</command> にソースパッケージを"
+"取得させます。APT はどのソースパッケージを取得するか決めるため、利用可能な"
+"パッケージを検査します。その後、デフォルトリリースから最新の利用可能なソース"
+"パッケージを見つけ、カレントディレクトリへダウンロードします。デフォルトリ"
+"リースは、可能であれば、<literal>APT::Default-Release</literal> オプション、"
+"<option>-t</option> オプション、パッケージごとの <literal>pkg/release</"
+"literal> 構文で指定します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:259
+#: apt-get.8.xml:172
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -4202,19 +3123,35 @@ msgid ""
 "from. If you don't do this you will properly get another (newer, older or "
 "none) source version than the one you have installed or could install."
 msgstr ""
+"ソースパッケージは、&sources-list; ファイルの <literal>deb-src</literal> タイ"
+"プにより、バイナリパッケート分けて管理されます。つまり、ソースを取得したいリ"
+"ポジトリを、それぞれ追加する必要があるということです。こうしないと、インス"
+"トール済み・インストール可能なものとは違う (新しい、または古い、存在しない) "
+"もっと適切なものを取得します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:179
+#, fuzzy
+#| msgid ""
+#| "If the <option>--compile</option> option is specified then the package "
+#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+#| "command>, if <option>--download-only</option> is specified then the "
+#| "source package will not be unpacked."
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
-"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
-"<option>--download-only</option> is specified then the source package will "
-"not be unpacked."
+"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+"the architecture as defined by the <command>--host-architecture</command> "
+"option.  If <option>--download-only</option> is specified then the source "
+"package will not be unpacked."
 msgstr ""
+"<option>--compile</option> オプションを指定すると、<command>dpkg-"
+"buildpackage</command> を用いてバイナリ .deb パッケージをコンパイルします。"
+"<option>--download-only</option> を指定すると、ソースパッケージを展開しませ"
+"ん。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:186
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -4229,7 +3166,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:192
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -4238,29 +3175,26 @@ msgstr ""
 "tar ball はカレントディレクトリにのみダウンロードされ、カレントディレクトリに"
 "展開されることに注意してください。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
-msgid "build-dep"
-msgstr "build-dep"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:198
+#, fuzzy
+#| msgid ""
+#| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
+#| "an attempt to satisfy the build dependencies for a source package."
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
-"attempt to satisfy the build dependencies for a source package."
+"attempt to satisfy the build dependencies for a source package. By default "
+"the dependencies are satisfied to build the package natively. If desired a "
+"host-architecture can be specified with the <option>--host-architecture</"
+"option> option instead."
 msgstr ""
 "<literal>build-dep</literal> は、ソースパッケージの構築依存関係を満たすよう"
 "に、パッケージのインストール・削除を行います。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
-msgid "check"
-msgstr "check"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:205
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -4268,9 +3202,16 @@ msgstr ""
 "<literal>check</literal> は、パッケージキャッシュの更新や壊れた依存関係を"
 "チェックする診断ツールです。"
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:210
+msgid ""
+"<literal>download</literal> will download the given binary package into the "
+"current directory."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:216
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -4287,14 +3228,9 @@ msgstr ""
 "ます。dselectを使用しない場合は、ディスクスペースを解放するため、時々 "
 "<literal>apt-get clean</literal> を実行したくなるでしょう。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:302
-msgid "autoclean"
-msgstr "autoclean"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:226
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -4312,30 +3248,39 @@ msgstr ""
 "に off をセットしていれば、インストール済のパッケージファイルが削除されるのを"
 "防げます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
-msgid "autoremove"
-msgstr "autoremove"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:236
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for some package and that "
+#| "are no more needed."
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for some package and that "
-"are no more needed."
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
 msgstr ""
 "<literal>autoremove</literal> は、依存関係を満たすために自動的にインストール"
 "され、もう必要なくなったパッケージを削除するのに使用します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323 apt-get.8.xml:429
-msgid "<option>--no-install-recommends</option>"
-msgstr "<option>--no-install-recommends</option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:241
+msgid ""
+"<literal>changelog</literal> downloads a package changelog and displays it "
+"through <command>sensible-pager</command>. The server name and base "
+"directory is defined in the <literal>APT::Changelogs::Server</literal> "
+"variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+"for Ubuntu).  By default it displays the changelog for the version that is "
+"installed.  However, you can specify the same options as for the "
+"<option>install</option> command."
+msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:264
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -4343,14 +3288,23 @@ msgstr ""
 "「推奨」パッケージをインストールする依存関係と見なしません。設定項目 - "
 "<literal>APT::Install-Recommends</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
-msgid "<option>--download-only</option>"
-msgstr "<option>--download-only</option>"
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:269
+#, fuzzy
+#| msgid ""
+#| "Do not consider recommended packages as a dependency for installing.  "
+#| "Configuration Item: <literal>APT::Install-Recommends</literal>."
+msgid ""
+"Consider suggested packages as a dependency for installing.  Configuration "
+"Item: <literal>APT::Install-Suggests</literal>."
+msgstr ""
+"「推奨」パッケージをインストールする依存関係と見なしません。設定項目 - "
+"<literal>APT::Install-Recommends</literal>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:274
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -4358,51 +3312,36 @@ msgstr ""
 "ダウンロードのみ - パッケージファイルの取得のみを行い、展開・インストールを行"
 "いません。設定項目 - <literal>APT::Get::Download-Only</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:333
-msgid "<option>--fix-broken</option>"
-msgstr "<option>--fix-broken</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:334
+#: apt-get.8.xml:279
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations.  Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations.  Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 "修復 - 依存関係が壊れたシステムの修正を試みます。このオプションを install や "
-"remove と一緒に使うときは、パッケージを指定しなくてもかまいません。どのパッ"
-"ケージを指定しても、完全に問題を解決します。APT 自体は、システムに存在する壊"
-"れたパッケージ依存関係を許すことができないので、初めて APT を実行する場合、こ"
-"のオプションが必要になることがあります。システムの依存関係構造にかなり問題が"
-"ある場合は、手動で修正するよう要求することもあります。(通常は、問題のあるパッ"
-"ケージを取り除くのに &dselect; や <command>dpkg --remove</command> を使用しま"
-"す) このオプションを <option>-m</option> オプションと同時に使用すると、エラー"
-"になる状況があるかもしれません。設定項目 - <literal>APT::Get::Fix-Broken</"
-"literal>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:347
-msgid "<option>--ignore-missing</option>"
-msgstr "<option>--ignore-missing</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:348
-msgid "<option>--fix-missing</option>"
-msgstr "<option>--fix-missing</option>"
+"remove と一緒に使うときは、APT が解決法を推測するので、パッケージを指定しなく"
+"てもかまいません。どのパッケージを指定しても、完全に問題を解決します。APT 自"
+"体は、システムに存在する破損したパッケージ依存関係を許すことができないので、"
+"初めて APT を実行する場合、このオプションが必要になることがあります。システム"
+"の依存関係構造にかなり問題がある場合は、手動で修正するよう要求することもあり"
+"ます。(通常は、問題のあるパッケージを取り除くのに &dselect; や <command>dpkg "
+"--remove</command> を使用します) このオプションを <option>-m</option> オプ"
+"ションと同時に使用すると、エラーになる状況があるかもしれません。設定項目 - "
+"<literal>APT::Get::Fix-Broken</literal>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:349
+#: apt-get.8.xml:294
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -4420,14 +3359,9 @@ msgstr ""
 "かった場合に、なにも表示せず保留することになります。設定項目 - <literal>APT::"
 "Get::Fix-Missing</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
-msgid "<option>--no-download</option>"
-msgstr "<option>--no-download</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:360
+#: apt-get.8.xml:305
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -4439,7 +3373,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:367
+#: apt-get.8.xml:312
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4457,19 +3391,9 @@ msgstr ""
 "をつけずに -qq を使用するべきではありません。設定項目 - <literal>quiet</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:377
-msgid "<option>--simulate</option>"
-msgstr "<option>--simulate</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>--dry-run</option>"
-msgstr "<option>--dry-run</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:382
+#: apt-get.8.xml:327
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -4479,7 +3403,7 @@ msgstr ""
 "行いません。設定項目 - <literal>APT::Get::Simulate</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:386
+#: apt-get.8.xml:331
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -4488,16 +3412,16 @@ msgid ""
 "will be triggered if run as root (root should know what he is doing without "
 "further warnings by <literal>apt-get</literal>)."
 msgstr ""
+"シミュレーションは、自動ではロックを行わず (<literal>Debug::NoLocking</"
+"literal>) ユーザ権限で実行します。また、<literal>APT::Get::Show-User-"
+"Simulation-Note</literal> オプション (デフォルト: true) をセットすると、これ"
+"がシミュレーションであるという注意を表示したりもします。root 権限で実行する"
+"と、NoLocking も 注意も行われません (root は <literal>apt-get</literal> によ"
+"る警告などなくても、何をしているのか知っているべきです)。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
-#, fuzzy
-#| msgid ""
-#| "Simulate prints out a series of lines each one representing a dpkg "
-#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
-#| "brackets indicate broken packages with and empty set of square brackets "
-#| "meaning breaks that are of no consequence (rare)."
+#: apt-get.8.xml:337
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4508,24 +3432,9 @@ msgstr ""
 "(Remv)、展開 (Inst) を表示します。角カッコは壊れたパッケージを表し、(まれに) "
 "空の角カッコは大した問題ではないことを表します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
-msgid "<option>-y</option>"
-msgstr "<option>-y</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
-msgid "<option>--yes</option>"
-msgstr "<option>--yes</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
-msgid "<option>--assume-yes</option>"
-msgstr "<option>--assume-yes</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:346
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -4538,19 +3447,23 @@ msgstr ""
 "るような不適切な状況の場合、<literal>apt-get</literal> は処理を中断します。設"
 "定項目 - <literal>APT::Get::Assume-Yes</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
-msgid "<option>-u</option>"
-msgstr "<option>-u</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
-msgid "<option>--show-upgraded</option>"
-msgstr "<option>--show-upgraded</option>"
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:354
+#, fuzzy
+#| msgid ""
+#| "Compile source packages after downloading them.  Configuration Item: "
+#| "<literal>APT::Get::Compile</literal>."
+msgid ""
+"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+"ソースパッケージをダウンロード後、コンパイルします。設定項目 - <literal>APT::"
+"Get::Compile</literal>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:359
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4558,19 +3471,9 @@ msgstr ""
 "更新パッケージ表示 - 更新される全パッケージを一覧表示します。設定項目 - "
 "<literal>APT::Get::Show-Upgraded</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
-msgid "<option>-V</option>"
-msgstr "<option>-V</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
-msgid "<option>--verbose-versions</option>"
-msgstr "<option>--verbose-versions</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:365
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -4578,24 +3481,20 @@ msgstr ""
 "更新・インストールするパッケージのバージョンをすべて表示します。設定項目 - "
 "<literal>APT::Get::Show-Versions</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
-msgid "<option>-b</option>"
-msgstr "<option>-b</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
-msgid "<option>--compile</option>"
-msgstr "<option>--compile</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
-msgid "<option>--build</option>"
-msgstr "<option>--build</option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:371
+msgid ""
+"This option controls the architecture packages are built for by <command>apt-"
+"get source --compile</command> and how cross-builddependencies are "
+"satisfied. By default is it not set which means that the host architecture "
+"is the same as the build architecture (which is defined by <literal>APT::"
+"Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
+"Architecture</literal>"
+msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:381
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -4603,29 +3502,9 @@ msgstr ""
 "ソースパッケージをダウンロード後、コンパイルします。設定項目 - <literal>APT::"
 "Get::Compile</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
-msgid "<option>--install-recommends</option>"
-msgstr "<option>--install-recommends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
-msgid "Also install recommended packages."
-msgstr "「推奨」パッケージもインストールします。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
-msgid "Do not install recommended packages."
-msgstr "「推奨」パッケージをインストールしません。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:433
-msgid "<option>--ignore-hold</option>"
-msgstr "<option>--ignore-hold</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:434
+#: apt-get.8.xml:386
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -4637,14 +3516,9 @@ msgstr ""
 "を保留の解除をするのに使用すると便利です。設定項目 - <literal>APT::Ignore-"
 "Hold</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:440
-msgid "<option>--no-upgrade</option>"
-msgstr "<option>--no-upgrade</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:441
+#: apt-get.8.xml:393
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4655,14 +3529,22 @@ msgstr ""
 "<literal>no-upgrade</literal> は、指定したパッケージがすでにインストールして"
 "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:447
-msgid "<option>--force-yes</option>"
-msgstr "<option>--force-yes</option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:400
+#, fuzzy
+msgid ""
+"Do not install new packages; When used in conjunction with <literal>install</"
+"literal>, <literal>only-upgrade</literal> will install upgrades for already "
+"installed packages only and ignore requests to install new packages.  "
+"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
+msgstr ""
+"パッケージ更新なし -  <literal>install</literal> と同時に使用すると、"
+"<literal>no-upgrade</literal> は、指定したパッケージがすでにインストールして"
+"ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:408
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -4675,14 +3557,9 @@ msgstr ""
 "方がいいでしょう。<literal>force-yes</literal> は、あなたのシステムを破壊しか"
 "ねません! 設定項目 - <literal>APT::Get::force-yes</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:455
-msgid "<option>--print-uris</option>"
-msgstr "<option>--print-uris</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:416
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -4702,18 +3579,13 @@ msgstr ""
 "の展開はユーザの責任において行ってください。設定項目 - <literal>APT::Get::"
 "Print-URIs</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:466
-msgid "<option>--purge</option>"
-msgstr "<option>--purge</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:467
+#: apt-get.8.xml:427
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
-"<option>remove --purge</option> is equivalent for <option>purge</option> "
+"<option>remove --purge</option> is equivalent to the <option>purge</option> "
 "command.  Configuration Item: <literal>APT::Get::Purge</literal>."
 msgstr ""
 "削除する際、「削除」ではなく「完全削除」を行います。「完全削除」を行うと指示"
@@ -4721,14 +3593,9 @@ msgstr ""
 "purge</option> は <option>purge</option> コマンドと等価です。 設定項目 - "
 "<literal>APT::Get::Purge</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:474
-msgid "<option>--reinstall</option>"
-msgstr "<option>--reinstall</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:475
+#: apt-get.8.xml:435
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4736,14 +3603,9 @@ msgstr ""
 "すでに最新版がインストールされていても、パッケージを再インストールします。設"
 "定項目 - <literal>APT::Get::ReInstall</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:479
-msgid "<option>--list-cleanup</option>"
-msgstr "<option>--list-cleanup</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:480
+#: apt-get.8.xml:440
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -4758,19 +3620,9 @@ msgstr ""
 "filename> の中身を管理します。これを OFF にするのは、取得元リストを頻繁に変更"
 "する時ぐらいでしょう。設定項目 - <literal>APT::Get::List-Cleanup</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:489
-msgid "<option>--target-release</option>"
-msgstr "<option>--target-release</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
-msgid "<option>--default-release</option>"
-msgstr "<option>--default-release</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:451
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -4791,14 +3643,9 @@ msgstr ""
 "option>、<option>-t sid</option> でしょう。設定項目 - <literal>APT::Default-"
 "Release</literal>。&apt-preferences; のマニュアルページもご覧ください。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:504
-msgid "<option>--trivial-only</option>"
-msgstr "<option>--trivial-only</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:466
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4810,14 +3657,9 @@ msgstr ""
 "と答えますが、<option>--trivial-only</option> はすべて no と答えます。設定項"
 "目 - <literal>APT::Get::Trivial-Only</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:512
-msgid "<option>--no-remove</option>"
-msgstr "<option>--no-remove</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:473
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4825,14 +3667,9 @@ msgstr ""
 "パッケージが削除される状況になったとき、プロンプトを表示せず中断します。設定"
 "項目 - <literal>APT::Get::Remove</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:518
-msgid "<option>--auto-remove</option>"
-msgstr "<option>--auto-remove</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:479
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4844,14 +3681,9 @@ msgstr ""
 "literal> のように動作します。設定項目 - <literal>APT::Get::AutomaticRemove</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
-msgid "<option>--only-source</option>"
-msgstr "<option>--only-source</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:486
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -4868,24 +3700,9 @@ msgstr ""
 "付けなくなる、ということです。設定項目 - <literal>APT::Get::Only-Source</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
-msgid "<option>--diff-only</option>"
-msgstr "<option>--diff-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
-msgid "<option>--dsc-only</option>"
-msgstr "<option>--dsc-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
-msgid "<option>--tar-only</option>"
-msgstr "<option>--tar-only</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:497
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4895,14 +3712,9 @@ msgstr ""
 "設定項目 - <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Tar-"
 "Only</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:542
-msgid "<option>--arch-only</option>"
-msgstr "<option>--arch-only</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:503
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -4910,15 +3722,9 @@ msgstr ""
 "構築依存関係の解決を、アーキテクチャに依存したもののみ行います。設定項目 - "
 "<literal>APT::Get::Arch-Only</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:547
-msgid "<option>--allow-unauthenticated</option>"
-msgstr "<option>--allow-unauthenticated</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:548
-#, fuzzy
+#: apt-get.8.xml:508
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -4928,27 +3734,21 @@ msgstr ""
 "うなツールで便利です。設定項目 - <literal>APT::Get::AllowUnauthenticated</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:561
-msgid ""
-"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-"&file-statelists;"
-msgstr ""
-
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:570
+#: apt-get.8.xml:530
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
 "preferences;, the APT Howto."
 msgstr ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &docdir; の APT ユーザーズガイド, &apt-preferences;, APT Howto"
+"&apt-config;, &apt-secure;, &guidesdir; の APT ユーザーズガイド, &apt-"
+"preferences;, APT Howto"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:576
+#: apt-get.8.xml:536
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -4956,53 +3756,15 @@ msgstr ""
 "<command>apt-get</command> は正常終了時に 0 を返します。エラー時には十進の "
 "100 を返します。"
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:579
-msgid "ORIGINAL AUTHORS"
-msgstr "原著者"
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:580
-msgid "&apt-author.jgunthorpe;"
-msgstr "&apt-author.jgunthorpe;"
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:583
-msgid "CURRENT AUTHORS"
-msgstr "現著者"
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:585
-msgid "&apt-author.team;"
-msgstr "&apt-author.team;"
-
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-key.8.xml:14 apt-key.8.xml:21
-msgid "apt-key"
-msgstr "apt-key"
-
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:22
+#: apt-key.8.xml:32
 msgid "APT key management utility"
 msgstr "APT キー管理ユーティリティ"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:28
-msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
-"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
-"arg>"
-msgstr ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
-"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
-"arg>"
-
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:39
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -5014,94 +3776,59 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:45
 msgid "Commands"
 msgstr "コマンド"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
-msgid "add <replaceable>filename</replaceable>"
-msgstr "add <replaceable>filename</replaceable>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:50
+#, fuzzy
+#| msgid ""
+#| "Add a new key to the list of trusted keys.  The key is read from "
+#| "<replaceable>filename</replaceable>, or standard input if "
+#| "<replaceable>filename</replaceable> is <literal>-</literal>."
 msgid ""
-"Add a new key to the list of trusted keys.  The key is read from "
-"<replaceable>filename</replaceable>, or standard input if "
-"<replaceable>filename</replaceable> is <literal>-</literal>."
+"Add a new key to the list of trusted keys.  The key is read from the "
+"filename given with the parameter &synopsis-param-filename; or if the "
+"filename is <literal>-</literal> from standard input."
 msgstr ""
 "信頼キー一覧に新しいキーを追加します。このキーは <replaceable>filename</"
 "replaceable> から読み込みますが、<replaceable>filename</replaceable> を "
 "<literal>-</literal> とすると、標準入力から読み込みます。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
-msgid "del <replaceable>keyid</replaceable>"
-msgstr "del <replaceable>keyid</replaceable>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:63
 msgid "Remove a key from the list of trusted keys."
 msgstr "信頼キー一覧からキーを削除します。"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
-msgid "export <replaceable>keyid</replaceable>"
-msgstr "export <replaceable>keyid</replaceable>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
-msgid "Output the key <replaceable>keyid</replaceable> to standard output."
-msgstr "キー <replaceable>keyid</replaceable> を標準出力に出力します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
-msgid "exportall"
-msgstr "exportall"
+#: apt-key.8.xml:74
+msgid "Output the key &synopsis-param-keyid; to standard output."
+msgstr "キー &synopsis-param-keyid; を標準出力に出力します。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:85
 msgid "Output all trusted keys to standard output."
 msgstr "信頼するキーをすべて標準出力に出力します。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
-msgid "list"
-msgstr "list"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:96
 msgid "List trusted keys."
 msgstr "信頼キーを一覧表示します。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
-msgid "finger"
-msgstr "finger"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:107
 msgid "List fingerprints of trusted keys."
 msgstr "信頼キーのフィンガープリントを一覧表示します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
-msgid "adv"
-msgstr "adv"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:118
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -5109,53 +3836,85 @@ msgstr ""
 "gpg に上級オプションを渡します。adv --recv-key とすると、公開鍵をダウンロード"
 "できます。"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:127
+#: apt-key.8.xml:130
 msgid ""
-"Update the local keyring with the keyring of Debian archive keys and removes "
-"from the keyring the archive keys which are no longer valid."
+"Update the local keyring with the archive keyring and remove from the local "
+"keyring the archive keys which are no longer valid.  The archive keyring is "
+"shipped in the <literal>archive-keyring</literal> package of your "
+"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
+"Debian."
 msgstr ""
-"Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーをキー"
-"リングから削除します。"
-
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:140
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
-msgstr "<filename>/etc/apt/trusted.gpg</filename>"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
-msgstr "ローカル信頼キーのキーリング。新しいキーはここに追加されます。"
-
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-key.8.xml:144
-msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+msgid ""
+"Work similar to the <command>update</command> command above, but get the "
+"archive keyring from an URI instead and validate it against a master key.  "
+"This requires an installed &wget; and an APT build configured to have a "
+"server to fetch from and a master keyring to validate.  APT in Debian does "
+"not support this command and relies on <command>update</command> instead, "
+"but Ubuntu's APT does."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml:161
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+"前節で説明したコマンドの前に、このオプションを定義する必要があることに注意し"
+"てください。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:164
+#, fuzzy
+#| msgid ""
+#| "With this option it is possible to specify a specific keyring file the "
+#| "command should operate on. The default is that a command is executed on "
+#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
+#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
+#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
+#| "added to this one."
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+"このオプションでは、コマンドが動作する際のキーリングを指定できます。デフォル"
+"トは、<filename>trusted.gpg</filename> と <filename>trusted.gpg.d</filename> "
+"ディレクトリにあるすべてのファイルで動作します。この中で <filename>trusted."
+"gpg</filename> がプライマリキーリングです。つまり新しいキーはこのファイルに追"
+"加されます。"
+
+# type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:179
+msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:180
 msgid "Local trust database of archive keys."
 msgstr "アーカイブキーのローカル信頼データベースです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:183
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:184
 msgid "Keyring of Debian archive trusted keys."
 msgstr "Debian アーカイブ信頼キーのキーリングです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:187
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
@@ -5163,67 +3922,25 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:153
+#: apt-key.8.xml:188
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr "削除された Debian アーカイブ信頼キーのキーリングです。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:197
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-mark.8.xml:13
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-#| "November 2007</date>"
-msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
-msgstr ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-"November 2007</date>"
-
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-mark.8.xml:22 apt-mark.8.xml:29
-msgid "apt-mark"
-msgstr "apt-mark"
-
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:30
+#: apt-mark.8.xml:33
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "パッケージが自動的にインストールされたかどうかのマークを変更します。"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:36
-#, fuzzy
-#| msgid ""
-#| "<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-#| "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req"
-#| "\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" "
-#| "rep=\"repeat\"><replaceable>package</replaceable></arg>"
-msgid ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
-"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
-msgstr ""
-"<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req"
-"\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>package</replaceable></arg>"
-
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:53
+#: apt-mark.8.xml:39
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -5233,14 +3950,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
-#, fuzzy
-#| msgid ""
-#| "When you request that a package is installed, and as a result other "
-#| "packages are installed to satisfy its dependencies, the dependencies are "
-#| "marked as being automatically installed.  Once these automatically "
-#| "installed packages are no longer depended on by any manually installed "
-#| "packages, they will be removed."
+#: apt-mark.8.xml:43
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -5249,20 +3959,21 @@ msgid ""
 "removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
 msgstr ""
 "パッケージをインストールすると要求し、その結果、別のパッケージが依存関係を満"
-"たすためにインストールされた場合、依存関係に自動的にインストールしたとマーク"
-"します。いったん自動的にインストールされたパッケージは、手動でインストールし"
-"たパッケージに依存されなくなると、そのパッケージは削除されます。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:65
-msgid "markauto"
-msgstr "markauto"
+"たすためにインストールされた場合、依存関係に自動的にインストールしたと印を付"
+"けます。いったん自動的にインストールされたパッケージは、手動でインストールし"
+"たパッケージに依存されなくなると、そのパッケージは、例えば <command>apt-get</"
+"command> や <command>aptitude</command> により削除されます。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:66
+#: apt-mark.8.xml:52
+#, fuzzy
+#| msgid ""
+#| "<literal>markauto</literal> is used to mark a package as being "
+#| "automatically installed, which will cause the package to be removed when "
+#| "no more manually installed packages depend on this package."
 msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
 "installed packages depend on this package."
 msgstr ""
@@ -5270,16 +3981,16 @@ msgstr ""
 "マークします。このパッケージに依存する、手動でインストールされたパッケージが"
 "なくなると、このパッケージを削除します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:73
-msgid "unmarkauto"
-msgstr "unmarkauto"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:74
+#: apt-mark.8.xml:60
+#, fuzzy
+#| msgid ""
+#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
 msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
 "if no other packages depend on it."
 msgstr ""
@@ -5287,121 +3998,90 @@ msgstr ""
 "マークします。このパッケージに依存する他のパッケージがなくなっても、このパッ"
 "ケージを自動的に削除するのを防ぎます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:81
-msgid "showauto"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:68
+msgid ""
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed.  The command is only a wrapper around <command>dpkg --set-"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:82
+#: apt-mark.8.xml:78
 #, fuzzy
 #| msgid ""
-#| "<literal>autoremove</literal> is used to remove packages that were "
-#| "automatically installed to satisfy dependencies for some package and that "
-#| "are no more needed."
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
 msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
 msgstr ""
-"<literal>autoremove</literal> は、依存関係を満たすために自動的にインストール"
-"され、もう必要なくなったパッケージを削除するのに使用します。"
+"<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
+"ケージごとに改行して表示します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:93
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:84
 #, fuzzy
-#| msgid "<option>-f=<filename>FILENAME</filename></option>"
+#| msgid ""
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
 msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr "<option>-f=<filename>FILENAME</filename></option>"
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line.  All automatically "
+"installed packages will be listed if no package is given.  If packages are "
+"given only those which are automatically installed will be shown."
+msgstr ""
+"<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
+"ケージごとに改行して表示します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:94
-#, fuzzy
-#| msgid "<option>--file=<filename>FILENAME</filename></option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:92
 msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
-msgstr "<option>--file=<filename>FILENAME</filename></option>"
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
+msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:97
+#: apt-mark.8.xml:99
 #, fuzzy
 #| msgid ""
-#| "Read/Write package stats from <filename>FILENAME</filename> instead of "
-#| "the default location, which is <filename>extended_status</filename> in "
-#| "the directory defined by the Configuration Item: <literal>Dir::State</"
-#| "literal>."
+#| "<literal>showauto</literal> is used to print a list of automatically "
+#| "installed packages with each package on a new line."
 msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
 msgstr ""
-"デフォルトの場所 (設定項目: <literal>Dir::State</literal> で定義したディレク"
-"トリの <filename>extended_status</filename>) に代えて、<filename>FILENAME</"
-"filename> からパッケージの統計を読み書きします。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:103
-msgid "<option>-h</option>"
-msgstr "<option>-h</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:104
-msgid "<option>--help</option>"
-msgstr "<option>--help</option>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:105
-msgid "Show a short usage summary."
-msgstr "短い使用方法を表示します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:111
-msgid "<option>-v</option>"
-msgstr "<option>-v</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:112
-msgid "<option>--version</option>"
-msgstr "<option>--version</option>"
+"<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
+"ケージごとに改行して表示します。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:113
-msgid "Show the program version."
-msgstr "プログラムのバージョン情報を表示します"
-
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:124
+#: apt-mark.8.xml:115
 #, fuzzy
-#| msgid "<filename>/etc/apt/preferences</filename>"
-msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr "<filename>/etc/apt/preferences</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:125
+#| msgid ""
+#| "Read/Write package stats from <filename><replaceable>FILENAME</"
+#| "replaceable></filename> instead of the default location, which is "
+#| "<filename>extended_status</filename> in the directory defined by the "
+#| "Configuration Item: <literal>Dir::State</literal>."
 msgid ""
-"Status list of auto-installed packages.  Configuration Item: <literal>Dir::"
-"State</literal> sets the path to the <filename>extended_states</filename> "
-"file."
+"Read/Write package stats from the filename given with the parameter "
+"&synopsis-param-filename; instead of from the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
 msgstr ""
+"デフォルトの場所 (設定項目: <literal>Dir::State</literal> で定義したディレク"
+"トリの <filename>extended_status</filename>) に代えて、<filename>FILENAME</"
+"filename> からパッケージの統計を読み書きします。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:134
-#, fuzzy
-#| msgid "&apt-cache; &apt-conf;"
-msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-cache; &apt-conf;"
-
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:136
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -5409,21 +4089,15 @@ msgstr ""
 "<command>apt-mark</command> は正常終了時に 0 を返します。エラー時には十進の "
 "100 を返します。"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-secure.8.xml:14 apt-secure.8.xml:36
-msgid "apt-secure"
-msgstr "apt-secure"
-
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:37
+#: apt-secure.8.xml:47
 msgid "Archive authentication support for APT"
 msgstr "APT アーカイブ認証サポート"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:42
+#: apt-secure.8.xml:52
 msgid ""
 "Starting with version 0.6, <command>apt</command> contains code that does "
 "signature checking of the Release file for all archives. This ensures that "
@@ -5436,7 +4110,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:50
+#: apt-secure.8.xml:60
 msgid ""
 "If a package comes from a archive without a signature or with a signature "
 "that apt does not have a key for that package is considered untrusted and "
@@ -5452,7 +4126,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:59
+#: apt-secure.8.xml:69
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -5462,21 +4136,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:64
+#: apt-secure.8.xml:74
 msgid "Trusted archives"
 msgstr "信頼済アーカイブ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:67
-#, fuzzy
-#| msgid ""
-#| "The chain of trust from an apt archive to the end user is made up of "
-#| "different steps. <command>apt-secure</command> is the last step in this "
-#| "chain, trusting an archive does not mean that the packages that you trust "
-#| "it do not contain malicious code but means that you trust the archive "
-#| "maintainer. Its the archive maintainer responsibility to ensure that the "
-#| "archive integrity is correct."
+#: apt-secure.8.xml:77
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of "
 "different steps. <command>apt-secure</command> is the last step in this "
@@ -5488,12 +4154,13 @@ msgstr ""
 "apt アーカイブからエンドユーザまでの信頼の輪は、いくつかのステップで構成され"
 "ています。<command>apt-secure</command> は、この輪の最後のステップで、アーカ"
 "イブを信頼することは、パッケージに悪意のあるコードが含まれていないと信頼する"
-"わけではありませんが、アーカイブメンテナを信頼すると言うことです。これは、"
-"アーカイブの完全性を保証するのは、アーカイブメンテナの責任だということです。"
+"わけではありませんが、アーカイブメンテナを信頼するということになります。これ"
+"は、アーカイブの完全性が正しいことを保証するのは、アーカイブメンテナの責任だ"
+"ということです。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:75
+#: apt-secure.8.xml:85
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
@@ -5507,7 +4174,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:82
+#: apt-secure.8.xml:92
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
 "or a new version of a package to the Debian archive. This upload in order to "
@@ -5525,16 +4192,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:92
-#, fuzzy
-#| msgid ""
-#| "Once the uploaded package is verified and included in the archive, the "
-#| "maintainer signature is stripped off, an MD5 sum of the package is "
-#| "computed and put in the Packages file. The MD5 sum of all of the packages "
-#| "files are then computed and put into the Release file. The Release file "
-#| "is then signed by the archive key (which is created once a year and "
-#| "distributed through the FTP server. This key is also on the Debian "
-#| "keyring."
+#: apt-secure.8.xml:102
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, an MD5 sum of the package is computed "
@@ -5543,16 +4201,15 @@ msgid ""
 "by the archive key (which is created once a year) and distributed through "
 "the FTP server. This key is also on the Debian keyring."
 msgstr ""
-"アップロードされたパッケージごとに、検証してアーカイブに格納します。パッケー"
-"ジは、メンテナの署名をはがされ、MD5 sum を計算されて、Packages ファイルに格納"
-"されます。その後、全パッケージファイルの MD5 sum を計算してから、Release ファ"
-"イルに置きます。Release ファイルは、アーカイブキーで署名されます。アーカイブ"
-"キーは年ごとに作成され、FTP サーバで配布されます。このキーも Debian キーリン"
-"グに含まれます。"
+"アップロードされたパッケージが検証されてアーカイブに格納されると、メンテナの"
+"署名をはがし、パッケージの MD5 sum を計算して、Packages ファイルに格納しま"
+"す。その後、全パッケージファイルの MD5 sum を計算して、Release ファイルに格納"
+"します。Release ファイルは、(毎年作成される) アーカイブキーで署名され、FTP "
+"サーバで配布されます。このキーも Debian キーリングに含まれます。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:102
+#: apt-secure.8.xml:112
 msgid ""
 "Any end user can check the signature of the Release file, extract the MD5 "
 "sum of a package from it and compare it with the MD5 sum of the package he "
@@ -5568,7 +4225,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:109
+#: apt-secure.8.xml:119
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -5578,7 +4235,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:114
+#: apt-secure.8.xml:124
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, a malicious agent can introduce himself in the package download "
@@ -5594,7 +4251,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:122
+#: apt-secure.8.xml:132
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -5607,7 +4264,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:129
+#: apt-secure.8.xml:139
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -5620,13 +4277,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:135
+#: apt-secure.8.xml:145
 msgid "User configuration"
 msgstr "ユーザの設定"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:137
+#: apt-secure.8.xml:147
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
 "by apt. It can be used to add or remove keys although an installation of "
@@ -5640,13 +4297,22 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:144
+#: apt-secure.8.xml:154
+#, fuzzy
+#| msgid ""
+#| "In order to add a new key you need to first download it (you should make "
+#| "sure you are using a trusted communication channel when retrieving it), "
+#| "add it with <command>apt-key</command> and then run <command>apt-get "
+#| "update</command> so that apt can download and verify the "
+#| "<filename>Release.gpg</filename> files from the archives you have "
+#| "configured."
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get update</"
-"command> so that apt can download and verify the <filename>Release.gpg</"
-"filename> files from the archives you have configured."
+"command> so that apt can download and verify the <filename>InRelease</"
+"filename> or <filename>Release.gpg</filename> files from the archives you "
+"have configured."
 msgstr ""
 "新しいキーを追加するためには、まずキーをダウンロードする必要があります。(取得"
 "する際には、信頼できる通信チャネルを使用するよう、特に留意してください) 取得"
@@ -5657,13 +4323,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:153
+#: apt-secure.8.xml:163
 msgid "Archive configuration"
 msgstr "アーカイブの設定"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:165
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -5673,54 +4339,46 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:160
-#, fuzzy
-#| msgid ""
-#| "<literal>Create a toplevel Release file</literal>.  if it does not exist "
-#| "already. You can do this by running <command>apt-ftparchive release</"
-#| "command> (provided in apt-utils)."
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
 "command> (provided in apt-utils)."
 msgstr ""
-"<literal>最上位 Release ファイルの作成</literal>。既にこれが存在しているので"
-"なければ、<command>apt-ftparchive release</command> (apt-utils で提供) を実行"
-"して作成してください。"
+"<emphasis>最上位 Release ファイルの作成</emphasis>。既にこれが存在しているの"
+"でなければ、<command>apt-ftparchive release</command> (apt-utils で提供) を実"
+"行して作成してください。"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:165
+#: apt-secure.8.xml:175
 #, fuzzy
 #| msgid ""
-#| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -"
-#| "o Release.gpg Release</command>."
+#| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"
+#| "abs -o Release.gpg Release</command>."
 msgid ""
-"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -"
-"o Release.gpg Release</command>."
+"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
+"clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
+"gpg Release</command>."
 msgstr ""
-"<literal>署名</literal>します。<command>gpg -abs -o Release.gpg Release</"
+"<emphasis>署名</emphasis>します。<command>gpg -abs -o Release.gpg Release</"
 "command> を実行して、署名してください。"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:168
-#, fuzzy
-#| msgid ""
-#| "<literal>Publish the key fingerprint</literal>, that way your users will "
-#| "know what key they need to import in order to authenticate the files in "
-#| "the archive."
+#: apt-secure.8.xml:179
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
 "archive."
 msgstr ""
-"<literal>キーの指紋を配布</literal> これにより、アーカイブ内のファイル認証"
-"に、どのキーをインポートする必要があるかを、ユーザに知らせることになります。"
+"<emphasis>キーの指紋を配布</emphasis>します。これにより、アーカイブ内のファイ"
+"ル認証に、どのキーをインポートする必要があるかを、ユーザに知らせることになり"
+"ます。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:175
+#: apt-secure.8.xml:186
 msgid ""
 "Whenever the contents of the archive changes (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps previously "
@@ -5731,7 +4389,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:183
+#: apt-secure.8.xml:194
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"
@@ -5741,30 +4399,30 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:198
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
-"\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
-"Manual (available also in the harden-doc package) and the <ulink url="
-"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
-"Distribution HOWTO</ulink> by V. Alex Brennen."
+"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+"(available also in the harden-doc package) and the <ulink url=\"http://www."
+"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
+"ulink> by V. Alex Brennen."
 msgstr ""
 "詳細な背景情報を検証するのなら、Securing Debian Manual (harden-doc パッケージ"
 "にも収録) の <ulink url=\"http://www.debian.org/doc/manuals/securing-debian-"
-"howto/ch7.en.html\">Debian Security Infrastructure</ulink> 章や、V. Alex "
-"Brennen による <ulink url=\"http://www.cryptnet.net/fdp/crypto/strong_distro."
-"html\" >Strong Distribution HOWTO</ulink> をご覧ください。"
+"howto/ch7\">Debian Security Infrastructure</ulink> 章や、V. Alex Brennen によ"
+"る <ulink url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" "
+">Strong Distribution HOWTO</ulink> をご覧ください。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:200
+#: apt-secure.8.xml:211
 msgid "Manpage Authors"
 msgstr "マニュアルページ作者"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:202
+#: apt-secure.8.xml:213
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -5772,35 +4430,15 @@ msgstr ""
 "このマニュアルページは Javier Fernández-Sanguino Peña, Isaac Jones, Colin "
 "Walters, Florian Weimer, Michael Vogt の作業を元にしています。"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:29
-msgid "apt-sortpkgs"
-msgstr "apt-sortpkgs"
-
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:30
+#: apt-sortpkgs.1.xml:33
 msgid "Utility to sort package index files"
 msgstr "パッケージインデックスファイルのソートユーティリティ"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:36
-msgid ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-msgstr ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:45
+#: apt-sortpkgs.1.xml:39
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (Source index or "
 "Package index) and sort the records so that they are ordered by the package "
@@ -5813,19 +4451,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:51
+#: apt-sortpkgs.1.xml:45
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 "出力はすべて標準出力に送られ、入力は検索できるファイルでなければなりません。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:58
-msgid "<option>--source</option>"
-msgstr "<option>--source</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:60
+#: apt-sortpkgs.1.xml:54
 msgid ""
 "Use Source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -5835,7 +4468,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:74
+#: apt-sortpkgs.1.xml:68
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -5843,75 +4476,100 @@ msgstr ""
 "<command>apt-sortpkgs</command> は正常終了時に 0 を返します。エラー時には十進"
 "の 100 を返します。"
 
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt.conf.5.xml:13
-#, fuzzy
-#| msgid ""
-#| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-#| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
-#| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
-#| "email; &apt-product; <date>10 December 2008</date>"
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
-"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>18 September 2009</date>"
+#. type: Content of: <refentry><refentryinfo><author><contrib>
+#: apt.conf.5.xml:20
+msgid "Initial documentation of Debug::*."
 msgstr ""
-"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
-"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>10 December 2008</date>"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt.conf.5.xml:28 apt.conf.5.xml:35
-msgid "apt.conf"
-msgstr "apt.conf"
+#. type: Content of: <refentry><refentryinfo><author><email>
+#: apt.conf.5.xml:21
+msgid "dburrows@debian.org"
+msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:29 apt_preferences.5.xml:22 sources.list.5.xml:23
+#: apt.conf.5.xml:31 apt_preferences.5.xml:25 sources.list.5.xml:26
 msgid "5"
 msgstr "5"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:36
+#: apt.conf.5.xml:38
 msgid "Configuration file for APT"
 msgstr "APT の設定ファイル"
 
-# type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:42
 msgid ""
 "<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, all tools make use of the configuration file and a common "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
-msgstr ""
-"<filename>apt.conf</filename> は、APT ツール集のメイン設定ファイルです。この"
-"設定ファイルと共通のコマンドラインパーサを使って、すべてのツールを統一環境で"
-"使用できます。APT ツールの起動時には、<envar>APT_CONFIG</envar> 環境変数に指"
-"定した設定を (存在すれば) 読み込みます。次に <literal>Dir::Etc::Parts</"
-"literal> のファイルを読み込みます。次に <literal>Dir::Etc::main</literal> で"
-"指定した主設定ファイルを読み込み、最後にコマンドラインオプションで、設定ファ"
-"イルより取得した値を上書きします。"
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+"<filename>apt.conf</filename> は、APT ツールスイートのメイン設定ファイルです"
+"が、間違いなくオプションの変更を指定するだけの場所などではありません。そのた"
+"め、すべてのツールは設定ファイルを共有し、統一環境を提供するため、共通のコマ"
+"ンドラインパーサも使用します。"
 
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:47
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr "APT ツールの起動時に、設定ファイルを以下の順番で読み込みます。"
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr "<envar>APT_CONFIG</envar> 環境変数で指定したファイル (存在する場合)"
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:51
 #, fuzzy
 #| msgid ""
-#| "The configuration file is organized in a tree with options organized into "
-#| "functional groups. option specification is given with a double colon "
-#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an "
-#| "option within the APT tool group, for the Get tool. options do not "
-#| "inherit from their parent groups."
+#| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+#| "order which have no or \"<literal>conf</literal>\" as filename extension "
+#| "and which only contain alphanumeric, hyphen (-), underscore (_) and "
+#| "period (.) characters - otherwise they will be silently ignored."
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters.  Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
+msgstr ""
+"<literal>Dir::Etc::Parts</literal> にあるすべてのファイルを英数字の昇順に。"
+"ファイル名には拡張子がないか、\"<literal>conf</literal>\" となっており、英数"
+"字、ハイフン (-)、アンダースコア (_)、ピリオド (.) で構成されています。そうで"
+"なければ、黙って無視されます。"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:58
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr "<literal>Dir::Etc::Main</literal> で指定される、メイン設定ファイル"
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:60
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+"コマンドラインオプションにより、設定ディレクティブの上書きや設定ファイルの追"
+"加読み込みができます。"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:64
+msgid "Syntax"
+msgstr "構文"
+
+# type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:65
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -5920,22 +4578,13 @@ msgid ""
 "their parent groups."
 msgstr ""
 "設定ファイルは、機能グループごとに系統立てられたオプションを木構造で表しま"
-"す。オプションの内容は、2 つのコロンで区切ります。例えば <literal>APT::Get::"
+"す。オプションの指定は、2 つのコロンで区切ります。例えば <literal>APT::Get::"
 "Assume-Yes</literal> は、APT ツールグループの Get ツール用オプションです。オ"
 "プションは、親グループから継承しません。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
-#, fuzzy
-#| msgid ""
-#| "Syntactically the configuration language is modeled after what the ISC "
-#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
-#| "literal> are treated as comments (ignored), as well as all text between "
-#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
-#| "comments.  Each line is of the form <literal>APT::Get::Assume-Yes \"true"
-#| "\";</literal> The trailing semicolon is required and the quotes are "
-#| "optional. A new scope can be opened with curly braces, like:"
+#: apt.conf.5.xml:71
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -5949,17 +4598,19 @@ msgid ""
 "alphanumerical characters and the \"/-:._+\" characters. A new scope can be "
 "opened with curly braces, like:"
 msgstr ""
-"設定言語の文法は、bind や dhcp のような ISC ツールをモデルにしています。"
+"設定言語の構文は、bind や dhcp のような ISC ツールをモデルにしています。"
 "<literal>//</literal> で始まる行はコメントとして扱われます (無視)。同様に C/C"
 "++ のコメントのような <literal>/*</literal> と <literal>*/</literal> の間もコ"
 "メントとして扱います。いずれの行も、<literallayout>APT::Get::Assume-Yes "
-"\"true\";</literallayout> のような形式です。行末のセミコロンは必要ですが、ダ"
-"ブルクォートは使わなくてもかまいません。以下のように中カッコを使うと、新しい"
-"スコープを開くことができます。"
+"\"true\";</literallayout> のような形式です。行末のセミコロンとクォートは必要"
+"です。値は1行でなければならず、文字列結合はありません。値の中にクォートは使え"
+"ません。値中のバックスラッシュ \"\\\" とエスケープ文字は、未定義で使用するべ"
+"きではありません。オプション名は、英数字と \"/-:._+\" が使用できます。以下の"
+"ように中カッコを使うと、新しいスコープを開くことができます。"
 
 # type: Content of: <refentry><refsect1><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:85
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -5978,7 +4629,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:93
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
@@ -5990,14 +4641,16 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:98
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
-msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
+msgstr ""
+"DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
+"\n"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:101
 msgid ""
 "In general the sample configuration file in <filename>&docdir;examples/apt."
 "conf</filename> &configureindex; is a good guide for how it should look."
@@ -6006,7 +4659,7 @@ msgstr ""
 "定ファイルのサンプルです。どのように設定するか参考になるでしょう。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:105
 msgid ""
 "The names of the configuration items are not case-sensitive. So in the "
 "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -6015,7 +4668,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal> とできます。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:108
 msgid ""
 "Names for the configuration items are optional if a list is defined as it "
 "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -6023,18 +4676,15 @@ msgid ""
 "list. If you specify a name you can override the option as every other "
 "option by reassigning a new value to the option."
 msgstr ""
+"前述した <literal>DPkg::Pre-Install-Pkgs</literal> の例で見られるように、リス"
+"トを定義した場合、設定項目名はオプションになります。名前を指定しない場合、新"
+"しいエントリは、単純に新しいオプションをリストに追加します。名前を指定する"
+"と、あらゆる他の選択肢をオプションに再割り当てし、オプションを上書きできま"
+"す。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
-#, fuzzy
-#| msgid ""
-#| "Two specials are allowed, <literal>#include</literal> and "
-#| "<literal>#clear</literal> <literal>#include</literal> will include the "
-#| "given file, unless the filename ends in a slash, then the whole directory "
-#| "is included.  <literal>#clear</literal> is used to erase a part of the "
-#| "configuration tree. The specified element and all its descendents are "
-#| "erased."
+#: apt.conf.5.xml:113
 msgid ""
 "Two specials are allowed, <literal>#include</literal> (which is deprecated "
 "and not supported by alternative implementations) and <literal>#clear</"
@@ -6044,14 +4694,16 @@ msgid ""
 "The specified element and all its descendants are erased.  (Note that these "
 "lines also need to end with a semicolon.)"
 msgstr ""
-"<literal>#include</literal> と <literal>#clear</literal> の 2 つの特別な記法"
-"があります。<literal>#include</literal> は指定したファイルを取り込みます。"
-"ファイル名がスラッシュで終わった場合には、そのディレクトリをすべて取り込みま"
-"す。<literal>#clear</literal> は、設定ツリーの一部を削除するにに使用します。"
-"指定した要素と、それ以下の要素を削除します。"
+"<literal>#include</literal> (これは廃止予定でサポートしない他の実装もありま"
+"す) と <literal>#clear</literal> の 2 つの特別な記法があります。"
+"<literal>#include</literal> は指定したファイルを取り込みます。ファイル名がス"
+"ラッシュで終わった場合には、そのディレクトリをすべて取り込みます。"
+"<literal>#clear</literal> は、設定ツリーの一部を削除するにに使用します。指定"
+"した要素と、それ以下の要素を削除します (これらの行も、セミコロンで終わる必要"
+"があることに注意してください)。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:121
 msgid ""
 "The #clear command is the only way to delete a list or a complete scope.  "
 "Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -6059,37 +4711,57 @@ msgid ""
 "overridden by addressing a new value to it - lists and scopes can't be "
 "overridden, only cleared."
 msgstr ""
+"#clear コマンドは、リストや完全なスコープを削除する唯一の方法です。スコープの"
+"再オープンや後述する :: スタイルは、それまで書いたエントリを<emphasis>上書き"
+"しません</emphasis>。新しい値を与えて上書きするしかありません。リストやスコー"
+"プは上書きできません。クリアされるだけです。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:126
 #, fuzzy
 #| msgid ""
 #| "All of the APT tools take a -o option which allows an arbitrary "
 #| "configuration directive to be specified on the command line. The syntax "
 #| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
 #| "instance) followed by an equals sign then the new value of the option. "
-#| "Lists can be appended too by adding a trailing :: to the list name."
+#| "Lists can be appended too by adding a trailing :: to the list name. (As "
+#| "you might suspect: The scope syntax can't be used on the command line.)"
 msgid ""
 "All of the APT tools take a -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
 "full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
-"followed by an equals sign then the new value of the option. Lists can be "
-"appended too by adding a trailing :: to the list name. (As you might "
+"followed by an equals sign then the new value of the option. To append a new "
+"element to a list, add a trailing :: to the name of the list. (As you might "
 "suspect: The scope syntax can't be used on the command line.)"
 msgstr ""
-"すべての APT ツールで、コマンドラインで任意の設定を行う -o オプションが使用で"
-"きます。文法は、完全なオプション名 (例: <literal>APT::Get::Assume-Yes</"
-"literal>)、等号、続いてオプションの新しい値となります。リスト名に続き::を加え"
-"ることで、リストを追加することができます。"
+"すべての APT ツールで、コマンドラインで任意の設定ディレクティブを指定できる -"
+"o オプションが使用できます。構文は、完全なオプション名 (例: <literal>APT::"
+"Get::Assume-Yes</literal>)、等号、続いてオプションの新しい値となります。リス"
+"ト名に続き :: を加えることで、リストを追加できます (疑問に思われたように、ス"
+"コープ構文はコマンドラインで使用できません)。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:133
+#, fuzzy
+#| msgid ""
+#| "Note that you can use :: only for appending one item per line to a list "
+#| "and that you should not use it in combination with the scope syntax.  "
+#| "(The scope syntax implicit insert ::) Using both syntaxes together will "
+#| "trigger a bug which some users unfortunately relay on: An option with the "
+#| "unusual name \"<literal>::</literal>\" which acts like every other option "
+#| "with a name. These introduces many problems including that a user who "
+#| "writes multiple lines in this <emphasis>wrong</emphasis> syntax in the "
+#| "hope to append to a list will gain the opposite as only the last "
+#| "assignment for this option \"<literal>::</literal>\" will be used. "
+#| "Upcoming APT versions will raise errors and will stop working if they "
+#| "encounter this misuse, so please correct such statements now as long as "
+#| "APT doesn't complain explicit about them."
 msgid ""
 "Note that you can use :: only for appending one item per line to a list and "
 "that you should not use it in combination with the scope syntax.  (The scope "
 "syntax implicit insert ::) Using both syntaxes together will trigger a bug "
-"which some users unfortunately relay on: An option with the unusual name "
+"which some users unfortunately depend on: An option with the unusual name "
 "\"<literal>::</literal>\" which acts like every other option with a name. "
 "These introduces many problems including that a user who writes multiple "
 "lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
@@ -6099,16 +4771,26 @@ msgid ""
 "correct such statements now as long as APT doesn't complain explicit about "
 "them."
 msgstr ""
+"1 行で 1 項目の場合にのみ :: は使用でき、スコープ構文と組み合わせるべきではな"
+"いことに注意してください (スコープ構文には暗黙で :: が挿入されます)。両方の構"
+"文を同時に使用すると、「他のオプションと同様に名前と共に動作する、普通ではな"
+"い名前 \"<literal>::</literal>\" のオプションである」といった、(残念なこと"
+"に) 複数のユーザに渡るバグの引き金になります。問題の中には、リストに追加しよ"
+"うと<emphasis>誤った</emphasis>構文で複数行書くユーザが、このオプション "
+"\"<literal>::</literal>\" を最後に割り当てようとして、正反対の結果を得るとい"
+"うことも含まれます。APT の次期バージョンでは、この誤用を検出すると、動作を停"
+"止しエラーを上げるようになります。そのため、APT がこの件で明白にエラーを吐か"
+"ない限りは、自分でそのような構文を修正してください。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:145
 msgid "The APT Group"
 msgstr "APT グループ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:146
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -6116,15 +4798,9 @@ msgstr ""
 "このオプショングループは、ツール全体に影響のある、一般的な APT の振る舞いを制"
 "御します。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
-msgid "Architecture"
-msgstr "Architecture"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:151
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -6134,33 +4810,35 @@ msgstr ""
 "に使用するアーキテクチャをセットします。内部でのデフォルトは、apt をコンパイ"
 "ルしたアーキテクチャです。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
-msgid "Default-Release"
-msgstr "Default-Release"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:157
+msgid ""
+"All Architectures the system supports. Processors implementing the "
+"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
+"set are e.g. also able to execute binaries compiled for the <literal>i386</"
+"literal> (<literal>x86</literal>) instruction set; This list is use when "
+"fetching files and parsing package lists. The internal default is always the "
+"native architecture (<literal>APT::Architecture</literal>)  and all foreign "
+"architectures it can retrieve by calling <command>dpkg --print-foreign-"
+"architectures</command>."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:167
 msgid ""
 "Default release to install packages from if more than one version available. "
 "Contains release name, codename or release version. Examples: 'stable', "
-"'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-"
-"preferences;."
+"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
+"'5.0*'. See also &apt-preferences;."
 msgstr ""
 "ひとつ以上のバージョンがある場合に、パッケージをインストールを行うデフォルト"
-"リリースです。リリース名や、コード名、リリースバージョンです。例えば "
-"stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'  となりま"
-"す。 &apt-preferences; も参照してください。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
-msgid "Ignore-Hold"
-msgstr "Ignore-Hold"
+"リリースです。リリース名や、コード名、リリースバージョンがあります。例えば "
+"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
+"'4.0', '5.0*'  となります。&apt-preferences; も参照してください。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:173
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -6168,15 +4846,9 @@ msgstr ""
 "保留パッケージの無視 - このグローバルオプションは、問題解決器に保留と指定した"
 "パッケージを無視します。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
-msgid "Clean-Installed"
-msgstr "Clean-Installed"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:178
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -6189,14 +4861,8 @@ msgstr ""
 "たパッケージの再インストール方法を、直接提供するわけではないことに注意してく"
 "ださい。"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
-msgid "Immediate-Configure"
-msgstr "Immediate-Configure"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:185
 msgid ""
 "Defaults to on which will cause APT to install essential and important "
 "packages as fast as possible in the install/upgrade operation. This is done "
@@ -6212,13 +4878,13 @@ msgid ""
 "dependencies which can generate a problem if the dependencies e.g. form a "
 "circle as a dependency with the immediate flag is comparable with a Pre-"
 "Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "
 "to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
 "the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
 "scenario above is not the only problem immediate configuration can help to "
 "prevent in the first place.  Before a big operation like <literal>dist-"
 "upgrade</literal> is run with this option disabled it should be tried to "
@@ -6227,15 +4893,33 @@ msgid ""
 "distribution and to the APT team with the buglink below so they can work on "
 "improving or correcting the upgrade process."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
-msgid "Force-LoopBreak"
-msgstr "Force-LoopBreak"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+"デフォルトで有効で、インストールやアップグレード処理中に、APT が不可欠パッ"
+"ケージや重要パッケージのインストールを、可能な限り早く行うようになります。"
+"&dpkg; の呼び出す際の失敗回数に制限があるため、このようなオプションがありま"
+"す。このオプションが無効の場合、APT は重要パッケージを、特別パッケージと同様"
+"に扱うようになります。重要パッケージ A を展開していて、その設定中に他の展開や"
+"設定をたくさん呼び出すと、パッケージ B は A とはなんの関係もないにもかかわら"
+"ず、dpkg の呼び出しが失敗します (つまり B のメンテナスクリプトがエラーを返し"
+"ます)。この結果、システムの状態として、パッケージ A は展開済みで未設定となり"
+"ます。A に依存するパッケージは、動作の保証がなくなり、A に対する依存関係は、"
+"もう満たせなくなります。 即時設定マーカは、たとえば環状の依存関係といった問題"
+"が発生しそうな、すべての依存関係に先行依存と同等の即時フラグを適用します。そ"
+"のため理論上では、APT が即時設定できない、エラーが発生する、このオプションを"
+"参照するといった状況になる可能性があるのは、ユーザが即時設定を一時的に無効に"
+"して、インストールやアップグレードを行った場合です。「理論上」と言う単語を"
+"使ったのは、現在現実世界でこの問題に遭遇したのは、不安定版を使用しており、問"
+"題になっていたパッケージの間違った依存関係が原因だったり、システムが既に破損"
+"状態であったりした数回だけだからです。前述のシナリオが、即時設定が主に回避す"
+"る問題のすべてというわけではないため、このオプションを闇雲に無効にするべきで"
+"はありません。<literal>dist-upgrade</literal> のような大きな操作を、このオプ"
+"ションを無効にして行う前に、APT がすぐに設定できないパッケージを、明示的に "
+"<literal>install</literal> してみてください。ですが、アップグレードプロセスの"
+"改善のため、バグのリンクにあるディストリビューションと APT チームにも、問題の"
+"レポートをおねがいします。"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:208
 msgid ""
 "Never Enable this option unless you -really- know what you are doing. It "
 "permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6252,40 +4936,35 @@ msgstr ""
 "ションは、tar, gzip, libc, dpkg, bash とそれらが依存しているパッケージ以外の"
 "不可欠パッケージで動作します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
-msgid "Cache-Limit"
-msgstr "Cache-Limit"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:217
 msgid ""
-"APT uses a fixed size memory mapped cache file to store the 'available' "
-"information. This sets the size of that cache (in bytes)."
+"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
+"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
+"to which size the Cache will grow and is therefore the amount of memory APT "
+"will request at startup. The default value is 20971520 bytes (~20 MB). Note "
+"that this amount of space needs to be available for APT otherwise it will "
+"likely fail ungracefully, so for memory restricted devices this value should "
+"be lowered while on systems with a lot of configured sources it should be "
+"increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
+"of 1048576 (~1 MB) how much the Cache size will be increased in the event "
+"the space defined by <literal>Cache-Start</literal> is not enough. These "
+"value will be applied again and again until either the cache is big enough "
+"to store all information or the size of the cache reaches the <literal>Cache-"
+"Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
+"stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
+"automatic grow of the cache is disabled."
 msgstr ""
-"APT は「利用可能」情報を格納するために、固定サイズのメモリマップキャッシュ"
-"ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
-msgid "Build-Essential"
-msgstr "Build-Essential"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:233
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr "構築依存関係で不可欠なパッケージを定義します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
-msgid "Get"
-msgstr "Get"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:237
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
@@ -6293,14 +4972,9 @@ msgstr ""
 "Get サブセクションは &apt-get; ツールを制御します。このオプションの詳細は "
 "&apt-get; の文書を参照してください。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
-msgid "Cache"
-msgstr "Cache"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:242
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
@@ -6308,14 +4982,9 @@ msgstr ""
 "Cache サブセクションは &apt-cache; ツールを制御します。このオプションの詳細"
 "は &apt-cache; の文書を参照してください。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
-msgid "CDROM"
-msgstr "CDROM"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:247
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
@@ -6325,17 +4994,62 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:253
 msgid "The Acquire Group"
 msgstr "Acquire グループ"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
-msgid "PDiffs"
-msgstr "PDiffs"
+# type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:254
+#, fuzzy
+#| msgid ""
+#| "The <literal>Acquire</literal> group of options controls the download of "
+#| "packages and the URI handlers.  <placeholder type=\"variablelist\" id="
+#| "\"0\"/>"
+msgid ""
+"The <literal>Acquire</literal> group of options controls the download of "
+"packages and the URI handlers."
+msgstr ""
+"オプションの <literal>Acquire</literal> グループは、パッケージのダウンロード"
+"や URI ハンドラの制御を行います。<placeholder type=\"variablelist\" id=\"0\"/"
+">"
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:259
+msgid ""
+"Security related option defaulting to true as an expiring validation for a "
+"Release file prevents longtime replay attacks and can e.g. also help users "
+"to identify no longer updated mirrors - but the feature depends on the "
+"correctness of the time on the user system.  Archive maintainers are "
+"encouraged to create Release files with the <literal>Valid-Until</literal> "
+"header, but if they don't or a stricter value is volitional the following "
+"<literal>Max-ValidTime</literal> option can be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:270
+msgid ""
+"Seconds the Release file should be considered valid after it was created "
+"(indicated by the <literal>Date</literal> header).  If the Release file "
+"itself includes a <literal>Valid-Until</literal> header the earlier date of "
+"the two is used as the expiration date.  The default value is <literal>0</"
+"literal> which stands for \"for ever valid\".  Archive specific settings can "
+"be made by appending the label of the archive to the option name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:281
+msgid ""
+"Minimum of seconds the Release file should be considered valid after it was "
+"created (indicated by the <literal>Date</literal> header).  Use this if you "
+"need to use a seldomly updated (local) mirror of a more regular updated "
+"archive with a <literal>Valid-Until</literal> header instead of completely "
+"disabling the expiration date checking.  Archive specific settings can and "
+"should be used by appending the label of the archive to the option name."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:292
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
@@ -6344,14 +5058,33 @@ msgstr ""
 "<literal>PDiffs</literal> と呼ばれる差分をダウンロードしようとします。デフォ"
 "ルトでは True です。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
-msgid "Queue-Mode"
-msgstr "Queue-Mode"
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:295
+#, fuzzy
+#| msgid ""
+#| "Two sub-options to limit the use of PDiffs are also available: With "
+#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
+#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+#| "other hand is the maximum percentage of the size of all patches compared "
+#| "to the size of the targeted file. If one of these limits is exceeded the "
+#| "complete file is downloaded instead of the patches."
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to update a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum percentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+"PDiffs の使用を制限するふたつのサブオプションがあります。<literal>FileLimit</"
+"literal> では、PDiff ファイルをいくつダウンロードしてパッチを当てるかを指定し"
+"ます。一方、<literal>SizeLimit</literal> は、対象ファイルのサイズに対して、全"
+"パッチサイズの最大パーセンテージを指定します。どちらの制限を超えても、パッチ"
+"をダウンロードする代わりに、完全なファイルをダウンロードします。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:305
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6364,15 +5097,9 @@ msgstr ""
 "<literal>host</literal> は、ターゲットホストごとに 1 接続を開きます。"
 "<literal>access</literal> は、URI タイプごとに 1 接続を開きます。"
 
-# type: Content of: <refentry><refsect1><refsect2><title>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
-msgid "Retries"
-msgstr "Retries"
-
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:313
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -6380,14 +5107,9 @@ msgstr ""
 "リトライの回数を設定します。0 でない場合、APT は失敗したファイルに対して、与"
 "えられた回数だけリトライを行います。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
-msgid "Source-Symlinks"
-msgstr "Source-Symlinks"
-
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:318
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
@@ -6396,23 +5118,9 @@ msgstr ""
 "き、可能ならコピーの代わりにシンボリックリンクを張ります。true がデフォルトで"
 "す。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
-msgid "http"
-msgstr "http"
-
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
-#, fuzzy
-#| msgid ""
-#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
-#| "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. "
-#| "Per host proxies can also be specified by using the form <literal>http::"
-#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
-#| "literal> meaning to use no proxies. The <envar>http_proxy</envar> "
-#| "environment variable will override all settings."
+#: apt.conf.5.xml:323
 msgid ""
 "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
 "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6425,12 +5133,12 @@ msgstr ""
 "<literal>http://[[user][:pass]@]host[:port]/</literal> という標準形で表しま"
 "す。ホストごとのプロキシの場合は、<literal>http::Proxy::&lt;host&gt;</"
 "literal> という形と、プロキシを使用しないという意味の特殊キーワード "
-"<literal>DIRECT</literal> を使用して指定することもできます。すべての設定は、"
-"環境変数 <envar>http_proxy</envar> で上書きされます。"
+"<literal>DIRECT</literal> を使用して指定することもできます。上記の設定をなに"
+"も指定しないと、環境変数 <envar>http_proxy</envar> を使用します。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:331
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6455,7 +5163,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:341 apt.conf.5.xml:407
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "
@@ -6465,37 +5173,27 @@ msgstr ""
 "設定します。これには、接続のタイムアウトとデータのタイムアウトが含まれていま"
 "す。"
 
-# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
-#, fuzzy
-#| msgid ""
-#| "One setting is provided to control the pipeline depth in cases where the "
-#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2)  "
-#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
-#| "5 indicating how many outstanding requests APT should send. A value of "
-#| "zero MUST be specified if the remote host does not properly linger on TCP "
-#| "connections - otherwise data corruption will occur. Hosts which require "
-#| "this are in violation of RFC 2068."
-msgid ""
-"One setting is provided to control the pipeline depth in cases where the "
-"remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
-"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
-"indicating how many outstanding requests APT should send. A value of zero "
-"MUST be specified if the remote host does not properly linger on TCP "
-"connections - otherwise data corruption will occur. Hosts which require this "
-"are in violation of RFC 2068."
-msgstr ""
-"リモートサーバが RFC 準拠でなかったり、(Squid 2.0.2 のように) バグがあったり"
-"したときのために、パイプラインの深さの制御を設定します。<literal>Acquire::"
-"http::Pipeline-Depth</literal> により、APT が送信できるリクエストの回数を 0 "
-"から 5 の値で設定できます。リモートサーバが適切でなく、TCP 接続に時間がかかる"
-"ときは、<emphasis>必ず</emphasis> 0 の値を設定しなければなりません。そうでな"
-"ければデータが破損してしまいます。これが必要なホストは RFC 2068 に違反してい"
-"ます。"
+#: apt.conf.5.xml:344
+msgid ""
+"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are send in a "
+"pipeline.  Previous APT versions had a default of 10 for this setting, but "
+"the default value is now 0 (= disabled) to avoid problems with the ever-"
+"growing amount of webservers and proxies which choose to not conform to the "
+"HTTP/1.1 specification."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:351
+msgid ""
+"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
+"redirects, which is enabled by default."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:354
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6503,28 +5201,24 @@ msgid ""
 "bandwidth (Note that this option implicit deactivates the download from "
 "multiple servers at the same time.)"
 msgstr ""
+"使用する帯域を制限するには、<literal>Acquire::http::Dl-Limit</literal> にキロ"
+"バイトで整数値を与えます。デフォルト値は 0 で、制限を解除し、使用できる帯域を"
+"すべて使おうとします (このオプションは暗黙的に、同時に複数のサーバからダウン"
+"ロードしなくなることに注意してください)。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:359
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
 "clients only if the client uses a known identifier."
 msgstr ""
-
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
-msgid "https"
-msgstr "https"
+"クライアントが既知の識別子を使用する場合にのみ、プロキシがアクセスを許可する"
+"場合、<literal>Acquire::http::User-Agent</literal> を使用して、http でダウン"
+"ロードするための、異なる User-Agent を設定できます。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
-#, fuzzy
-#| msgid ""
-#| "HTTPS URIs. Cache-control and proxy options are the same as for "
-#| "<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option "
-#| "is not supported yet."
+#: apt.conf.5.xml:366
 msgid ""
 "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 "options are the same as for <literal>http</literal> method and will also "
@@ -6532,12 +5226,14 @@ msgid ""
 "not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
 "not supported yet."
 msgstr ""
-"HTTPS URI - キャッシュの制御やプロキシオプションは <literal>http</literal> メ"
-"ソッドと同様です。<literal>Pipeline-Depth</literal> オプションはまだサポート"
-"していません。"
+"HTTPS URI - キャッシュ制御、タイムアウト、AllowRedirect、Dl-Limit、プロキシオ"
+"プションは <literal>http</literal> メソッドと同様です。また、https 用に明示的"
+"に設定されない場合、オプションのデフォルト値は <literal>http</literal> メソッ"
+"ドと同じです。<literal>Pipeline-Depth</literal> オプションはまだサポートして"
+"いません。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:372
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6556,29 +5252,25 @@ msgid ""
 "<literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host "
 "option."
 msgstr ""
-
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
-msgid "ftp"
-msgstr "ftp"
+"<literal>CaInfo</literal> サブオプションは、信頼済み証明書情報の保持場所を指"
+"定します。<literal>&lt;host&gt;::CaInfo</literal> は、対応するホストごとのオ"
+"プションです。<literal>Verify-Peer</literal> 真偽値サブオプションは、信頼済み"
+"証明書に対してサーバのホスト証明書を、検証するかどうかを決定します。"
+"<literal>&lt;host&gt;::Verify-Peer</literal> は、対応するホストごとのオプショ"
+"ンです。<literal>Verify-Host</literal> 真偽値サブオプションは、サーバのホスト"
+"名を検証するかどうかを決定します。<literal>&lt;host&gt;::Verify-Host</"
+"literal> は、対応するホストごとのオプションです。<literal>SslCert</literal> "
+"は、クライアント認証に使用する証明書を決定します。<literal>&lt;host&gt;::"
+"SslCert</literal> は、対応するホストごとのオプションです。<literal>SslKey</"
+"literal> は、クライアント認証に使用する秘密鍵を決定します。<literal>&lt;"
+"host&gt;::SslKey</literal> は、対応するホストごとのオプションです。"
+"<literal>SslForceVersion</literal> は、デフォルトで使用する SSL のバージョン"
+"を上書きします。'TLSv1' か 'SSLv3' という文字列を指定できます。<literal>&lt;"
+"host&gt;::SslForceVersion</literal> は、対応するホストごとのオプションです。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
-#, fuzzy
-#| msgid ""
-#| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the "
-#| "standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> "
-#| "and is overridden by the <envar>ftp_proxy</envar> environment variable. "
-#| "To use a ftp proxy you will have to set the <literal>ftp::ProxyLogin</"
-#| "literal> script in the configuration file. This entry specifies the "
-#| "commands to send to tell the proxy server what to connect to. Please see "
-#| "&configureindex; for an example of how to do this. The substitution "
-#| "variables available are <literal>$(PROXY_USER)</literal> <literal>"
-#| "$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
-#| "$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>"
-#| "$(SITE_PORT)</literal> Each is taken from it's respective URI component."
+#: apt.conf.5.xml:391
 msgid ""
 "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
 "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6596,19 +5288,22 @@ msgid ""
 "respective URI component."
 msgstr ""
 "FTP URI - ftp::Proxy は、デフォルトで使用するプロキシサーバです。"
-"<literal>ftp://[[user][:pass]@]host[:port]/</literal> という標準形で表します"
-"が、環境変数 <envar>ftp_proxy</envar> で上書きされます。ftp プロキシを使用す"
-"るには、設定ファイルに <literal>ftp::ProxyLogin</literal> スクリプトを設定す"
-"る必要があります。接続する際にプロキシサーバに送信するコマンドをこのエントリ"
-"に設定します。どのようにするのかは &configureindex; の例を参照してください。"
-"その他にも、<literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</"
+"<literal>ftp://[[user][:pass]@]host[:port]/</literal> という標準形で表しま"
+"す。ホストごとのプロキシの場合は、<literal>ftp::Proxy::&lt;host&gt;</"
+"literal> という形と、プロキシを使用しないという意味の特殊キーワード "
+"<literal>DIRECT</literal> を使用して指定することもできます。上記の設定をなに"
+"も指定しないと、環境変数 <envar>ftp_proxy</envar> を使用します。ftp プロキシ"
+"を使用するには、設定ファイルに <literal>ftp::ProxyLogin</literal> スクリプト"
+"を設定する必要があります。接続する際にプロキシサーバに送信するコマンドをこの"
+"エントリに設定します。どのようにするのかは &configureindex; の例を参照してく"
+"ださい。その他にも、<literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</"
 "literal> <literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal> が利用可能で"
-"す。いずれも、それぞれ URI を構成するトークンです。"
+"<literal>$(SITE)</literal> <literal>$(SITE_PORT)</literal> が代わりに利用可能"
+"です。いずれも、それぞれ URI を構成するトークンです。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:410
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on, it works in nearly every environment.  However "
@@ -6624,7 +5319,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:417
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to a http url - see the discussion of the http "
@@ -6632,13 +5327,13 @@ msgid ""
 "it is not recommended to use FTP over HTTP due to its low efficiency."
 msgstr ""
 "環境変数 <envar>ftp_proxy</envar> の http url により FTP over HTTP のプロキシ"
-"が利用可能になります。文法は上の http についての説明を参照してください。設定"
-"ファイルの中でこれをセットすることはできません。また、効率が悪いため FTP "
+"が利用可能になります。構文は前述の http についての説明を参照してください。設"
+"定ファイルの中でこれをセットすることはできません。また、効率が悪いため FTP "
 "over HTTP を使用するのは推奨しません。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:422
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6653,25 +5348,18 @@ msgstr ""
 "このコマンドを使用します。ほとんどの FTP サーバは RFC2428 をサポートしていな"
 "いことに注意してください。"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
-msgid "cdrom"
-msgstr "cdrom"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
-#, fuzzy, no-wrap
-#| msgid "\"/cdrom/\"::Mount \"foo\";"
+#: apt.conf.5.xml:435
+#, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
-msgstr "\"/cdrom/\"::Mount \"foo\";"
+msgstr "/cdrom/::Mount \"foo\";"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:430
 msgid ""
-"CDROM URIs; the only setting for CDROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
+"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "
 "drive as specified in <filename>/etc/fstab</filename>. It is possible to "
 "provide alternate mount and unmount commands if your mount point cannot be "
 "listed in the fstab (such as an SMB mount and old mount packages). The "
@@ -6679,23 +5367,18 @@ msgid ""
 "cdrom block. It is important to have the trailing slash. Unmount commands "
 "can be specified using UMount."
 msgstr ""
-"CDROM URI - CDROM URI はマウントポイントの設定のみを行います。<filename>/etc/"
-"fstab</filename> で設定されているように、CDROM ドライブのマウントポイントを "
+"CD-ROM URI - CD-ROM URI はマウントポイントの設定のみを行います。<filename>/etc/"
+"fstab</filename> で設定されているように、CD-ROM ドライブのマウントポイントを "
 "<literal>cdrom::Mount</literal> に設定しなければなりません。(SMB マウントや古"
 "い mount パッケージなど) マウントポイントが fstab に記述できない場合、かわり"
-"にマウント・アンマウントコマンドも使用できます。文法は、cdrom ブロックを "
+"にマウント・アンマウントコマンドも使用できます。構文は、cdrom ブロックを "
 "<placeholder type=\"literallayout\" id=\"0\"/> の形で記述します。スラッシュを"
 "後につけるのが重要です。アンマウントコマンドは UMount で指定することができま"
 "す。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
-msgid "gpgv"
-msgstr "gpgv"
-
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:441
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@ -6705,19 +5388,14 @@ msgstr ""
 "ションです。<literal>gpgv::Options</literal> が gpgv に渡す追加オプションで"
 "す。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
-msgid "CompressionTypes"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:452
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
-msgstr ""
+msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:447
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -6727,21 +5405,27 @@ msgid ""
 "the fly or the used method can be changed. The syntax for this is: "
 "<placeholder type=\"synopsis\" id=\"0\"/>"
 msgstr ""
+"acquire メソッドが理解できる、圧縮法のリストです。<filename>Packages</"
+"filename> のようなファイルは、さまざまな圧縮形式が利用できます。デフォルト "
+"acquire メソッドごとに、<command>bzip2</command>, <command>lzma</command>, "
+"<command>gzip</command> で圧縮されたファイルを伸張できます。この設定では、よ"
+"り多くの形式を、オンザフライで追加したり、使用するメソッドで変更したりできま"
+"す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:457
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
-msgstr ""
+msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:460
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
-msgstr ""
+msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:453
 msgid ""
 "Also the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -6756,69 +5440,103 @@ msgid ""
 "<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
 "<literal>bz2</literal> explicit to the list as it will be added automatic."
 msgstr ""
+"また、<literal>Order</literal> サブグループを使用して、取得システムが圧縮ファ"
+"イルのダウンロードを試みる順番を、定義できます。取得システムは先頭のものを試"
+"行し、エラーが発生すると次の圧縮タイプのダウンロードを開始します。そのため、"
+"どれかを他のものより優先したい場合、単にそのタイプを先頭に追加してください。"
+"まだ追加していないデフォルトタイプは、実行時にリストの最後に追加されます。つ"
+"まり、<placeholder type=\"synopsis\" id=\"0\"/> とすると、<command>gzip</"
+"command> で圧縮されたファイルを <command>bzip2</command> や <command>lzma</"
+"command> よりも優先的に使用します。もし <command>lzma</command> を "
+"<command>gzip</command> や <command>bzip2</command> よりも優先するべきなら、"
+"設定を以下のようにしてください。<placeholder type=\"synopsis\" id=\"1\"/> "
+"<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:464
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
-msgstr ""
+msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:462
+#, fuzzy
+#| msgid ""
+#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
+#| "replaceable></literal> will be checked: If this setting exists the method "
+#| "will only be used if this file exists, e.g. for the bzip2 method (the "
+#| "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note "
+#| "also that list entries specified on the command line will be added at the "
+#| "end of the list specified in the configuration files, but before the "
+#| "default entries. To prefer a type in this case over the ones specified in "
+#| "in the configuration files you can set the option direct - not in list "
+#| "style.  This will not override the defined list, it will only prefix the "
+#| "list with this type."
 msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "
 "will only be used if this file exists, e.g. for the bzip2 method (the "
-"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
-"that list entries specified on the command line will be added at the end of "
-"the list specified in the configuration files, but before the default "
-"entries. To prefer a type in this case over the ones specified in in the "
+"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+"also that list entries specified on the command line will be added at the "
+"end of the list specified in the configuration files, but before the default "
+"entries. To prefer a type in this case over the ones specified in the "
 "configuration files you can set the option direct - not in list style.  This "
 "will not override the defined list, it will only prefix the list with this "
 "type."
 msgstr ""
+"実行時に <literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> "
+"をチェックすることに注意してください。この設定があると、ファイルがある場合"
+"に、この方法しか使われなくなります。例えば、bzip2 メソッド (内蔵) の設定は以"
+"下になります。<placeholder type=\"literallayout\" id=\"0\"/> また、コマンドラ"
+"インに指定した一覧のエントリは設定ファイルに指定したものの後、デフォルトエン"
+"トリの前に追加されることに注意してください。この場合、設定ファイルに指定した"
+"内容よりも前に指定するには、オプションを直接 (一覧スタイルでなく) 指定してく"
+"ださい。これにより定義された一覧が上書きされ、このタイプのもののみ定義されま"
+"す。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:469
 msgid ""
-"While it is possible to add an empty compression type to the order list, but "
-"APT in its current version doesn't understand it correctly and will display "
-"many warnings about not downloaded files - these warnings are most of the "
-"time false negatives. Future versions will maybe include a way to really "
-"prefer uncompressed files to support the usage of local mirrors."
+"The special type <literal>uncompressed</literal> can be used to give "
+"uncompressed files a preference, but note that most archives don't provide "
+"uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
-msgid "Languages"
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:476
+msgid ""
+"When downloading <literal>gzip</literal> compressed indexes (Packages, "
+"Sources, or Translations), keep them gzip compressed locally instead of "
+"unpacking them. This saves quite a lot of disk space at the expense of more "
+"CPU requirements when building the local package caches. False by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:484
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description for "
-"the Language which is listed at first. Languages can be defined with their "
-"short or long Languagecodes. Note that not all archives provide "
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
 "<filename>Translation</filename> files for every Language - especially the "
 "long Languagecodes are rare, so please inform you which ones are available "
 "before you set here impossible values."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:500
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
-msgstr ""
+msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:490
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: It will be "
 "replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable.  It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
@@ -6827,42 +5545,49 @@ msgid ""
 "meaning code which will stop the search for a fitting <filename>Translation</"
 "filename> file.  This can be used by the system administrator to let APT "
 "know that it should download also this files without actually use them if "
-"not the environment specifies this languages. So the following example "
+"the environment doesn't specify this languages. So the following example "
 "configuration will result in the order \"en, de\" in an english and in \"de, "
 "en\" in a german localization. Note that \"fr\" is downloaded, but not used "
 "if APT is not used in a french localization, in such an environment the "
-"order would be \"fr, de, en\".  <placeholder type=\"programlisting\" id=\"0"
-"\"/>"
+"order would be \"fr, de, en\".  <placeholder type=\"programlisting\" id="
+"\"0\"/>"
 msgstr ""
 
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:501
 msgid ""
-"The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
+"Note: To prevent problems resulting from APT being executed in different "
+"environments (e.g. by different users or by other programs) all Translation "
+"files which are found in <filename>/var/lib/apt/lists/</filename> will be "
+"added to the end of the list (after an implicit \"<literal>none</literal>\")."
 msgstr ""
-"オプションの <literal>Acquire</literal> グループは、パッケージのダウンロード"
-"や URI ハンドラの制御を行います。<placeholder type=\"variablelist\" id=\"0\"/"
-">"
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:512
 msgid "Directories"
 msgstr "ディレクトリ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:514
+#, fuzzy
+#| msgid ""
+#| "The <literal>Dir::State</literal> section has directories that pertain to "
+#| "local state information. <literal>lists</literal> is the directory to "
+#| "place downloaded package lists in and <literal>status</literal> is the "
+#| "name of the dpkg status file.  <literal>preferences</literal> is the name "
+#| "of the APT preferences file.  <literal>Dir::State</literal> contains the "
+#| "default directory to prefix on all sub items if they do not start with "
+#| "<filename>/</filename> or <filename>./</filename>."
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
 "downloaded package lists in and <literal>status</literal> is the name of the "
 "dpkg status file.  <literal>preferences</literal> is the name of the APT "
-"preferences file.  <literal>Dir::State</literal> contains the default "
-"directory to prefix on all sub items if they do not start with <filename>/</"
-"filename> or <filename>./</filename>."
+"<filename>preferences</filename> file.  <literal>Dir::State</literal> "
+"contains the default directory to prefix on all sub items if they do not "
+"start with <filename>/</filename> or <filename>./</filename>."
 msgstr ""
 "<literal>Dir::State</literal> セクションは、ローカル状態情報に関するディレク"
 "トリを保持します。<literal>lists</literal> は、ダウンロードしたパッケージ一覧"
@@ -6874,7 +5599,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:521
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6896,7 +5621,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:530
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6911,7 +5636,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:536
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -6923,15 +5648,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
-#, fuzzy
-#| msgid ""
-#| "Binary programs are pointed to by <literal>Dir::Bin</literal>. "
-#| "<literal>Dir::Bin::Methods</literal> specifies the location of the method "
-#| "handlers and <literal>gzip</literal>, <literal>dpkg</literal>, "
-#| "<literal>apt-get</literal> <literal>dpkg-source</literal> <literal>dpkg-"
-#| "buildpackage</literal> and <literal>apt-cache</literal> specify the "
-#| "location of the respective programs."
+#: apt.conf.5.xml:540
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6942,13 +5659,14 @@ msgid ""
 msgstr ""
 "バイナリプログラムは <literal>Dir::Bin</literal> で指定します。<literal>Dir::"
 "Bin::Methods</literal> はメソッドハンドラの場所を指定し、<literal>gzip</"
-"literal>, <literal>dpkg</literal>, <literal>apt-get</literal>, <literal>dpkg-"
-"source</literal>, <literal>dpkg-buildpackage</literal>, <literal>apt-cache</"
-"literal> はそれぞれプログラムの場所を指定します。"
+"literal>, <literal>bzip2</literal>, <literal>lzma</literal>, <literal>dpkg</"
+"literal>, <literal>apt-get</literal> <literal>dpkg-source</literal> "
+"<literal>dpkg-buildpackage</literal>, <literal>apt-cache</literal> はそれぞれ"
+"プログラムの場所を指定します。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:548
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6967,15 +5685,26 @@ msgstr ""
 "lib/dpkg/status</filename> にセットされている場合、status ファイルを "
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。"
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:561
+msgid ""
+"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
+"which files APT should silently ignore while parsing the files in the "
+"fragment directories. Per default a file which end with <literal>.disabled</"
+"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
+"z]+</literal> is silently ignored. As seen in the last default value these "
+"patterns can use regular expression syntax."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:570
 msgid "APT in DSelect"
 msgstr "DSelect での APT"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:572
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6984,14 +5713,9 @@ msgstr ""
 "&dselect; 上で APT を使用する際、<literal>DSelect</literal> セクション以下の"
 "設定項目で、デフォルトの動作を制御します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
-msgid "Clean"
-msgstr "Clean"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:577
 msgid ""
 "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
 "and never.  always and prompt will remove all packages from the cache after "
@@ -7008,7 +5732,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:586
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."
@@ -7016,15 +5740,9 @@ msgstr ""
 "この変数の内容は、install 時のコマンドラインオプションと同様に &apt-get; に渡"
 "されます。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
-msgid "Updateoptions"
-msgstr "Updateoptions"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:591
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."
@@ -7032,14 +5750,9 @@ msgstr ""
 "この変数の内容は、update 時のコマンドラインオプションと同様に &apt-get; に渡"
 "されます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
-msgid "PromptAfterUpdate"
-msgstr "PromptAfterUpdate"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:596
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -7049,13 +5762,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:602
 msgid "How APT calls dpkg"
 msgstr "APT が dpkg を呼ぶ方法"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:603
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -7065,7 +5778,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:608
 msgid ""
 "This is a list of options to pass to dpkg. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -7074,19 +5787,9 @@ msgstr ""
 "dpkg に渡すオプションのリストです。オプションは、リスト記法を使用して指定しな"
 "ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
-msgid "Pre-Invoke"
-msgstr "Pre-Invoke"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
-msgid "Post-Invoke"
-msgstr "Post-Invoke"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:614
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -7098,15 +5801,9 @@ msgstr ""
 "bin/sh</filename> を使用して呼び出され、何か問題があれば APT は異常終了しま"
 "す。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
-msgid "Pre-Install-Pkgs"
-msgstr "Pre-Install-Pkgs"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:621
 msgid ""
 "This is a list of shell commands to run before invoking dpkg. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -7122,7 +5819,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:627
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -7136,15 +5833,9 @@ msgstr ""
 "バージョン 2 を有効にできます。<literal>cmd</literal> は <literal>Pre-"
 "Install-Pkgs</literal> で与えられるコマンドです。"
 
-# type: Content of: <refentry><refsect1><refsect2><title>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
-msgid "Run-Directory"
-msgstr "Run-Directory"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:635
 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."
@@ -7152,15 +5843,9 @@ msgstr ""
 "APT は dpkg を呼び出す前にこのディレクトリに移動します。デフォルトは "
 "<filename>/</filename> です。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
-msgid "Build-options"
-msgstr "Build-options"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:640
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."
@@ -7169,15 +5854,15 @@ msgstr ""
 "ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:645
 msgid "dpkg trigger usage (and related options)"
-msgstr ""
+msgstr "dpkg トリガの使い方 (および関連オプション)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:646
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
-"multiply calls of dpkg. Without further options dpkg will use triggers only "
+"multiple calls of dpkg. Without further options dpkg will use triggers only "
 "in between his own run. Activating these options can therefore decrease the "
 "time needed to perform the install / upgrade. Note that it is intended to "
 "activate these options per default in the future, but as it changes the way "
@@ -7189,7 +5874,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:661
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -7197,9 +5882,13 @@ msgid ""
 "DPkg::ConfigurePending \"true\";\n"
 "DPkg::TriggersPending \"true\";"
 msgstr ""
+"DPkg::NoTriggers \"true\";\n"
+"PackageManager::Configure \"smart\";\n"
+"DPkg::ConfigurePending \"true\";\n"
+"DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:655
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -7212,13 +5901,8 @@ msgid ""
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
-msgid "DPkg::NoTriggers"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:668
 msgid ""
 "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -7229,16 +5913,8 @@ msgid ""
 "dpkg - now apt will add these flag also to the unpack and remove calls."
 msgstr ""
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
-#, fuzzy
-#| msgid "Packages::Compress"
-msgid "PackageManager::Configure"
-msgstr "Packages::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:676
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@ -7253,15 +5929,8 @@ msgid ""
 "the system could end in an unconfigured status which could be unbootable!"
 msgstr ""
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
-#, fuzzy
-msgid "DPkg::ConfigurePending"
-msgstr "ユーザの設定"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:687
 msgid ""
 "If this option is set apt will call <command>dpkg --configure --pending</"
 "command> to let dpkg handle all required configurations and triggers. This "
@@ -7271,13 +5940,8 @@ msgid ""
 "you could deactivate this option in all but the last run."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
-msgid "DPkg::TriggersPending"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:694
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7286,13 +5950,8 @@ msgid ""
 "triggers, not only the triggers needed to configure this package."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
-msgid "PackageManager::UnpackAll"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:700
 msgid ""
 "As the configuration can be deferred to be done at the end by dpkg it can be "
 "tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7303,13 +5962,8 @@ msgid ""
 "really useful."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
-msgid "OrderList::Score::Immediate"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:715
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -7319,9 +5973,15 @@ msgid ""
 "\tPreDepends 50;\n"
 "};"
 msgstr ""
+"OrderList::Score {\n"
+"\tDelete 500;\n"
+"\tEssential 200;\n"
+"\tImmediate 10;\n"
+"\tPreDepends 50;\n"
+"};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:708
 msgid ""
 "Essential packages (and there dependencies) should be configured immediately "
 "after unpacking. It will be a good idea to do this quite early in the "
@@ -7335,12 +5995,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:728
 msgid "Periodic and Archives options"
 msgstr "Periodic オプションと Archives オプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:729
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "
@@ -7354,12 +6014,12 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:737
 msgid "Debug options"
 msgstr "デバッグオプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:739
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -7370,7 +6030,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:750
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7381,7 +6041,7 @@ msgstr ""
 "にします。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:758
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7392,217 +6052,153 @@ msgstr ""
 "literal>) を行う場合に使用します。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:767
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
 msgstr ""
+"<literal>Debug::pkgDPkgPM</literal> は <literal>apt</literal> が実際に "
+"&dpkg; を起動する際の各コマンドラインを表示します。"
 
 #.  TODO: provide a
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:775
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
 msgstr ""
+"<literal>Debug::IdentCdrom</literal> は CD-ROM ID にある statfs データの方gain"
+"を無効にします。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:785
 msgid "A full list of debugging options to apt follows."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
-msgid "<literal>Debug::Acquire::cdrom</literal>"
-msgstr "<literal>Debug::Acquire::cdrom</literal>"
+msgstr "以下は apt に対するデバッグオプションのすべてです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:794
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
-msgid "<literal>Debug::Acquire::ftp</literal>"
-msgstr "<literal>Debug::Acquire::ftp</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:805
 msgid "Print information related to downloading packages using FTP."
 msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
-msgid "<literal>Debug::Acquire::http</literal>"
-msgstr "<literal>Debug::Acquire::http</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:816
 msgid "Print information related to downloading packages using HTTP."
 msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
-msgid "<literal>Debug::Acquire::https</literal>"
-msgstr "<literal>Debug::Acquire::https</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:827
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
-msgid "<literal>Debug::Acquire::gpgv</literal>"
-msgstr "<literal>Debug::Acquire::gpgv</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:838
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
-msgid "<literal>Debug::aptcdrom</literal>"
-msgstr "<literal>Debug::aptcdrom</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:849
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
-msgid "<literal>Debug::BuildDeps</literal>"
-msgstr "<literal>Debug::BuildDeps</literal>"
+"CD-ROM にあるパッケージ集合に対して、アクセスするプロセスについての情報を出力"
+"します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:859
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
-msgid "<literal>Debug::Hashes</literal>"
-msgstr "<literal>Debug::Hashes</literal>"
+msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:869
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
-msgid "<literal>Debug::IdentCDROM</literal>"
-msgstr "<literal>Debug::IdentCDROM</literal>"
+"<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:879
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
 "a CD-ROM."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
-msgid "<literal>Debug::NoLocking</literal>"
-msgstr "<literal>Debug::NoLocking</literal>"
+"CD-ROM の ID を生成する際に <literal>statfs</literal> という、CD-ROM ファイル"
+"システムにある使用済・未使用ブロックの数からの情報を含めないようにします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:890
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
-msgid "<literal>Debug::pkgAcquire</literal>"
-msgstr "<literal>Debug::pkgAcquire</literal>"
+"ファイルのロックをすべて無効にします。例えば、同時にふたつの "
+"<quote><literal>apt-get update</literal></quote> を実行できるようになります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:902
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
-msgid "<literal>Debug::pkgAcquire::Auth</literal>"
-msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
+"グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:912
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
-msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
-msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
+"ダウンロードしたファイルのチェックサムや暗号署名の確認に関する、状態メッセー"
+"ジやエラーを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:922
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
-msgid "<literal>Debug::pkgAcquire::RRed</literal>"
-msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
+"パッケージインデックスリスト差分のダウンロード・適用時の、情報やエラーを出力"
+"します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:934
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
-msgid "<literal>Debug::pkgAcquire::Worker</literal>"
-msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
+"インデックス全体ではなくインデックス差分のダウンロードの際に、apt パッケージ"
+"リストへのパッチ適用に関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:945
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
-msgid "<literal>Debug::pkgAutoRemove</literal>"
-msgstr "<literal>Debug::pkgAutoRemove</literal>"
+"実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:956
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
-msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
+"パッケージの自動インストールや、不要パッケージの削除に関するイベントを、ログ"
+"に出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:966
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -7610,14 +6206,14 @@ msgid ""
 "to the full <literal>apt</literal> dependency resolver; see <literal>Debug::"
 "pkgProblemResolver</literal> for that."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
-msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
+"依存関係解決のために、どのパッケージが自動的にインストールされたかのデバッグ"
+"メッセージを生成します。これは完全な <literal>apt</literal> 依存関係解決プロ"
+"グラム (<literal>Debug::pkgProblemResolver</literal> を参照) ではなく、例え"
+"ば <literal>apt-get install</literal> で実行された、初期の自動インストール経"
+"路に対応しています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:980
 msgid ""
 "Generate debug messages describing which package is marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -7633,113 +6229,78 @@ msgid ""
 "<literal>section</literal> is the name of the section the package appears in."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
-msgid "<literal>Debug::pkgInitConfig</literal>"
-msgstr "<literal>Debug::pkgInitConfig</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:1002
 msgid "Dump the default configuration to standard error on startup."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
-msgid "<literal>Debug::pkgDPkgPM</literal>"
-msgstr "<literal>Debug::pkgDPkgPM</literal>"
+msgstr "起動時に、標準エラー出力へデフォルト設定を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:1012
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
-msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
+"&dpkg; 起動時に、起動した際の正確なコマンドラインを出力します。引数は空白で区"
+"切られます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:1023
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
-msgid "<literal>Debug::pkgOrderList</literal>"
-msgstr "<literal>Debug::pkgOrderList</literal>"
+"状態ファイルディスクリプタに、&dpkg; から受信したすべてのデータと、そのデータ"
+"を解析中に発生したエラーを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:1034
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
-msgid "<literal>Debug::pkgPackageManager</literal>"
-msgstr "<literal>Debug::pkgPackageManager</literal>"
+"<literal>apt</literal> が &dpkg; にパッケージを渡す順番を決める、アルゴリズム"
+"のトレースを生成します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:1046
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
-msgid "<literal>Debug::pkgPolicy</literal>"
-msgstr "<literal>Debug::pkgPolicy</literal>"
+msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1057
 msgid "Output the priority of each package list on startup."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
-msgid "<literal>Debug::pkgProblemResolver</literal>"
-msgstr "<literal>Debug::pkgProblemResolver</literal>"
+msgstr "起動時の各パッケージの優先度を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:1067
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
-msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
+"依存関係解決システムの実行内容を追跡します (これは複雑な依存関係の問題に遭遇"
+"した場合にのみ、適用されます)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:1078
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
 "described in <literal>Debug::pkgDepCache::Marker</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
-msgid "<literal>Debug::sourceList</literal>"
-msgstr "<literal>Debug::sourceList</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1090
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
+"<filename>/etc/apt/vendors.list</filename> から読み込んだ、ベンダの情報を出力"
+"します。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1113
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -7747,59 +6308,35 @@ msgstr ""
 "&configureindex; に、全利用可能オプションのデフォルト値を参照できる、設定ファ"
 "イルのサンプルがあります。"
 
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
-#, fuzzy
-#| msgid "&apt-conf;"
-msgid "&file-aptconf;"
-msgstr "&apt-conf;"
-
 # type: Content of: <refentry><refsect1><para>
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1125
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt_preferences.5.xml:13
-msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
-msgstr "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
-
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt_preferences.5.xml:21 apt_preferences.5.xml:28
-msgid "apt_preferences"
-msgstr "apt_preferences"
-
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:29
+#: apt_preferences.5.xml:32
 msgid "Preference control file for APT"
-msgstr "APT 設定制御ファイル"
+msgstr "APT 用選択制御ファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:34
-#, fuzzy
-#| msgid ""
-#| "The APT preferences file <filename>/etc/apt/preferences</filename> can be "
-#| "used to control which versions of packages will be selected for "
-#| "installation."
+#: apt_preferences.5.xml:37
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
 "can be used to control which versions of packages will be selected for "
 "installation."
 msgstr ""
-"APT 設定ファイル <filename>/etc/apt/preferences</filename> は、インストールす"
-"るパッケージのバージョン選択を制御するのに使用します。"
+"APT 選択ファイル <filename>/etc/apt/preferences</filename> と <filename>/etc/"
+"apt/preferences.d/</filename> フォルダにある断片ファイルは、インストールする"
+"パッケージのバージョンを制御するのに使用します。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:42
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -7815,13 +6352,13 @@ msgstr ""
 "し複数のバージョンがインストールできることがあります。このとき APT は、利用で"
 "きるバージョンごとに優先度を割り当てます。依存関係規則を条件として、"
 "<command>apt-get</command> は、最も高い優先度を持つバージョンをインストールす"
-"るよう選択します。APT 設定ファイルは、APT がデフォルトで割り当てた、パッケー"
+"るよう選択します。APT 選択ファイルは、APT がデフォルトで割り当てた、パッケー"
 "ジのバージョンの優先度を上書きします。その結果インストールするものの選択を、"
 "ユーザが選択できるようになります。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:49
+#: apt_preferences.5.xml:52
 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
@@ -7832,32 +6369,76 @@ msgstr ""
 "&sources-list; ファイルに複数の参照が書かれている場合、パッケージの同じバー"
 "ジョンのインスタンスが複数利用できる可能性があります。この場合、<command>apt-"
 "get</command> は &sources-list; ファイルの初めの方に指定されているところから"
-"ダウンロードします。APT 設定ファイルはバージョンの選択にのみ影響し、インスタ"
+"ダウンロードします。APT 選択ファイルはバージョンの選択にのみ影響し、インスタ"
 "ンスの選択には影響しません。"
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt_preferences.5.xml:59
+msgid ""
+"Preferences are a strong power in the hands of a system administrator but "
+"they can become also their biggest nightmare if used without care! APT will "
+"not questioning the preferences so wrong settings will therefore lead to "
+"uninstallable packages or wrong decisions while upgrading packages.  Even "
+"more problems will arise if multiply distribution releases are mixed without "
+"a good understanding of the following paragraphs.  Packages included in a "
+"specific release aren't tested in and therefore doesn't always work as "
+"expected in older or newer releases or together with other packages from "
+"different releases.  You have been warned."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_preferences.5.xml:70
+#, fuzzy
+#| msgid ""
+#| "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+#| "directory are parsed in alphanumeric ascending order and need to obey the "
+#| "following naming convention: The files have no or \"<literal>pref</"
+#| "literal>\" as filename extension and which only contain alphanumeric, "
+#| "hyphen (-), underscore (_) and period (.) characters - otherwise they "
+#| "will be silently ignored."
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters.  Otherwise APT will print a notice "
+"that it has ignored a file if the file doesn't match a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
+"case it will be silently ignored."
+msgstr ""
+"<filename>/etc/apt/preferences.d</filename> ディレクトリにあるファイルは、英"
+"数字の昇順で解析され、以下の規約に従う必要があることに注意してください。ファ"
+"イル名には、拡張子はないか、\"<literal>pref</literal>\" となっており、英数"
+"字、ハイフン (-)、アンダースコア (_)、ピリオド (.) でできています。そうでなけ"
+"れば、黙って無視されます。"
+
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:56
+#: apt_preferences.5.xml:79
 msgid "APT's Default Priority Assignments"
 msgstr "APT のデフォルト優先度の割り当て"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:94
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
-msgstr "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
+msgstr ""
+"<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
+"\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:97
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
-msgstr "APT::Default-Release \"stable\";\n"
+msgstr ""
+"APT::Default-Release \"stable\";\n"
+"\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:81
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "
@@ -7880,27 +6461,61 @@ msgstr ""
 "に注意してください。例えば以下のようになります。<placeholder type="
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
+# type: Content of: <refentry><refsect1><refsect2><para>
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:101
+#, fuzzy
+#| msgid ""
+#| "If the target release has been specified then APT uses the following "
+#| "algorithm to set the priorities of the versions of a package.  Assign: "
+#| "<placeholder type=\"variablelist\" id=\"0\"/>"
+msgid ""
+"If the target release has been specified then APT uses the following "
+"algorithm to set the priorities of the versions of a package.  Assign:"
+msgstr ""
+"ターゲットリリースが指定されると、APT は以下のアルゴリズムで、パッケージの"
+"バージョンの優先度を設定します。以下のように割り当てます。<placeholder type="
+"\"variablelist\" id=\"0\"/>"
+
+# type: <tag></tag>
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:106
+msgid "priority 1"
+msgstr "priority 1"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:107
+msgid ""
+"to the versions coming from archives which in their <filename>Release</"
+"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"<literal>experimental</literal> archive."
+msgstr ""
+
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:113
 msgid "priority 100"
 msgstr "priority 100"
 
-# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
-msgid "to the version that is already installed (if any)."
-msgstr "(あるならば) 既にインストールされているバージョン。"
+#: apt_preferences.5.xml:114
+msgid ""
+"to the version that is already installed (if any) and to the versions coming "
+"from archives which in their <filename>Release</filename> files are marked "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"backports archive since <literal>squeeze-backports</literal>."
+msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:88
+#: apt_preferences.5.xml:121
 msgid "priority 500"
 msgstr "priority 500"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:122
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -7908,36 +6523,28 @@ msgstr "インストールされておらず、ターゲットリリースに含
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:126
 msgid "priority 990"
 msgstr "priority 990"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:127
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:78
-msgid ""
-"If the target release has been specified then APT uses the following "
-"algorithm to set the priorities of the versions of a package.  Assign: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"ターゲットリリースが指定されると、APT は以下のアルゴリズムで、パッケージの"
-"バージョンの優先度を設定します。以下のように割り当てます。<placeholder type="
-"\"variablelist\" id=\"0\"/>"
-
-# type: Content of: <refentry><refsect1><refsect2><para>
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:132
+#, fuzzy
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
-"uninstalled package versions."
+"uninstalled package versions, except versions coming from archives which in "
+"their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
+"- these versions get the priority 1 or priority 100 if it is additionally "
+"marked as \"ButAutomaticUpgrades: yes\"."
 msgstr ""
 "ターゲットリリースが指定されていなければ、APT は単純にインストールしている"
 "パッケージのバージョンには 100 を、インストールしていないパッケージのバージョ"
@@ -7945,7 +6552,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:139
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -7955,7 +6562,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:142
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -7971,13 +6578,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:148
 msgid "Install the highest priority version."
 msgstr "最も高い優先度のバージョンをインストールします。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:149
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -7987,7 +6594,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:152
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -7999,7 +6606,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:158
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -8015,7 +6622,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:165
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -8029,7 +6636,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:170
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -8049,26 +6656,26 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:179
 msgid "The Effect of APT Preferences"
 msgstr "APT 設定の効果"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:181
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
 "records separated by blank lines.  Records can have one of two forms, a "
 "specific form and a general form."
 msgstr ""
-"APT 設定ファイルを使うと、システム管理者が優先度を割り当てられるようになりま"
+"APT 選択ファイルを使うと、システム管理者が優先度を割り当てられるようになりま"
 "す。ファイルは、空白行で区切られた、複数行からなるレコードで構成されていま"
 "す。レコードは特定形式か、汎用形式のどちらかの形式をとります。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:187
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -8083,7 +6690,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:194
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8093,10 +6700,11 @@ msgstr ""
 "Package: perl\n"
 "Pin: version 5.8*\n"
 "Pin-Priority: 1001\n"
+"\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:200
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -8111,19 +6719,19 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:206
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
 "all package versions available from the local site."
 msgstr ""
-"APT 設定ファイルに書かれている汎用形式のエントリは、パッケージのグループにつ"
+"APT 選択ファイルに書かれている汎用形式のエントリは、パッケージのグループにつ"
 "いてのみ適用されます。例えば以下のレコードは、ローカルサイトにある全パッケー"
 "ジについて、高い優先度を割り当てます。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:211
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8133,16 +6741,40 @@ msgstr ""
 "Package: *\n"
 "Pin: origin \"\"\n"
 "Pin-Priority: 999\n"
+"\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
+#: apt_preferences.5.xml:216
+msgid ""
+"A note of caution: the keyword used here is \"<literal>origin</literal>\" "
+"which can be used to match a hostname. The following record will assign a "
+"high priority to all versions available from the server identified by the "
+"hostname \"ftp.de.debian.org\""
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#: apt_preferences.5.xml:220
+#, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
+"Pin-Priority: 999\n"
+msgstr ""
+"Package: *\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
+"Pin-Priority: 999\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:224
+#, fuzzy
 msgid ""
-"A note of caution: the keyword used here is \"<literal>origin</literal>\".  "
-"This should not be confused with the Origin of a distribution as specified "
-"in a <filename>Release</filename> file.  What follows the \"Origin:\" tag in "
-"a <filename>Release</filename> file is not an Internet address but an author "
-"or vendor name, such as \"Debian\" or \"Ximian\"."
+"This should <emphasis>not</emphasis> be confused with the Origin of a "
+"distribution as specified in a <filename>Release</filename> file.  What "
+"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
+"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
+"\"."
 msgstr ""
 "注意: ここで使用しているキーワードは \"<literal>origin</literal>\" です。"
 "<filename>Release</filename> ファイルに指定されたような、ディストリビューショ"
@@ -8152,7 +6784,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:229
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8163,7 +6795,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:233
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8173,34 +6805,36 @@ msgstr ""
 "Package: *\n"
 "Pin: release a=unstable\n"
 "Pin-Priority: 50\n"
+"\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:238
+#, fuzzy
 msgid ""
 "The following record assigns a high priority to all package versions "
-"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
-"\"."
+"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
+"</literal>\"."
 msgstr ""
 "以下のレコードは、コード名が \"<literal>squeeze</literal>\" となっているディ"
 "ストリビューションに属するパッケージを、すべて高い優先度に割り当てます。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:247
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8212,7 +6846,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:252
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8222,21 +6856,98 @@ msgstr ""
 "Package: *\n"
 "Pin: release a=stable, v=3.0\n"
 "Pin-Priority: 500\n"
+"\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a glob"
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+"expression surrounded by slashes)."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, no-wrap
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:291
+msgid ""
+"If a regular expression occurs in a <literal>Package</literal> field, the "
+"behavior is the same as if this regular expression were replaced with a list "
+"of all package names it matches. It is undecided whether this will change in "
+"the future, thus you should always list wild-card pins first, so later "
+"specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+"Package field is not considered a glob() expression in itself."
+msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:307
 msgid "How APT Interprets Priorities"
 msgstr "APT が優先度に割り込む方法"
 
+# type: Content of: <refentry><refsect1><refsect2><para>
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:310
+#, fuzzy
+#| msgid ""
+#| "Priorities (P) assigned in the APT preferences file must be positive or "
+#| "negative integers.  They are interpreted as follows (roughly speaking): "
+#| "<placeholder type=\"variablelist\" id=\"0\"/>"
+msgid ""
+"Priorities (P) assigned in the APT preferences file must be positive or "
+"negative integers.  They are interpreted as follows (roughly speaking):"
+msgstr ""
+"APT 選択ファイルで割り当てた優先度 (P) は、正負の整数でなくてはなりません。こ"
+"れは (おおざっぱにいうと) 以下のように解釈されます。<placeholder type="
+"\"variablelist\" id=\"0\"/>"
+
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:315
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:316
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8244,13 +6955,13 @@ msgstr ""
 "パッケージがダウングレードしても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:320
 msgid "990 &lt; P &lt;=1000"
 msgstr "990 &lt; P &lt;=1000"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:321
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8259,13 +6970,13 @@ msgstr ""
 "含まれなくても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:239
+#: apt_preferences.5.xml:326
 msgid "500 &lt; P &lt;=990"
 msgstr "500 &lt; P &lt;=990"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:327
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
@@ -8274,13 +6985,13 @@ msgstr ""
 "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:332
 msgid "100 &lt; P &lt;=500"
 msgstr "100 &lt; P &lt;=500"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:333
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
@@ -8290,13 +7001,13 @@ msgstr ""
 "ル"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:338
 msgid "0 &lt; P &lt;=100"
 msgstr "0 &lt; P &lt;=100"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:339
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -8305,31 +7016,19 @@ msgstr ""
 "ンストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:256
+#: apt_preferences.5.xml:343
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:344
 msgid "prevents the version from being installed"
 msgstr "このバージョンのインストール禁止"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
-msgid ""
-"Priorities (P) assigned in the APT preferences file must be positive or "
-"negative integers.  They are interpreted as follows (roughly speaking): "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"APT 設定ファイルで割り当てた優先度 (P) は、正負の整数でなくてはなりません。こ"
-"れは (おおざっぱにいうと) 以下のように解釈されます。<placeholder type="
-"\"variablelist\" id=\"0\"/>"
-
-# type: Content of: <refentry><refsect1><refsect2><para>
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:349
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8343,17 +7042,17 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:355
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
 msgstr ""
-"例えば、APT 設定ファイルの上の方に、以下のレコードが書かれていると仮定してく"
+"例えば、APT 選択ファイルの上の方に、以下のレコードが書かれていると仮定してく"
 "ださい。"
 
 # type: Content of: <refentry><refsect1><refsect2><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:359
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8379,16 +7078,17 @@ msgstr ""
 "Package: *\n"
 "Pin: release unstable\n"
 "Pin-Priority: 50\n"
+"\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:372
 msgid "Then:"
 msgstr "すると、以下のように動作します。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:374
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -8403,7 +7103,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8415,7 +7115,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:383
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -8429,13 +7129,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:393
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "パッケージのバージョンとディストリビューションプロパティの決定"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:395
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8445,58 +7145,89 @@ msgstr ""
 "述した、<filename>Packages</filename> ファイルや <filename>Release</"
 "filename> ファイルを提供します。"
 
+# type: Content of: <refentry><refsect1><refsect2><para>
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:399
+#, fuzzy
+#| msgid ""
+#| "The <filename>Packages</filename> file is normally found in the directory "
+#| "<filename>.../dists/<replaceable>dist-name</replaceable>/"
+#| "<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
+#| "filename>: for example, <filename>.../dists/stable/main/binary-i386/"
+#| "Packages</filename>.  It consists of a series of multi-line records, one "
+#| "for each package available in that directory.  Only two lines in each "
+#| "record are relevant for setting APT priorities: <placeholder type="
+#| "\"variablelist\" id=\"0\"/>"
+msgid ""
+"The <filename>Packages</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable>/"
+"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
+"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
+"Packages</filename>.  It consists of a series of multi-line records, one for "
+"each package available in that directory.  Only two lines in each record are "
+"relevant for setting APT priorities:"
+msgstr ""
+"<filename>Packages</filename> ファイルは通常 <filename>.../dists/"
+"<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/"
+"<replaceable>arch</replaceable></filename> ディレクトリにあります。例えば、"
+"<filename>.../dists/stable/main/binary-i386/Packages</filename> です。これ"
+"は、ディレクトリにある利用可能パッケージごとに、複数行のレコードからできてい"
+"ます。APT 優先度の設定は、レコードごとに以下の 2 行だけです。<placeholder "
+"type=\"variablelist\" id=\"0\"/>"
+
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:407
 msgid "the <literal>Package:</literal> line"
 msgstr "<literal>Package:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:408
 msgid "gives the package name"
 msgstr "パッケージ名"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:411 apt_preferences.5.xml:461
 msgid "the <literal>Version:</literal> line"
 msgstr "<literal>Version:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:412
 msgid "gives the version number for the named package"
 msgstr "その名前のパッケージのバージョン番号"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:417
+#, fuzzy
 msgid ""
-"The <filename>Packages</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable>/"
-"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
-"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
-"Packages</filename>.  It consists of a series of multi-line records, one for "
-"each package available in that directory.  Only two lines in each record are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
+"The <filename>Release</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
+"dists/&stable-codename;/Release</filename>.  It consists of a single multi-"
+"line record which applies to <emphasis>all</emphasis> of the packages in the "
+"directory tree below its parent.  Unlike the <filename>Packages</filename> "
+"file, nearly all of the lines in a <filename>Release</filename> file are "
+"relevant for setting APT priorities:"
 msgstr ""
-"<filename>Packages</filename> ファイルは通常 <filename>.../dists/"
-"<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/"
-"<replaceable>arch</replaceable></filename> ディレクトリにあります。例えば、"
-"<filename>.../dists/stable/main/binary-i386/Packages</filename> です。これ"
-"は、ディレクトリにある利用可能パッケージごとに、複数行のレコードからできてい"
-"ます。APT 優先度の設定は、レコードごとに以下の 2 行だけです。<placeholder "
-"type=\"variablelist\" id=\"0\"/>"
+"<filename>Release</filename> ファイルは、通常 <filename>.../dists/"
+"<replaceable>dist-name</replaceable></filename> ディレクトリにあります。例え"
+"ば、 <filename>.../dists/stable/Release</filename>, <filename>.../dists/"
+"woody/Release</filename> です。これは、このディレクトリ以下にある<emphasis>全"
+"</emphasis>パッケージに適用する、複数行のレコード 1 つから成っています。"
+"<filename>Packages</filename> ファイルと違い <filename>Release</filename> "
+"ファイルは、以下のようにほとんどの行が APT 優先度の設定に関連します。"
+"<placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:428
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:342
-#, fuzzy
+#: apt_preferences.5.xml:429
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8505,67 +7236,68 @@ msgid ""
 "archive.  Specifying this value in the APT preferences file would require "
 "the line:"
 msgstr ""
-"このディレクトリツリーに属する全パッケージのアーカイブ名です。例えば、"
-"\"Archive: stable\" という行は、<filename>Release</filename> ファイルの親ディ"
-"レクトリツリー以下にある全パッケージが、<literal>stable</literal> アーカイブ"
-"だと指定します。APT 設定ファイルでこの値を指定するには、以下の行が必要になり"
-"ます。"
+"このディレクトリツリーに属する全パッケージのアーカイブ名です。例え"
+"ば、\"Archive: stable\" や \"Suite: stable\" という行は、<filename>Release</"
+"filename> ファイルの親ディレクトリツリー以下にある全パッケージが、"
+"<literal>stable</literal> アーカイブだと指定します。APT 選択ファイルでこの値"
+"を指定するには、以下の行が必要になります。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:439
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:445
 msgid "the <literal>Codename:</literal> line"
 msgstr "<literal>Codename:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:446
 #, fuzzy
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
-"For example, the line \"Codename: squeeze\" specifies that all of the "
-"packages in the directory tree below the parent of the <filename>Release</"
-"filename> file belong to a version named <literal>squeeze</literal>.  "
-"Specifying this value in the APT preferences file would require the line:"
-msgstr ""
-"このディレクトリツリーに属する全パッケージのアーカイブ名です。例えば、"
-"\"Archive: stable\" という行は、<filename>Release</filename> ファイルの親ディ"
-"レクトリツリー以下にある全パッケージが、<literal>stable</literal> アーカイブ"
-"だと指定します。APT 設定ファイルでこの値を指定するには、以下の行が必要になり"
-"ます。"
+"For example, the line \"Codename: &testing-codename;\" specifies that all of "
+"the packages in the directory tree below the parent of the "
+"<filename>Release</filename> file belong to a version named "
+"<literal>&testing-codename;</literal>.  Specifying this value in the APT "
+"preferences file would require the line:"
+msgstr ""
+"このディレクトリツリーに属する全パッケージのコード名です。例え"
+"ば、\"Codename: squeeze\" という行は、<filename>Release</filename> ファイルの"
+"親ディレクトリツリー以下にある全パッケージが、<literal>squeeze</literal> と名"
+"前のついたバージョンであると指定します。APT 選択ファイルでこの値を指定するに"
+"は、以下の行が必要になります。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:455
 #, no-wrap
-msgid "Pin: release n=squeeze\n"
-msgstr "Pin: release n=squeeze\n"
+msgid "Pin: release n=&testing-codename;\n"
+msgstr "Pin: release n=&testing-codename;\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:462
 msgid ""
 "names the release version.  For example, the packages in the tree might "
-"belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
-"no version number for the <literal>testing</literal> and <literal>unstable</"
+"belong to Debian release version 3.0.  Note that there is normally no "
+"version number for the <literal>testing</literal> and <literal>unstable</"
 "literal> distributions because they have not been released yet.  Specifying "
 "this in the APT preferences file would require one of the following lines."
 msgstr ""
 "リリースバージョン名です。例えば、このツリーのパッケージが、GNU/Linux リリー"
 "スバージョン 3.0 に属するとします。通常 <literal>testing</literal> ディストリ"
 "ビューションや <literal>unstable</literal> ディストリビューションには、まだリ"
-"リースされていないので、バージョン番号が付きません。APT 設定ファイルでこれを"
+"リースされていないので、バージョン番号が付きません。APT 選択ファイルでこれを"
 "指定するには、以下の行のいずれかが必要になります。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:471
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8575,15 +7307,16 @@ msgstr ""
 "Pin: release v=3.0\n"
 "Pin: release a=stable, v=3.0\n"
 "Pin: release 3.0\n"
+"\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:480
 msgid "the <literal>Component:</literal> line"
 msgstr "<literal>Component:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:481
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8596,24 +7329,24 @@ msgstr ""
 "ライセンスコンポーネント名です。例えば、\"Component: main\" という行は、この"
 "ディレクトリ以下の全ファイルが、<literal>main</literal> コンポーネント "
 "(Debian フリーソフトウェアガイドラインの元でライセンスされている) であること"
-"を表します。APT 設定ファイルでこのコンポーネントを指定するには、以下の行が必"
+"を表します。APT 選択ファイルでこのコンポーネントを指定するには、以下の行が必"
 "要になります。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:490
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:496
 msgid "the <literal>Origin:</literal> line"
 msgstr "<literal>Origin:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:497
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8621,24 +7354,26 @@ msgid ""
 "the line:"
 msgstr ""
 "<filename>Release</filename> ファイルのディレクトリツリーにあるパッケージの提"
-"供者名です。ほとんど共通で、<literal>Debian</literal> です。APT 設定ファイル"
+"供者名です。ほとんど共通で、<literal>Debian</literal> です。APT 選択ファイル"
 "でこの提供者を指定するには、以下の行が必要になります。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:503
 #, no-wrap
 msgid "Pin: release o=Debian\n"
-msgstr "Pin: release o=Debian\n"
+msgstr ""
+"Pin: release o=Debian\n"
+"\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:509
 msgid "the <literal>Label:</literal> line"
 msgstr "<literal>Label:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:510
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8646,41 +7381,21 @@ msgid ""
 "the line:"
 msgstr ""
 "<filename>Release</filename> ファイルのディレクトリツリーにあるパッケージのラ"
-"ベル名です。ほとんど共通で <literal>Debian</literal> です。APT 設定ファイルで"
+"ベル名です。ほとんど共通で <literal>Debian</literal> です。APT 選択ファイルで"
 "このラベルを指定するには、以下の行が必要になります。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:516
 #, no-wrap
 msgid "Pin: release l=Debian\n"
-msgstr "Pin: release l=Debian\n"
-
-# type: Content of: <refentry><refsect1><refsect2><para>
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
-#, fuzzy
-msgid ""
-"The <filename>Release</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
-"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-"dists/woody/Release</filename>.  It consists of a single multi-line record "
-"which applies to <emphasis>all</emphasis> of the packages in the directory "
-"tree below its parent.  Unlike the <filename>Packages</filename> file, "
-"nearly all of the lines in a <filename>Release</filename> file are relevant "
-"for setting APT priorities: <placeholder type=\"variablelist\" id=\"0\"/>"
 msgstr ""
-"<filename>Release</filename> ファイルは、通常 <filename>.../dists/"
-"<replaceable>dist-name</replaceable></filename> にあります。例えば、 "
-"<filename>.../dists/stable/Release</filename>, <filename>.../dists/woody/"
-"Release</filename> です。これは、このディレクトリ以下にある<emphasis>全</"
-"emphasis>パッケージに適用する、複数行のレコード 1 つから成っています。"
-"<filename>Packages</filename> と違い <filename>Release</filename> ファイル"
-"は、ほとんどの行が APT 優先度の設定に関連します。"
+"Pin: release l=Debian\n"
+"\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:523
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -8706,44 +7421,30 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:536
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "APT 設定レコードのオプション行"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:538
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
 "provides a place for comments."
 msgstr ""
-"APT 設定ファイルのレコードごとに、任意で <literal>Explanation:</literal> で始"
+"APT 選択ファイルのレコードごとに、任意で <literal>Explanation:</literal> で始"
 "まる行を持てます。これは、コメント用の場所を確保します。"
 
-# type: Content of: <refentry><refsect1><refsect2><para>
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
-#, fuzzy
-msgid ""
-"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
-"optional.  If omitted, APT assigns a priority of 1 less than the last value "
-"specified on a line beginning with <literal>Pin-Priority: release ...</"
-"literal>."
-msgstr ""
-"APT 設定レコードの <literal>Pin-Priority:</literal> 行は任意です。省略する"
-"と、<literal>Pin-Priority: release ...</literal> で始まる行で指示した最後の"
-"値 (少なくとも1つ) を優先度に割り当てます。"
-
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:547
 msgid "Tracking Stable"
 msgstr "安定版の追跡"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:555
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8765,11 +7466,11 @@ msgstr ""
 "Package: *\n"
 "Pin: release o=Debian\n"
 "Pin-Priority: -10\n"
+"\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
-#, fuzzy
+#: apt_preferences.5.xml:549
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -8777,15 +7478,16 @@ msgid ""
 "package versions belonging to other <literal>Debian</literal> "
 "distributions.  <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
-"以下の APT 設定ファイルは、<literal>stable</literal> ディストリビューションに"
+"以下の APT 選択ファイルは、<literal>stable</literal> ディストリビューションに"
 "属する全てのパッケージのバージョンに、デフォルト (500) より高い優先度を割り当"
 "て、他の <literal>Debian</literal> ディストリビューションのパッケージのバー"
 "ジョンには、低くてインストールできないような優先度を割り当てます。"
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+#: apt_preferences.5.xml:676
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -8798,28 +7500,27 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
-#, fuzzy
+#: apt_preferences.5.xml:567
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
 "<literal>stable</literal> version(s).  <placeholder type=\"programlisting\" "
 "id=\"0\"/>"
 msgstr ""
-"適切な &sources-list; ファイルと上記の設定ファイルにより、以下のコマンドで最"
+"適切な &sources-list; ファイルと上記の選択ファイルにより、以下のコマンドで最"
 "新の <literal>stable</literal> バージョンにアップグレードできます。"
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:584
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>package</replaceable>/testing\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
-#, fuzzy
+#: apt_preferences.5.xml:578
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -8828,17 +7529,18 @@ msgid ""
 msgstr ""
 "以下のコマンドで、指定したパッケージを <literal>testing</literal> ディストリ"
 "ビューションの最新バージョンにアップグレードします。このパッケージは、再度こ"
-"のコマンドを発行しないとアップグレードされません。"
+"のコマンドを発行しないとアップグレードされません。<placeholder type="
+"\"programlisting\" id=\"0\"/>"
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:590
 msgid "Tracking Testing or Unstable"
 msgstr "テスト版や不安定版の追跡"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:599
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8867,8 +7569,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
-#, fuzzy
+#: apt_preferences.5.xml:592
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -8877,36 +7578,36 @@ msgid ""
 "other <literal>Debian</literal> distributions.  <placeholder type="
 "\"programlisting\" id=\"0\"/>"
 msgstr ""
-"以下の APT 設定ファイルは、<literal>testing</literal> ディストリビューション"
+"以下の APT 選択ファイルは、<literal>testing</literal> ディストリビューション"
 "のパッケージのバージョンに高い優先度を割り当て、<literal>unstable</literal> "
 "ディストリビューションのパッケージのバージョンには低い優先度を割り当てます。"
 "また他の <literal>Debian</literal> ディストリビューションのパッケージのバー"
 "ジョンには、低くてインストールできないような優先度を割り当てます。"
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
-#, fuzzy
+#: apt_preferences.5.xml:613
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
 "<literal>testing</literal> version(s).  <placeholder type=\"programlisting\" "
 "id=\"0\"/>"
 msgstr ""
-"適切な &sources-list; ファイルと上記の設定ファイルにより、以下のコマンドで最"
+"適切な &sources-list; ファイルと上記の選択ファイルにより、以下のコマンドで最"
 "新の <literal>testing</literal> バージョンにアップグレードできます。"
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:633
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>package</replaceable>/unstable\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
-#, fuzzy
+#: apt_preferences.5.xml:624
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -8920,28 +7621,29 @@ msgstr ""
 "ビューションの最新バージョンにアップグレードします。それ以降、<command>apt-"
 "get upgrade</command> は <literal>testing</literal> バージョンのパッケージが"
 "更新されていれば <literal>testing</literal> の最新版に、<literal>unstable</"
-"literal> バージョンのパッケージが更新されていれば <literal>unstable</literal>"
-"の最新版にアップグレードします。"
+"literal> バージョンのパッケージが更新されていれば <literal>unstable</"
+"literal> の最新版にアップグレードします。<placeholder type=\"programlisting"
+"\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:640
 msgid "Tracking the evolution of a codename release"
-msgstr ""
+msgstr "コード名リリースの進化の追跡"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:654
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
-"Explanation: other than those in the distribution codenamed with squeeze or sid\n"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
 "Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
 "Pin-Priority: 800\n"
 "\n"
 "Package: *\n"
@@ -8949,14 +7651,14 @@ msgid ""
 "Pin-Priority: -10\n"
 msgstr ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
-"Explanation: other than those in the distribution codenamed with squeeze or sid\n"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
 "Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
 "Pin-Priority: 800\n"
 "\n"
 "Package: *\n"
@@ -8964,7 +7666,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:642
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -8977,106 +7679,84 @@ msgid ""
 "notwithstanding the codename changes you should use the example "
 "configurations above.  <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
+"以下の APT 選択ファイルは、指定したコードネームのディストリビューションに属す"
+"る全てのパッケージのバージョンに、デフォルト (500) より高い優先度を割り当て、"
+"他の <literal>Debian</literal> ディストリビューション、コード名、アーカイブの"
+"パッケージのバージョンには、低くてインストールできないような優先度を割り当て"
+"ます。この APT 選択ファイルにより、APT は <literal>testing</literal> アーカイ"
+"ブから、<literal>stable</literal> や最新の <literal>oldstable</literal> へ移"
+"行できます。コード名の変更に関係なく <literal>testing</literal> を追跡したい"
+"場合は、上記の設定例を使用するべきです。<placeholder type=\"programlisting\" "
+"id=\"0\"/>"
 
-# type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
-#, fuzzy
+#: apt_preferences.5.xml:671
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
-"the release codenamed with <literal>squeeze</literal>.  <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"the release codenamed with <literal>&testing-codename;</literal>.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
-"適切な &sources-list; ファイルと上記の設定ファイルにより、以下のコマンドで最"
-"新の <literal>stable</literal> バージョンにアップグレードできます。"
+"適切な &sources-list; ファイルと上記の選択ファイルにより、以下のコマンドで、"
+"リリースコード名が <literal>&testing-codename;</literal> である最新バージョン"
+"にアップグレードできます。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:691
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:682
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
 "<command>apt-get upgrade</command> will upgrade the package to the most "
-"recent <literal>squeeze</literal> version if that is more recent than the "
-"installed version, otherwise, to the most recent <literal>sid</literal> "
-"version if that is more recent than the installed version.  <placeholder "
-"type=\"programlisting\" id=\"0\"/>"
+"recent <literal>&testing-codename;</literal> version if that is more recent "
+"than the installed version, otherwise, to the most recent <literal>sid</"
+"literal> version if that is more recent than the installed version.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
-"以下のコマンドで、指定したパッケージを <literal>unstable</literal> ディストリ"
+"以下のコマンドで、指定したパッケージを <literal>sid</literal> ディストリ"
 "ビューションの最新バージョンにアップグレードします。それ以降、<command>apt-"
-"get upgrade</command> は <literal>testing</literal> バージョンのパッケージが"
-"更新されていれば <literal>testing</literal> の最新版に、<literal>unstable</"
-"literal> バージョンのパッケージが更新されていれば <literal>unstable</literal>"
-"の最新版にアップグレードします。"
-
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
-#, fuzzy
-#| msgid "apt_preferences"
-msgid "&file-preferences;"
-msgstr "apt_preferences"
+"get upgrade</command> は <literal>squeeze</literal> バージョンのパッケージが"
+"更新されていれば <literal>squeeze</literal> の最新版に、<literal>sid</"
+"literal> バージョンのパッケージが更新されていれば <literal>sid</literal>の最"
+"新版にアップグレードします。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:706
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: sources.list.5.xml:22 sources.list.5.xml:29
-msgid "sources.list"
-msgstr "sources.list"
-
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:30
+#: sources.list.5.xml:33
 msgid "Package resource list for APT"
 msgstr "APT 用パッケージリソースリスト"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:34
-#, fuzzy
-#| msgid ""
-#| "The package resource list is used to locate archives of the package "
-#| "distribution system in use on the system. At this time, this manual page "
-#| "documents only the packaging system used by the Debian GNU/Linux system.  "
-#| "This control file is located in <filename>/etc/apt/sources.list</filename>"
+#: sources.list.5.xml:37
 msgid ""
 "The package resource list is used to locate archives of the package "
 "distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian GNU/Linux system.  "
-"This control file is <filename>/etc/apt/sources.list</filename>."
+"documents only the packaging system used by the Debian system.  This control "
+"file is <filename>/etc/apt/sources.list</filename>."
 msgstr ""
 "このパッケージリソースリストは、システムで使用するパッケージの保管場所を特定"
-"するのに使用されます。今回このマニュアルページには、Debian GNU/Linux システム"
-"で使用するパッケージシステムについてのみ記述します。この制御ファイルは、"
-"<filename>/etc/apt/sources.list</filename> にあります。"
+"するのに使用されます。今回このマニュアルページには、Debian システムで使用する"
+"パッケージシステムについてのみ記述します。この制御ファイルは、<filename>/etc/"
+"apt/sources.list</filename> にあります。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:39
-#, fuzzy
-#| msgid ""
-#| "The source list is designed to support any number of active sources and a "
-#| "variety of source media. The file lists one source per line, with the "
-#| "most preferred source listed first. The format of each line is: "
-#| "<literal>type uri args</literal> The first item, <literal>type</literal> "
-#| "determines the format for <literal>args</literal> <literal>uri</literal> "
-#| "is a Universal Resource Identifier (URI), which is a superset of the more "
-#| "specific and well-known Universal Resource Locator, or URL. The rest of "
-#| "the line can be marked as a comment by using a #."
+#: sources.list.5.xml:42
 msgid ""
 "The source list is designed to support any number of active sources and a "
 "variety of source media. The file lists one source per line, with the most "
@@ -9092,41 +7772,52 @@ msgstr ""
 "フォーマットは、<literal>タイプ uri 引数</literal> となります。先頭の "
 "<literal>タイプ</literal> で、<literal>引数</literal> のフォーマットを決定し"
 "ます。<literal>uri</literal> は Universal Resource Identifier (URI) で、よく"
-"知られた URL のスーパーセットです。行の残りに # を付けて、コメントにできま"
-"す。"
+"知られた Universal Resource Locator (URL) のスーパーセットです。行の残りに # "
+"を付けて、コメントにできます。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:53
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:51
+#: sources.list.5.xml:54
 #, fuzzy
+#| msgid ""
+#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
+#| "to add sources.list entries in separate files.  The format is the same as "
+#| "for the regular <filename>sources.list</filename> file.  File names need "
+#| "to end with <filename>.list</filename> and may only contain letters (a-z "
+#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
+#| "characters.  Otherwise they will be silently ignored."
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
 "add sources.list entries in separate files.  The format is the same as for "
 "the regular <filename>sources.list</filename> file.  File names need to end "
 "with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
 "digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
-"Otherwise they will be silently ignored."
+"Otherwise APT will print a notice that it has ignored a file if the file "
+"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"configuration list - in this case it will be silently ignored."
 msgstr ""
-"<filename>/etc/apt/sources.list.d</filename> ディレクトリにファイル名が "
-"<literal>.list</literal> で終わる個別ファイルを置いておくと、sources.list エ"
-"ントリに追加できます。フォーマットは、通常の <filename>sources.list</"
-"filename> ファイルと同じです。"
+"<filename>/etc/apt/sources.list.d</filename> ディレクトリは、個別ファイルで追"
+"加 source.list エントリを提供します。フォーマットは、通常の "
+"<filename>sources.list</filename> ファイルと同じです。ファイル名は、"
+"<filename>.list</filename> で終わる必要があり、文字 (a-z と A-Z)、数字 "
+"(0-9)、アンダースコア (_)、ハイフン (-)、ピリオド (.) のみを含んでいなければ"
+"なりません。そうでなければ、黙って無視します。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:60
+#: sources.list.5.xml:65
 msgid "The deb and deb-src types"
 msgstr "deb タイプと deb-src タイプ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:61
+#: sources.list.5.xml:66
 #, fuzzy
 #| msgid ""
 #| "The <literal>deb</literal> type describes a typical two-level Debian "
@@ -9134,38 +7825,35 @@ msgstr "deb タイプと deb-src タイプ"
 #| "<literal>distribution</literal> is generally one of <literal>stable</"
 #| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
 #| "component is one of <literal>main</literal> <literal>contrib</literal> "
-#| "<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
-#| "src</literal> type describes a debian distribution's source code in the "
-#| "same form as the <literal>deb</literal> type.  A <literal>deb-src</"
-#| "literal> line is required to fetch source indexes."
+#| "<literal>non-free</literal> or <literal>non-us</literal>. The "
+#| "<literal>deb-src</literal> type describes a debian distribution's source "
+#| "code in the same form as the <literal>deb</literal> type.  A <literal>deb-"
+#| "src</literal> line is required to fetch source indexes."
 msgid ""
 "The <literal>deb</literal> type describes a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. Typically, "
-"<literal>distribution</literal> is generally one of <literal>stable</"
-"literal> <literal>unstable</literal> or <literal>testing</literal> while "
-"component is one of <literal>main</literal> <literal>contrib</literal> "
-"<literal>non-free</literal> or <literal>non-us</literal>. The <literal>deb-"
-"src</literal> type describes a debian distribution's source code in the same "
-"form as the <literal>deb</literal> type.  A <literal>deb-src</literal> line "
-"is required to fetch source indexes."
+"<literal>distribution</literal> is generally an archivename like "
+"<literal>stable</literal> or <literal>testing</literal> or a codename like "
+"<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
+"literal> while component is one of <literal>main</literal> <literal>contrib</"
+"literal> or <literal>non-free</literal>. The <literal>deb-src</literal> type "
+"describes a debian distribution's source code in the same form as the "
+"<literal>deb</literal> type.  A <literal>deb-src</literal> line is required "
+"to fetch source indexes."
 msgstr ""
 "<literal>deb</literal> タイプでは典型的な 2 段階の Debian アーカイブ "
-"(<filename>distribution/component</filename>) を記述します。よくあるケースで"
-"は、<literal>distribution</literal> は通常 <literal>stable</literal> "
-"<literal>unstable</literal> <literal>testing</literal> のどれか、component "
-"は、<literal>main</literal> <literal>contrib</literal> <literal>non-free</"
-"literal> <literal>non-us</literal> のどれかです。<literal>deb-src</literal> "
+"<filename>distribution/component</filename> を記述します。よくあるケースで"
+"は、<literal>distribution</literal> は通常 <literal>stable</literal>,  "
+"<literal>unstable</literal>, <literal>testing</literal> のどれか、component "
+"は、<literal>main</literal>, <literal>contrib</literal>, <literal>non-free</"
+"literal>, <literal>non-us</literal> のどれかです。<literal>deb-src</literal> "
 "タイプでは、Debian ディストリビューションのソースコードを、<literal>deb</"
 "literal> タイプと同じ形式で記述します。<literal>deb-src</literal> 行は、ソー"
 "スインデックスを取得するのに必要です。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:73
-#, fuzzy
-#| msgid ""
-#| "The format for a <filename>sources.list</filename> entry using the "
-#| "<literal>deb</literal> and <literal>deb-src</literal> types are:"
+#: sources.list.5.xml:78
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -9175,24 +7863,15 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:76
-#, no-wrap
-msgid "deb uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:81
+#, fuzzy, no-wrap
+#| msgid "deb uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 msgstr "deb uri distribution [component1] [component2] [...]"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:78
-#, fuzzy
-#| msgid ""
-#| "The URI for the <literal>deb</literal> type must specify the base of the "
-#| "Debian distribution, from which APT will find the information it needs.  "
-#| "<literal>distribution</literal> can specify an exact path, in which case "
-#| "the components must be omitted and <literal>distribution</literal> must "
-#| "end with a slash (/). This is useful for when only a particular sub-"
-#| "section of the archive denoted by the URI is of interest.  If "
-#| "<literal>distribution</literal> does not specify an exact path, at least "
-#| "one <literal>component</literal> must be present."
+#: sources.list.5.xml:83
 msgid ""
 "The URI for the <literal>deb</literal> type must specify the base of the "
 "Debian distribution, from which APT will find the information it needs.  "
@@ -9203,8 +7882,8 @@ msgid ""
 "literal> does not specify an exact path, at least one <literal>component</"
 "literal> must be present."
 msgstr ""
-"<literal>deb</literal> タイプの URI は、APT が情報を見つけられるように、"
-"Debian ディストリビューションの基底を指定しなければなりません。"
+"<literal>deb</literal> タイプの URI は、APT が必要な情報を見つけられるよう"
+"に、Debian ディストリビューションの基底を指定しなければなりません。"
 "<literal>distribution</literal> には正確なパスを指定できます。その場合 "
 "component を省略し、<literal>distribution</literal> はスラッシュ (/) で終わら"
 "なくてはなりません。これは URL で指定されたアーカイブの、特定のサブセクション"
@@ -9214,7 +7893,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:87
+#: sources.list.5.xml:92
 msgid ""
 "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
 "</literal> which expands to the Debian architecture (i386, m68k, "
@@ -9233,7 +7912,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:95
+#: sources.list.5.xml:100
 msgid ""
 "Since only one distribution can be specified per line it may be necessary to "
 "have multiple lines for the same URI, if a subset of all available "
@@ -9255,9 +7934,41 @@ msgstr ""
 "にアクセスするのに便利です。APT は、帯域の狭いサイトを効率よく扱うのに、異な"
 "るホストへは、接続を並行して行うようにもしています。"
 
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:112
+msgid ""
+"<literal>options</literal> is always optional and needs to be surounded by "
+"square brackets. It can consist of multiple settings in the form "
+"<literal><replaceable>setting</replaceable>=<replaceable>value</"
+"replaceable></literal>.  Multiple settings are separated by spaces. The "
+"following settings are supported by APT, note though that unsupported "
+"settings will be ignored silently:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:117
+msgid ""
+"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> can be used to specify for which architectures "
+"packages information should be downloaded. If this option is not set all "
+"architectures defined by the <literal>APT::Architectures</literal> option "
+"will be downloaded."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenticated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenticated sources as not authenticated."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:107
+#: sources.list.5.xml:128
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -9271,37 +7982,38 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:112
+#: sources.list.5.xml:133
 msgid "Some examples:"
 msgstr "例:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:135
 #, no-wrap
 msgid ""
-"deb http://http.us.debian.org/debian stable main contrib non-free\n"
-"deb http://http.us.debian.org/debian dists/stable-updates/\n"
+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
 "   "
 msgstr ""
-"deb http://http.us.debian.org/debian stable main contrib non-free\n"
-"deb http://http.us.debian.org/debian dists/stable-updates/\n"
+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
 "   "
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:141
 msgid "URI specification"
 msgstr "URI の仕様"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:125
-msgid "file"
-msgstr "ファイル"
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:143
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "The currently recognized URI types are:"
+msgstr "さらに認識できる URI タイプ"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:147
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -9312,9 +8024,9 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:154
 msgid ""
-"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
+"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
 msgstr ""
 "cdrom スキームは、APT がローカル CD-ROM ドライブを、メディア交換しながら使え"
@@ -9323,15 +8035,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:141
-#, fuzzy
-#| msgid ""
-#| "The http scheme specifies an HTTP server for the archive. If an "
-#| "environment variable <envar>http_proxy</envar> is set with the format "
-#| "http://server:port/, the proxy server specified in <envar>http_proxy</"
-#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
-#| "string of the format http://user:pass@server:port/ Note that this is an "
-#| "insecure method of authentication."
+#: sources.list.5.xml:161
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9343,12 +8047,12 @@ msgstr ""
 "http スキームはアーカイブとして、HTTP サーバを指定します。環境変数 "
 "<envar>http_proxy</envar> が、http://server:port/ と言った形で指定されていれ"
 "ば、<envar>http_proxy</envar> で指定したプロキシサーバを使用します。ユーザ認"
-"証が必要な HTTP/1.1 プロキシの場合、http://user:pass@server:port/ と言う形で"
+"証が必要な HTTP/1.1 プロキシの場合、http://user:pass@server:port/ という形で"
 "指定してください。この認証方法は安全ではないことに注意してください。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:152
+#: sources.list.5.xml:172
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -9360,20 +8064,15 @@ msgid ""
 msgstr ""
 "ftp スキームは、アーカイブに FTP サーバを指定します。APT の FTP の振る舞い"
 "は、高度に設定できます。詳細は、&apt-conf; のマニュアルページをご覧ください。"
-"ftp プロキシは、<envar>ftp_proxy</envar> 環境変数で指定することにご注意くださ"
-"い。この方法用に、さらにこの方法でしか使用しないのに、http プロキシを使用する"
-"ことができます (http プロキシサーバは大抵 ftp urlも理解できます)。設定ファイ"
-"ルで http を使用する際に、ftp プロキシを使用するよう設定してあっても無視され"
-"ます。"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:161
-msgid "copy"
-msgstr "copy"
+"ftp プロキシは、<envar>ftp_proxy</envar> 環境変数で指定することに注意してくだ"
+"さい。この方法用に、さらにこの方法でしか使用しないのに、http プロキシを使用す"
+"ることができます (http プロキシサーバは大抵 ftp urlも理解できます)。設定ファ"
+"イルで http を使用する際に、ftp プロキシを使用するよう設定してあっても無視さ"
+"れます。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:183
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -9383,19 +8082,9 @@ msgstr ""
 "キャッシュディレクトリにコピーするところが違います。zip ディスクを使用してい"
 "て、APT でコピーを行う場合に便利です。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:168
-msgid "rsh"
-msgstr "rsh"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:168
-msgid "ssh"
-msgstr "ssh"
-
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:170
+#: sources.list.5.xml:190
 msgid ""
 "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
 "user and access the files. It is a good idea to do prior arrangements with "
@@ -9410,36 +8099,27 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
-msgstr ""
+#: sources.list.5.xml:198
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "adding more recognizable URI types"
+msgstr "さらに認識できる URI タイプ"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:180
+#: sources.list.5.xml:200
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>.  The APT team e.g. maintain "
-"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
-"other methods for using e.g. debtorrent are also available, see "
-"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
-"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
-msgstr ""
-
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
-msgid ""
-"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
-"rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
+"which should follow the nameing scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>.  The APT team e.g. maintains "
+"also the <package>apt-transport-https</package> package which provides "
+"access methods for https-URIs with features similar to the http method, but "
+"other methods for using e.g. debtorrent are also available, see &apt-"
+"transport-debtorrent;."
 msgstr ""
-"現在認識する URI タイプは、cdrom, file, http, ftp, copy, ssh, rsh です。"
-"<placeholder type=\"variablelist\" id=\"0\"/>"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:212
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -9448,38 +8128,56 @@ msgstr ""
 "free 用のローカル (または NFS) アーカイブを使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:214
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:198
+#: sources.list.5.xml:216
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr "上記同様ですが、不安定版 (開発版) を使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:199
+#: sources.list.5.xml:217
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:219
 msgid "Source line for the above"
 msgstr "上記のソース行"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:202
+#: sources.list.5.xml:220
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:222
+msgid ""
+"The first line gets package information for the architectures in "
+"<literal>APT::Architectures</literal> while the second always retrieves "
+"<literal>amd64</literal> and <literal>armel</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:224
+#, no-wrap
+msgid ""
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+msgstr ""
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:227
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -9489,37 +8187,31 @@ msgstr ""
 
 # type: <example></example>
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:229
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:208
+#: sources.list.5.xml:231
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
-"directory, and uses only the stable/contrib area."
+"directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 "ftp.debian.org のアーカイブに FTP アクセスし、debian ディレクトリ以下の "
-"stable/contrib のみを使用します。"
+"&stable-codename;/contrib のみを使用します。"
 
 # type: <example></example>
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:233
 #, no-wrap
-msgid "deb ftp://ftp.debian.org/debian stable contrib"
-msgstr "deb ftp://ftp.debian.org/debian stable contrib"
+msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:212
-#, fuzzy
-#| msgid ""
-#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
-#| "directory, and uses only the unstable/contrib area. If this line appears "
-#| "as well as the one in the previous example in <filename>sources.list</"
-#| "filename>.  a single FTP session will be used for both resource lines."
+#: sources.list.5.xml:235
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -9527,49 +8219,43 @@ msgid ""
 "a single FTP session will be used for both resource lines."
 msgstr ""
 "ftp.debian.org のアーカイブに FTP アクセスし、debian ディレクトリ以下の "
-"unstable/contrib を使用します。<filename>sources.list</filename> に上記サンプ"
-"ルと一緒に指定された場合、両方のリソース行に対応する FTP セッションはひとつだ"
-"けになります。"
+"unstable/contrib のみを使用します。<filename>sources.list</filename> に上記サ"
+"ンプルと一緒に指定された場合、両方のリソース行に対応する FTP セッションはひと"
+"つだけになります。"
 
 # type: <example></example>
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:216
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
-msgid ""
-"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
-"directory."
-msgstr ""
-"nonus.debian.org のアーカイブに HTTP アクセスし、debian-non-US ディレクトリ以"
-"下を使用します。"
-
-#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
-#, no-wrap
-msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
-msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
-
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:248
 #, no-wrap
-msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
-msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
-msgid ""
-"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
+#: sources.list.5.xml:241
+#, fuzzy
+#| msgid ""
+#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
+#| "US directory, and uses only files found under <filename>unstable/binary-"
+#| "i386</filename> on i386 machines, <filename>unstable/binary-m68k</"
+#| "filename> on m68k, and so forth for other supported architectures. [Note "
+#| "this example only illustrates how to use the substitution variable; non-"
+#| "us is no longer structured like this] <placeholder type=\"literallayout\" "
+#| "id=\"0\"/>"
+msgid ""
+"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
-"filename> on i386 machines, <filename>unstable/binary-m68k</filename> on "
-"m68k, and so forth for other supported architectures. [Note this example "
-"only illustrates how to use the substitution variable; non-us is no longer "
-"structured like this] <placeholder type=\"literallayout\" id=\"0\"/>"
+"filename> on i386 machines, <filename>unstable/binary-amd64</filename> on "
+"amd64, and so forth for other supported architectures. [Note this example "
+"only illustrates how to use the substitution variable; official debian "
+"archives are not structured like this] <placeholder type=\"literallayout\" "
+"id=\"0\"/>"
 msgstr ""
 "nonus.debian.org のアーカイブに HTTP アクセスし、debian-non-US ディレクトリ以"
 "下を使用します。また、i386 マシンでは <filename>unstable/binary-i386</"
@@ -9581,14 +8267,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:253
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
 #. type: <title></title>
 #: guide.sgml:4
 msgid "APT User's Guide"
-msgstr ""
+msgstr "APT ユーザガイド"
 
 # type: <author></author>
 #. type: <author></author>
@@ -9599,20 +8285,19 @@ msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
 #. type: <version></version>
 #: guide.sgml:7
 msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr ""
+msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
 
 #. type: <abstract></abstract>
 #: guide.sgml:11
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
-msgstr ""
+msgstr "本文書は APT パッケージマネージャの使い方の概要を提供します。"
 
 # type: <copyrightsummary></copyrightsummary>
 #. type: <copyrightsummary></copyrightsummary>
 #: guide.sgml:15
-#, fuzzy
 msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+msgstr "Copyright &copy; Jason Gunthorpe, 1998."
 
 #. type: <p></p>
 #: guide.sgml:21 offline.sgml:22
@@ -9622,19 +8307,24 @@ msgid ""
 "published by the Free Software Foundation; either version 2 of the License, "
 "or (at your option) any later version."
 msgstr ""
+"\"APT\" and this document are free software; you can redistribute them and/"
+"or modify them under the terms of the GNU General Public License as "
+"published by the Free Software Foundation; either version 2 of the License, "
+"or (at your option) any later version."
 
 #. type: <p></p>
 #: guide.sgml:24 offline.sgml:25
 msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
-"common-licenses/GPL for the full license."
+"For more details, on Debian systems, see the file /usr/share/common-licenses/"
+"GPL for the full license."
 msgstr ""
+"For more details, on Debian systems, see the file /usr/share/common-licenses/"
+"GPL for the full license."
 
 #. type: <heading></heading>
 #: guide.sgml:32
-#, fuzzy
 msgid "General"
-msgstr "generate"
+msgstr "全般"
 
 #. type: <p></p>
 #: guide.sgml:38
@@ -9648,9 +8338,8 @@ msgstr ""
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: <heading></heading>
 #: guide.sgml:39
-#, fuzzy
 msgid "Anatomy of the Package System"
-msgstr "パッケージ名"
+msgstr "パッケージシステムの構造"
 
 #. type: <p></p>
 #: guide.sgml:44
@@ -9683,7 +8372,7 @@ msgstr ""
 #: guide.sgml:63
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
 "simple dependency on GPG. Also, because it is an emacs extension it has a "
 "simple dependency on emacs, without emacs it is completely useless."
 msgstr ""
@@ -9723,6 +8412,12 @@ msgid ""
 "packages for installation."
 msgstr ""
 
+# type: Content of: <refentry><refnamediv><refname>
+#. type: <heading></heading>
+#: guide.sgml:96
+msgid "apt-get"
+msgstr "apt-get"
+
 #. type: <p></p>
 #: guide.sgml:102
 msgid ""
@@ -9753,12 +8448,23 @@ msgid ""
 "Reading Package Lists... Done\n"
 "Building Dependency Tree... Done"
 msgstr ""
+"# apt-get update\n"
+"Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
+"Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done"
 
 #. type: <p><taglist>
 #: guide.sgml:120
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 
+# type: <tag></tag>
+#. type: <tag></tag>
+#: guide.sgml:121
+msgid "upgrade"
+msgstr "upgrade"
+
 #. type: <p></p>
 #: guide.sgml:131
 msgid ""
@@ -9771,6 +8477,12 @@ msgid ""
 "<tt>apt-get install</tt> can be used to force these packages to install."
 msgstr ""
 
+# type: <tag></tag>
+#. type: <tag></tag>
+#: guide.sgml:131
+msgid "install"
+msgstr "install"
+
 #. type: <p></p>
 #: guide.sgml:140
 msgid ""
@@ -9783,6 +8495,12 @@ msgid ""
 "anything other than its arguments are changed."
 msgstr ""
 
+# type: <tag></tag>
+#. type: <tag></tag>
+#: guide.sgml:140
+msgid "dist-upgrade"
+msgstr "dist-upgrade"
+
 #. type: <p></p>
 #: guide.sgml:149
 msgid ""
@@ -9832,15 +8550,15 @@ msgstr ""
 #. type: <p></p>
 #: guide.sgml:184
 msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
+"and then choose the APT method. You will be prompted for a set of "
 "<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
 "provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CDROM then it "
+"combine them to form a complete set of packages. If you have a CD-ROM then it "
 "is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
 msgstr ""
 
 #. type: <example></example>
@@ -9859,7 +8577,7 @@ msgid ""
 "      \n"
 "      \n"
 " URL [http://llug.sep.bnl.gov/debian]:"
-msgstr ""
+msgstr "   "
 
 #. type: <p></p>
 #: guide.sgml:205
@@ -9878,7 +8596,7 @@ msgid ""
 " tags are typically something like: stable unstable testing non-US\n"
 "   \n"
 " Distribution [stable]:"
-msgstr ""
+msgstr " "
 
 #. type: <p></p>
 #: guide.sgml:222
@@ -9899,7 +8617,7 @@ msgid ""
 " The components are typically something like: main contrib non-free\n"
 "  \n"
 " Components [main contrib non-free]:"
-msgstr ""
+msgstr " "
 
 #. type: <p></p>
 #: guide.sgml:236
@@ -9921,7 +8639,7 @@ msgstr ""
 #: guide.sgml:247
 msgid ""
 "Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
 "<tt>apt-get update</tt> that makes the fetched information available to "
 "<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
 "tt> has been run before."
@@ -9947,9 +8665,8 @@ msgstr ""
 # type: <tag></tag>
 #. type: <heading></heading>
 #: guide.sgml:264
-#, fuzzy
 msgid "The Interface"
-msgstr "メソッドインスタンス"
+msgstr "インターフェース"
 
 #. type: <p></p>
 #: guide.sgml:278
@@ -9986,6 +8703,9 @@ msgid ""
 "Reading Package Lists... Done\n"
 "Building Dependency Tree... Done"
 msgstr ""
+"# apt-get check\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done"
 
 #. type: <p></p>
 #: guide.sgml:297
@@ -10025,6 +8745,21 @@ msgid ""
 "           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
 "  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
 msgstr ""
+"# apt-get check\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done\n"
+"You might want to run apt-get -f install' to correct these.\n"
+"Sorry, but the following packages have unmet dependencies:\n"
+"  9fonts: Depends: xlib6g but it is not installed\n"
+"  uucp: Depends: mailx but it is not installed\n"
+"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  adduser: Depends: perl-base but it is not installed\n"
+"  aumix: Depends: libgpmg1 but it is not installed\n"
+"  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
+"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  cthugha: Depends: svgalibg1 but it is not installed\n"
+"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
 
 #. type: <p></p>
 #: guide.sgml:329
@@ -10072,7 +8807,7 @@ msgstr ""
 #. type: <heading></heading>
 #: guide.sgml:356
 msgid "The Status Report"
-msgstr ""
+msgstr "状態レポート"
 
 #. type: <p></p>
 #: guide.sgml:363
@@ -10087,9 +8822,8 @@ msgstr ""
 # type: <tag></tag>
 #. type: <heading></heading>
 #: guide.sgml:364
-#, fuzzy
 msgid "The Extra Package list"
-msgstr "NextPackage"
+msgstr "追加パッケージリスト"
 
 #. type: <example></example>
 #: guide.sgml:372
@@ -10102,6 +8836,12 @@ msgid ""
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
 "  ssh"
 msgstr ""
+"The following extra packages will be installed:\n"
+"  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
+"  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
+"  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
+"  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
+"  ssh"
 
 #. type: <p></p>
 #: guide.sgml:379
@@ -10115,7 +8855,7 @@ msgstr ""
 #. type: <heading></heading>
 #: guide.sgml:382
 msgid "The Packages to Remove"
-msgstr ""
+msgstr "削除するパッケージ"
 
 #. type: <example></example>
 #: guide.sgml:389
@@ -10127,6 +8867,11 @@ msgid ""
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
 "  nas xpilot xfig"
 msgstr ""
+"The following packages will be REMOVED:\n"
+"  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
+"  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
+"  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
+"  nas xpilot xfig"
 
 #. type: <p></p>
 #: guide.sgml:399
@@ -10143,9 +8888,8 @@ msgstr ""
 # type: <tag></tag>
 #. type: <heading></heading>
 #: guide.sgml:402
-#, fuzzy
 msgid "The New Packages list"
-msgstr "NextPackage"
+msgstr "新規パッケージリスト"
 
 #. type: <example></example>
 #: guide.sgml:406
@@ -10154,6 +8898,8 @@ msgid ""
 "The following NEW packages will installed:\n"
 "  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
 msgstr ""
+"The following NEW packages will installed:\n"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
 
 #. type: <p></p>
 #: guide.sgml:411
@@ -10166,9 +8912,8 @@ msgstr ""
 # type: <tag></tag>
 #. type: <heading></heading>
 #: guide.sgml:414
-#, fuzzy
 msgid "The Kept Back list"
-msgstr "NextPackage"
+msgstr ""
 
 #. type: <example></example>
 #: guide.sgml:419
@@ -10178,6 +8923,9 @@ msgid ""
 "  compface man-db tetex-base msql libpaper svgalib1\n"
 "  gs snmp arena lynx xpat2 groff xscreensaver"
 msgstr ""
+"The following packages have been kept back\n"
+"  compface man-db tetex-base msql libpaper svgalib1\n"
+"  gs snmp arena lynx xpat2 groff xscreensaver"
 
 #. type: <p></p>
 #: guide.sgml:428
@@ -10202,6 +8950,8 @@ msgid ""
 "The following held packages will be changed:\n"
 "  cvs"
 msgstr ""
+"The following held packages will be changed:\n"
+"  cvs"
 
 #. type: <p></p>
 #: guide.sgml:441
@@ -10214,7 +8964,7 @@ msgstr ""
 #. type: <heading></heading>
 #: guide.sgml:444
 msgid "Final summary"
-msgstr ""
+msgstr "最後のまとめ"
 
 #. type: <p></p>
 #: guide.sgml:447
@@ -10230,6 +8980,9 @@ msgid ""
 "12 packages not fully installed or removed.\n"
 "Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
 msgstr ""
+"206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
+"12 packages not fully installed or removed.\n"
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
 
 #. type: <p></p>
 #: guide.sgml:470
@@ -10259,7 +9012,7 @@ msgstr ""
 #. type: <heading></heading>
 #: guide.sgml:477
 msgid "The Status Display"
-msgstr ""
+msgstr "状態表示"
 
 #. type: <p></p>
 #: guide.sgml:481
@@ -10280,6 +9033,13 @@ msgid ""
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
 "11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
 msgstr ""
+"# apt-get update\n"
+"Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
+"Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
+"Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
+"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
 
 #. type: <p></p>
 #: guide.sgml:500
@@ -10358,7 +9118,7 @@ msgstr "オフラインでの APT の使用法"
 #. type: <version></version>
 #: offline.sgml:7
 msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
+msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
 
 # type: <abstract></abstract>
 #. type: <abstract></abstract>
@@ -10368,7 +9128,7 @@ msgid ""
 "specifically a 'sneaker-net' approach for performing upgrades."
 msgstr ""
 "このドキュメントはネットワークがない環境での APT の使用方法を説明しています。"
-"具体的には、アップグレード時に「スニーカーネット」アプローチです。"
+"具体的には、アップグレード時の「スニーカーネット」アプローチです。"
 
 # type: <copyrightsummary></copyrightsummary>
 #. type: <copyrightsummary></copyrightsummary>
@@ -10384,9 +9144,8 @@ msgstr "はじめに"
 
 #. type: <heading></heading>
 #: offline.sgml:34 offline.sgml:65 offline.sgml:180
-#, fuzzy
 msgid "Overview"
-msgstr "OverrideDir"
+msgstr "概要"
 
 #. type: <p></p>
 #: offline.sgml:40
@@ -10415,7 +9174,7 @@ msgstr ""
 #: offline.sgml:57
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
 "that the disc should be formated with a filesystem that can handle long file "
 "names such as ext2, fat32 or vfat."
 msgstr ""
@@ -10423,9 +9182,8 @@ msgstr ""
 # type: <title></title>
 #. type: <heading></heading>
 #: offline.sgml:63
-#, fuzzy
 msgid "Using APT on both machines"
-msgstr "オフラインでの APT の使用法"
+msgstr "両方のマシンでの APT の使用法"
 
 #. type: <p><example>
 #: offline.sgml:71
@@ -10462,9 +9220,8 @@ msgstr ""
 # type: Content of: <refentry><refsect1><title>
 #. type: <heading></heading>
 #: offline.sgml:88
-#, fuzzy
 msgid "The configuration file"
-msgstr "ユーザの設定"
+msgstr "設定ファイル"
 
 #. type: <p></p>
 #: offline.sgml:96
@@ -10487,7 +9244,7 @@ msgstr ""
 # type: <example></example>
 #. type: <example></example>
 #: offline.sgml:124
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 " APT\n"
 " {\n"
@@ -10516,7 +9273,7 @@ msgstr ""
 " APT\n"
 " {\n"
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
-"      the remote APT what architecture the Debian machine is */\n"
+"      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
 "   \n"
 "   Get::Download-Only \"true\";\n"
@@ -10550,14 +9307,14 @@ msgid ""
 "On the target machine the first thing to do is mount the disc and copy <em>/"
 "var/lib/dpkg/status</em> to it. You will also need to create the directories "
 "outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"
 msgstr ""
 
 # type: <example></example>
 #. type: <example></example>
 #: offline.sgml:142
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
@@ -10567,16 +9324,16 @@ msgid ""
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
-" [ パッケージファイルを取得します ]\n"
+" [ package ファイルを APT が取得します ]\n"
 " # apt-get dist-upgrade\n"
-" [ アップグレードが必要な全パッケージを取得します ]"
+" [ 対象マシンをアップグレードするのに必要なパッケージを、APT が取得します ]"
 
 #. type: </example></p>
 #: offline.sgml:149
 msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
 "your selections back to the local computer."
 msgstr ""
 
@@ -10590,7 +9347,7 @@ msgstr ""
 # type: <example></example>
 #. type: <example></example>
 #: offline.sgml:159
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
@@ -10598,11 +9355,11 @@ msgid ""
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
 "  [ Or any other APT command ]"
 msgstr ""
-" # export APT_CONFIG=\"/disc/apt.conf\"\n"
-" # apt-get update\n"
-" [ パッケージファイルを取得します ]\n"
-" # apt-get dist-upgrade\n"
-" [ アップグレードが必要な全パッケージを取得します ]"
+"  # export APT_CONFIG=\"/disc/apt.conf\"\n"
+"  # apt-get check\n"
+" [ キャッシュファイルのローカルコピーを生成します ]\n"
+" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
+" [ もしくはその他の APT コマンド ]"
 
 #. type: <p></p>
 #: offline.sgml:165
@@ -10624,9 +9381,8 @@ msgstr ""
 # type: <title></title>
 #. type: <heading></heading>
 #: offline.sgml:178
-#, fuzzy
 msgid "Using APT and wget"
-msgstr "オフラインでの APT の使用法"
+msgstr "APT と wget の使用法"
 
 #. type: <p></p>
 #: offline.sgml:185
@@ -10648,9 +9404,8 @@ msgstr ""
 # type: Content of: <refentry><refsect1><title>
 #. type: <heading></heading>
 #: offline.sgml:196
-#, fuzzy
 msgid "Operation"
-msgstr "オプション"
+msgstr "操作"
 
 #. type: <p><example>
 #: offline.sgml:200
@@ -10668,6 +9423,10 @@ msgid ""
 " # apt-get -qq --print-uris dist-upgrade > uris\n"
 " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
 msgstr ""
+" # apt-get dist-upgrade \n"
+" [ Press no when prompted, make sure you are happy with the actions ]\n"
+" # apt-get -qq --print-uris dist-upgrade > uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
 
 #. type: </example></p>
 #: offline.sgml:210
@@ -10688,7 +9447,7 @@ msgstr ""
 #. type: <p><example>
 #: offline.sgml:219
 msgid "The remote machine would do something like"
-msgstr ""
+msgstr "リモートマシンでは以下のようにします。"
 
 #. type: <example></example>
 #: offline.sgml:223
@@ -10698,6 +9457,9 @@ msgid ""
 "  # sh -x ./wget-script\n"
 "  [ wait.. ]"
 msgstr ""
+"  # cd /disc\n"
+"  # sh -x ./wget-script\n"
+"  [ お待ちください... ]"
 
 #. type: </example><example>
 #: offline.sgml:228
@@ -10710,850 +9472,246 @@ msgstr ""
 #: offline.sgml:230
 #, no-wrap
 msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr ""
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 
 #. type: </example></p>
 #: offline.sgml:234
 msgid "Which will use the already fetched archives on the disc."
-msgstr ""
+msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#~ msgid ""
-#~ "Disable Immediate Configuration; This dangerous option disables some of "
-#~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
-#~ "necessary on some extremely slow single user systems but is very "
-#~ "dangerous and may cause package install scripts to fail or worse.  Use at "
-#~ "your own risk."
-#~ msgstr ""
-#~ "即時設定無効 - この危険なオプションは、APT の要求コードを無効にして dpkg "
-#~ "の呼び出しをほとんどしないようにします。これは、非常に遅いシングルユーザシ"
-#~ "ステムでは必要かもしれませんが、非常に危険で、パッケージのインストールスク"
-#~ "リプトが失敗したり、もしくはもっと悪いことがおきるかもしれません。自己責任"
-#~ "で使用してください。"
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "&apt-commonoptions;"
+#~ msgstr "&apt-commonoptions;"
 
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "NoConfigure"
-#~ msgstr "config-files"
+#~ msgid "&file-sourceslist; &file-statelists;"
+#~ msgstr "&file-sourceslist; &file-statelists;"
 
 # type: Content of: <refentry><refsect1><para>
-#~ msgid "<filename>/etc/apt/sources.list</filename>"
-#~ msgstr "<filename>/etc/apt/sources.list</filename>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid ""
-#~ "Locations to fetch packages from.  Configuration Item: <literal>Dir::Etc::"
-#~ "SourceList</literal>."
+#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
+#~ "given one of the commands below must be present.  <placeholder type="
+#~ "\"variablelist\" id=\"0\"/>"
 #~ msgstr ""
-#~ "パッケージの取得元。設定項目 - <literal>Dir::Etc::SourceList</literal>"
+#~ "<option>-h</option> オプションや <option>--help</option> オプションを除"
+#~ "き、以下に挙げるコマンドが必要です。<placeholder type=\"variablelist\" id="
+#~ "\"0\"/>"
 
 # type: Content of: <refentry><refsect1><para>
-#~ msgid "<filename>&statedir;/lists/</filename>"
-#~ msgstr "<filename>&statedir;/lists/</filename>"
-
-# type: Content of: <refentry><refsect1><para>
-#~ msgid "<filename>&statedir;/lists/partial/</filename>"
-#~ msgstr "<filename>&statedir;/lists/partial/</filename>"
-
-# type: Content of: <refentry><refsect1><para>
-#~ msgid "<filename>/etc/apt/apt.conf</filename>"
-#~ msgstr "<filename>/etc/apt/apt.conf</filename>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid ""
-#~ "APT configuration file.  Configuration Item: <literal>Dir::Etc::Main</"
-#~ "literal>."
-#~ msgstr "APT 設定ファイル。設定項目 - <literal>Dir::Etc::Main</literal>"
+#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
+#~ "given one of the commands below must be present."
+#~ msgstr ""
+#~ "<option>-h</option> オプションや <option>--help</option> オプションを除"
+#~ "き、以下に挙げるコマンドが必要です。"
 
-# type: Content of: <refentry><refsect1><para>
-#~ msgid "<filename>/etc/apt/apt.conf.d/</filename>"
-#~ msgstr "<filename>/etc/apt/apt.conf.d/</filename>"
+# type: Content of: <refentry><refsect1><refsect2><title>
+#~ msgid "Dir Section"
+#~ msgstr "Dir セクション"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#~ msgid ""
-#~ "APT configuration file fragments.  Configuration Item: <literal>Dir::Etc::"
-#~ "Parts</literal>."
-#~ msgstr ""
-#~ "APT 設定ファイルの断片。設定項目 - <literal>Dir::Etc::Parts</literal>"
+# type: Content of: <refentry><refsect1><refsect2><title>
+#~ msgid "Default Section"
+#~ msgstr "Default セクション"
 
-# type: Content of: <refentry><refsect1><para>
-#~ msgid "<filename>&cachedir;/archives/</filename>"
-#~ msgstr "<filename>&cachedir;/archives/</filename>"
+# type: Content of: <refentry><refsect1><refsect2><title>
+#~ msgid "TreeDefault Section"
+#~ msgstr "TreeDefault セクション"
+
+# type: Content of: <refentry><refsect1><refsect2><title>
+#~ msgid "Tree Section"
+#~ msgstr "Tree セクション"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid ""
-#~ "Storage area for retrieved package files.  Configuration Item: "
-#~ "<literal>Dir::Cache::Archives</literal>."
+#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+#~ "&file-statelists;"
 #~ msgstr ""
-#~ "取得済みパッケージファイル格納エリア。設定項目 - <literal>Dir::Cache::"
-#~ "Archives</literal>"
-
-# type: Content of: <refentry><refsect1><para>
-#~ msgid "<filename>&cachedir;/archives/partial/</filename>"
-#~ msgstr "<filename>&cachedir;/archives/partial/</filename>"
+#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+#~ "&file-statelists;"
 
-# type: <copyrightsummary></copyrightsummary>
-#~ msgid "Copyright &copy; Jason Gunthorpe, 1997-1998."
-#~ msgstr "Copyright &copy; Jason Gunthorpe, 1997-1998."
+#~ msgid "&file-trustedgpg;"
+#~ msgstr "&file-trustedgpg;"
 
-# type: Content of: <refentry><refnamediv><refpurpose>
+# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #, fuzzy
-#~ msgid "Note on Pointer access"
-#~ msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作"
+#~| msgid "xvcg <replaceable>pkg(s)</replaceable>"
+#~ msgid "<replaceable>&synopsis-filename;</replaceable>"
+#~ msgstr "<replaceable>&synopsis-filename;</replaceable>"
 
-# type: <example></example>
-#~ msgid ""
-#~ "  void *Map = mmap(...);\n"
-#~ "  Package *PkgList = (Package *)Map;\n"
-#~ "  Header *Head = (Header *)Map;\n"
-#~ "  char *Strings = (char *)Map;\n"
-#~ "  cout << (Strings + PkgList[Head->HashTable[0]]->Name) << endl;"
-#~ msgstr ""
-#~ "  void *Map = mmap(...);\n"
-#~ "  Package *PkgList = (Package *)Map;\n"
-#~ "  Header *Head = (Header *)Map;\n"
-#~ "  char *Strings = (char *)Map;\n"
-#~ "  cout << (Strings + PkgList[Head->HashTable[0]]->Name) << endl;"
-
-# type: <heading></heading>
-#~ msgid "Structures"
-#~ msgstr "構造"
+#~ msgid "  &file-extended_states;"
+#~ msgstr "  &file-extended_states;"
 
-# type: <heading></heading>
-#~ msgid "Header"
-#~ msgstr "ヘッダ"
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "&apt-get;,&aptitude;,&apt-conf;"
+#~ msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
-# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#, fuzzy
-#~ msgid "This is the first item in the file."
-#~ msgstr "ファイル一覧ファイルを指定します。"
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "&file-aptconf;"
+#~ msgstr "&file-aptconf;"
 
-# type: <example></example>
-#~ msgid ""
-#~ "   struct Header\n"
-#~ "   {\n"
-#~ "      // Signature information\n"
-#~ "      unsigned long Signature;\n"
-#~ "      short MajorVersion;\n"
-#~ "      short MinorVersion;\n"
-#~ "      bool Dirty;\n"
-#~ "       \n"
-#~ "      // Size of structure values\n"
-#~ "      unsigned short HeaderSz;\n"
-#~ "      unsigned short PackageSz;\n"
-#~ "      unsigned short PackageFileSz;\n"
-#~ "      unsigned short VersionSz;\n"
-#~ "      unsigned short DependencySz;\n"
-#~ "      unsigned short ProvidesSz;\n"
-#~ "      unsigned short VerFileSz;\n"
-#~ "      \n"
-#~ "      // Structure counts\n"
-#~ "      unsigned long PackageCount;\n"
-#~ "      unsigned long VersionCount;\n"
-#~ "      unsigned long DependsCount;\n"
-#~ "      unsigned long PackageFileCount;\n"
-#~ "      \n"
-#~ "      // Offsets\n"
-#~ "      unsigned long FileList;              // PackageFile\n"
-#~ "      unsigned long StringList;            // StringItem\n"
-#~ "      unsigned long VerSysName;            // StringTable\n"
-#~ "      unsigned long Architecture;          // StringTable\n"
-#~ "      unsigned long MaxVerFileSize;\n"
-#~ "      \n"
-#~ "      // Allocation pools\n"
-#~ "      struct\n"
-#~ "      {\n"
-#~ "         unsigned long ItemSize;\n"
-#~ "\t unsigned long Start;\n"
-#~ "\t unsigned long Count;\n"
-#~ "      } Pools[7];\n"
-#~ "\n"
-#~ "      // Package name lookup\n"
-#~ "      unsigned long HashTable[2*1024];        // Package\n"
-#~ "   };"
-#~ msgstr ""
-#~ "   struct Header\n"
-#~ "   {\n"
-#~ "      // Signature information\n"
-#~ "      unsigned long Signature;\n"
-#~ "      short MajorVersion;\n"
-#~ "      short MinorVersion;\n"
-#~ "      bool Dirty;\n"
-#~ "       \n"
-#~ "      // Size of structure values\n"
-#~ "      unsigned short HeaderSz;\n"
-#~ "      unsigned short PackageSz;\n"
-#~ "      unsigned short PackageFileSz;\n"
-#~ "      unsigned short VersionSz;\n"
-#~ "      unsigned short DependencySz;\n"
-#~ "      unsigned short ProvidesSz;\n"
-#~ "      unsigned short VerFileSz;\n"
-#~ "      \n"
-#~ "      // Structure counts\n"
-#~ "      unsigned long PackageCount;\n"
-#~ "      unsigned long VersionCount;\n"
-#~ "      unsigned long DependsCount;\n"
-#~ "      unsigned long PackageFileCount;\n"
-#~ "      \n"
-#~ "      // Offsets\n"
-#~ "      unsigned long FileList;              // PackageFile\n"
-#~ "      unsigned long StringList;            // StringItem\n"
-#~ "      unsigned long VerSysName;            // StringTable\n"
-#~ "      unsigned long Architecture;          // StringTable\n"
-#~ "      unsigned long MaxVerFileSize;\n"
-#~ "      \n"
-#~ "      // Allocation pools\n"
-#~ "      struct\n"
-#~ "      {\n"
-#~ "         unsigned long ItemSize;\n"
-#~ "\t unsigned long Start;\n"
-#~ "\t unsigned long Count;\n"
-#~ "      } Pools[7];\n"
-#~ "\n"
-#~ "      // Package name lookup\n"
-#~ "      unsigned long HashTable[2*1024];        // Package\n"
-#~ "   };"
+# type: Content of: <refentry><refnamediv><refname>
+#~ msgid "&file-preferences;"
+#~ msgstr "&file-preferences;"
 
-# type: <tag></tag>
-#~ msgid "Signature"
-#~ msgstr "Signature"
+# type: Content of: <refentry><refsect1><title>
+#~ msgid "file"
+#~ msgstr "ファイル"
 
-# type: <tag></tag>
-#~ msgid "MajorVersion"
-#~ msgstr "MajorVersion"
+# type: Content of: <refentry><refnamediv><refname>
+#~ msgid "cdrom"
+#~ msgstr "cdrom"
 
 # type: <tag></tag>
-#~ msgid "MinorVersion"
-#~ msgstr "MinorVersion"
+#~ msgid "http"
+#~ msgstr "http"
 
 # type: <tag></tag>
-#~ msgid "Dirty"
-#~ msgstr "Dirty"
+#~ msgid "ftp"
+#~ msgstr "ftp"
 
-# type: <tag></tag>
-#~ msgid "HeaderSz"
-#~ msgstr "HeaderSz"
+#~ msgid "copy"
+#~ msgstr "copy"
 
-# type: <tag></tag>
-#~ msgid "PackageSz"
-#~ msgstr "PackageSz"
+#~ msgid "rsh"
+#~ msgstr "rsh"
 
-# type: <tag></tag>
-#~ msgid "PackageFileSz"
-#~ msgstr "PackageFileSz"
+#~ msgid "ssh"
+#~ msgstr "ssh"
 
-# type: <tag></tag>
-#~ msgid "VersionSz"
-#~ msgstr "VersionSz"
+# type: Content of: <refentry><refsect1><para>
+#~ msgid ""
+#~ "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
+#~ "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
+#~ msgstr ""
+#~ "現在認識する URI タイプは、cdrom, file, http, ftp, copy, ssh, rsh です。"
+#~ "<placeholder type=\"variablelist\" id=\"0\"/>"
 
-# type: <tag></tag>
-#~ msgid "DependencySz"
-#~ msgstr "DependencySz"
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
+#~ "get check</command>. It builds the source and package caches from the "
+#~ "sources in &sources-list; and from <filename>/var/lib/dpkg/status</"
+#~ "filename>."
+#~ msgstr ""
+#~ "<literal>gencaches</literal> は、<command>apt-get check</command> と同じ動"
+#~ "作を提供します。これは &sources-list; 内の取得元と <filename>/var/lib/"
+#~ "dpkg/status</filename>から、ソースとパッケージのキャッシュを構築します。"
 
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "VerFileSz"
-#~ msgstr "VerFileSz"
+# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "One setting is provided to control the pipeline depth in cases where the "
+#~ "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
+#~ "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
+#~ "5 indicating how many outstanding requests APT should send. A value of "
+#~ "zero MUST be specified if the remote host does not properly linger on TCP "
+#~ "connections - otherwise data corruption will occur. Hosts which require "
+#~ "this are in violation of RFC 2068."
+#~ msgstr ""
+#~ "リモートサーバが RFC 準拠でなかったり、(Squid 2.0.2 のように) バグがあった"
+#~ "りしたときのために、パイプラインの深さの制御を設定します。"
+#~ "<literal>Acquire::http::Pipeline-Depth</literal> により、APT が送信できる"
+#~ "リクエストの回数を 0 から 5 の値で設定できます。リモートサーバが適切でな"
+#~ "く、TCP 接続に時間がかかるときは、<emphasis>必ず</emphasis> 0 の値を設定し"
+#~ "なければなりません。そうでなければデータが破損してしまいます。これが必要な"
+#~ "ホストは RFC 2068 に違反しています。"
 
-# type: <tag></tag>
-#~ msgid "ProvidesSz"
-#~ msgstr "ProvidesSz"
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "Update the local keyring with the keyring of Debian archive keys and "
+#~ "removes from the keyring the archive keys which are no longer valid."
+#~ msgstr ""
+#~ "Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーを"
+#~ "キーリングから削除します。"
 
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "PackageCount"
-#~ msgstr "PackageFileCount"
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
+#~ "index files will not have MD5Sum fields where possible.  Configuration "
+#~ "Item: <literal>APT::FTPArchive::MD5</literal>"
+#~ msgstr ""
+#~ "MD5 sum を生成します。デフォルトで on になっており、off にすると生成したイ"
+#~ "ンデックスファイルに MD5Sum フィールドがありません。設定項目 - "
+#~ "<literal>APT::FTPArchive::MD5</literal>"
 
-# type: <tag></tag>
-#~ msgid "VersionCount"
-#~ msgstr "VersionCount"
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid "Show a short usage summary."
+#~ msgstr "短い使用方法を表示します。"
 
-# type: <tag></tag>
-#~ msgid "DependsCount"
-#~ msgstr "DependsCount"
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid "Show the program version."
+#~ msgstr "プログラムのバージョン情報を表示します"
 
-# type: <tag></tag>
-#~ msgid "PackageFileCount"
-#~ msgstr "PackageFileCount"
+# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#~ msgid "to the version that is already installed (if any)."
+#~ msgstr "(あるならば) 既にインストールされているバージョン。"
 
-# type: <tag></tag>
-#~ msgid "VerSysName"
-#~ msgstr "VerSysName"
+# type: Content of: <refentry><refnamediv><refpurpose>
+#~ msgid "APT package handling utility -- cache manipulator"
+#~ msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作ツール"
 
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "MaxVerFileSize"
-#~ msgstr "MaxVerFileSize"
+# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+#~ msgid "add <replaceable>file(s)</replaceable>"
+#~ msgstr "add <replaceable>file(s)</replaceable>"
 
-# type: <tag></tag>
-#~ msgid "StringList"
-#~ msgstr "StringList"
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "<literal>add</literal> adds the named package index files to the package "
+#~ "cache.  This is for debugging only."
+#~ msgstr ""
+#~ "<literal>add</literal> は、パッケージキャッシュに指定したパッケージイン"
+#~ "デックスファイルを追加します。デバッグ専用です。"
 
-# type: <tag></tag>
-#~ msgid "Pools"
-#~ msgstr "Pools"
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "The <literal>release</literal> command generates a Release file from a "
+#~ "directory tree. It recursively searches the given directory for Packages, "
+#~ "Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and "
+#~ "md5sum.txt files.  It then writes to stdout a Release file containing an "
+#~ "MD5 digest and SHA1 digest for each file."
+#~ msgstr ""
+#~ "<literal>release</literal> コマンドは、ディレクトリツリーから Release ファ"
+#~ "イルを生成します。与えられたディレクトリから、Packages, Packages.gz, "
+#~ "Packages.bz2, Sources, Sources.gz, Sources.bz2, Release, md5sum.txt といっ"
+#~ "たファイルを再帰検索します。その後、ファイルごとの MD5 ダイジェストと "
+#~ "SHA1 ダイジェストを含んだ Release ファイルを、標準出力に書き出します。"
 
-# type: <tag></tag>
-#~ msgid "HashTable"
-#~ msgstr "HashTable"
+#~ msgid "Also install recommended packages."
+#~ msgstr "「推奨」パッケージもインストールします。"
 
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "Package"
-#~ msgstr "Packages"
+#~ msgid "Do not install recommended packages."
+#~ msgstr "「推奨」パッケージをインストールしません。"
 
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Name"
-#~ msgstr "ファイル"
-
-# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#, fuzzy
-#~ msgid "Name of the package."
-#~ msgstr "パッケージ名"
-
-# type: <tag></tag>
-#~ msgid "VersionList"
-#~ msgstr "VersionList"
-
-# type: <tag></tag>
-#~ msgid "CurrentVer"
-#~ msgstr "CurrentVer"
-
-# type: Content of: <refentry><refsect1><refsect2><title>
-#, fuzzy
-#~ msgid "Section"
-#~ msgstr "Sections"
-
-# type: <tag></tag>
-#~ msgid "NextPackage"
-#~ msgstr "NextPackage"
-
-# type: <tag></tag>
-#~ msgid "RevDepends"
-#~ msgstr "RevDepends"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "ProvidesList"
-#~ msgstr "ファイル"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "SelectedState"
-#~ msgstr "DSelect での APT"
-
-# type: <tag></tag>
-#~ msgid "InstState"
-#~ msgstr "InstState"
-
-# type: <tag></tag>
-#~ msgid "CurrentState"
-#~ msgstr "CurrentState"
-
-# type: <tag></tag>
-#~ msgid "ID"
-#~ msgstr "ID"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Flags"
-#~ msgstr "ファイル"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "PackageFile"
-#~ msgstr "PackageFileSz"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "FileName"
-#~ msgstr "ファイル"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "Archive"
-#~ msgstr "ArchiveDir"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Component"
-#~ msgstr "コメント"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Version"
-#~ msgstr "オプション"
-
-# type: <tag></tag>
-#~ msgid "Origin"
-#~ msgstr "Origin"
-
-# type: <tag></tag>
-#~ msgid "Label"
-#~ msgstr "Label"
-
-# type: <tag></tag>
-#~ msgid "NotAutomatic"
-#~ msgstr "NotAutomatic"
-
-# type: <tag></tag>
-#~ msgid "Site"
-#~ msgstr "Site"
-
-# type: <tag></tag>
-#~ msgid "IndexType"
-#~ msgstr "IndexType"
-
-# type: <tag></tag>
-#~ msgid "Size"
-#~ msgstr "Size"
-
-# type: <tag></tag>
-#~ msgid "mtime"
-#~ msgstr "mtime"
-
-# type: <tag></tag>
-#~ msgid "VerStr"
-#~ msgstr "VerStr"
-
-# type: <tag></tag>
-#~ msgid "Arch"
-#~ msgstr "Arch"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "NextVer"
-#~ msgstr "ファイル"
-
-# type: <tag></tag>
-#~ msgid "DependsList"
-#~ msgstr "DependsList"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "ParentPkg"
-#~ msgstr "ParentVer"
-
-# type: <tag></tag>
-#~ msgid "InstalledSize"
-#~ msgstr "InstalledSize"
-
-# type: <tag></tag>
-#~ msgid "Hash"
-#~ msgstr "Hash"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "Priority"
-#~ msgstr "priority 100"
-
-# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#, fuzzy
-#~ msgid "This is the parsed priority value of the package."
-#~ msgstr "ファイル一覧ファイルを指定します。"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "Dependency"
-#~ msgstr "DependencySz"
-
-# type: <tag></tag>
-#~ msgid "NextDepends"
-#~ msgstr "NextDepends"
-
-# type: <tag></tag>
-#~ msgid "NextRevDepends"
-#~ msgstr "NextRevDepends"
-
-# type: <tag></tag>
-#~ msgid "ParentVer"
-#~ msgstr "ParentVer"
-
-# type: <tag></tag>
-#~ msgid "Type"
-#~ msgstr "Type"
-
-# type: <tag></tag>
-#~ msgid "CompareOp"
-#~ msgstr "CompareOp"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "Provides"
-#~ msgstr "ProvidesSz"
-
-# type: <tag></tag>
-#~ msgid "ProvideVersion"
-#~ msgstr "ProvideVersion"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "NextProvides"
-#~ msgstr "ファイル"
-
-# type: <tag></tag>
-#~ msgid "NextPkgProv"
-#~ msgstr "NextPkgProv"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "VerFile"
-#~ msgstr "ファイル"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "File"
-#~ msgstr "ファイル"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "NextFile"
-#~ msgstr "ファイル"
-
-# type: <tag></tag>
-#~ msgid "Offset"
-#~ msgstr "Offset"
-
-# type: Content of: <refentry><refsect1><refsect2><title>
-#, fuzzy
-#~ msgid "StringItem"
-#~ msgstr "安定版の追跡"
-
-# type: Content of: <refentry><refsect1><refsect2><title>
-#, fuzzy
-#~ msgid "String"
-#~ msgstr "安定版の追跡"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "NextItem"
-#~ msgstr "ファイル"
-
-# type: Content of: <refentry><refsect1><refsect2><title>
-#, fuzzy
-#~ msgid "StringTable"
-#~ msgstr "安定版の追跡"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Defines"
-#~ msgstr "finger"
-
-# type: Content of: <refentry><refsect1><refsect2><title>
-#, fuzzy
-#~ msgid "Future Directions"
-#~ msgstr "Dir セクション"
-
-# type: <author></author>
-#, fuzzy
-#~ msgid "<name>Manoj Srivastava</name><email>srivasta@debian.org</email>"
-#~ msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Procedural description"
-#~ msgstr "説明"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Set Options"
-#~ msgstr "オプション"
-
-#, fuzzy
-#~ msgid "Updates"
-#~ msgstr "update"
-
-# type: Content of: <refentry><refsect1><refsect2><title>
-#, fuzzy
-#~ msgid "Selection"
-#~ msgstr "Dir セクション"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Action"
-#~ msgstr "オプション"
-
-# type: Content of: <refentry><refnamediv><refpurpose>
-#, fuzzy
-#~ msgid "Modules and interfaces"
-#~ msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作"
-
-# type: <tag></tag>
-#~ msgid "pdate Module"
-#~ msgstr "pdate モジュール"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "FTP methods"
-#~ msgstr "メソッド"
-
-# type: <tag></tag>
-#~ msgid "Dependency module"
-#~ msgstr "依存関係モジュール"
-
-#, fuzzy
-#~ msgid "Event generator"
-#~ msgstr "generate"
-
-# type: <author></author>
-#, fuzzy
-#~ msgid "<name>Tom Lees </name><email>tom@lpsg.demon.co.uk</email>"
-#~ msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-
-# type: <copyrightsummary></copyrightsummary>
-#, fuzzy
-#~ msgid "Copyright &copy; Tom Lees, 1997."
-#~ msgstr "Copyright &copy; Jason Gunthorpe, 1999."
-
-# type: Content of: <refentry><refsect1><para>
-#, fuzzy
-#~ msgid "The exact format for the \"Status:\" field is:"
-#~ msgstr "メンテナフィールドは一般的には、"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "not-installed"
-#~ msgstr "Clean-Installed"
-
-# type: <tag></tag>
-#~ msgid "unpacked"
-#~ msgstr "展開済み"
-
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "half-configured"
-#~ msgstr "half-configured"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "installed"
-#~ msgstr "install"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "half-installed"
-#~ msgstr "Clean-Installed"
-
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "config-files"
-#~ msgstr "config-files"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "post-inst-failed"
-#~ msgstr "オプション"
-
-#, fuzzy
-#~ msgid "removal-failed"
-#~ msgstr "remove"
-
-# type: Content of: <refentry><refnamediv><refpurpose>
-#, fuzzy
-#~ msgid "\"Documented\" command-line interfaces"
-#~ msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作"
-
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "ldconfig"
-#~ msgstr "ldconfig"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "install-info"
-#~ msgstr "install"
-
-#, fuzzy
-#~ msgid "update-rc.d"
-#~ msgstr "update"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Assertions"
-#~ msgstr "オプション"
-
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "APT Files"
-#~ msgstr "APT ファイル"
-
-# type: <copyrightsummary></copyrightsummary>
-#, fuzzy
-#~ msgid "Copyright &copy; Jason Gunthorpe, 1998-1999."
-#~ msgstr "Copyright &copy; Jason Gunthorpe, 1997-1998."
-
-#, fuzzy
-#~ msgid ""
-#~ "deb <var>uri</var> <var>distribution</var> <var>component</var> "
-#~ "[<var>component</var> ...]"
-#~ msgstr "deb uri distribution [component1] [component2] [...]"
-
-# type: <example></example>
-#, fuzzy
-#~ msgid "   http://www.debian.org/archive"
-#~ msgstr "deb http://archive.debian.org/debian-archive hamm main"
-
-# type: <example></example>
-#, fuzzy
-#~ msgid "   ftp://ftp.debian.org/debian"
-#~ msgstr "deb ftp://ftp.debian.org/debian stable contrib"
-
-# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#, fuzzy
 #~ msgid ""
-#~ "The file scheme allows an arbitrary directory in the file system to be "
-#~ "considered as a debian archive. This is useful for NFS mounts and local "
-#~ "mirrors/archives."
+#~ "While it is possible to add an empty compression type to the order list, "
+#~ "but APT in its current version doesn't understand it correctly and will "
+#~ "display many warnings about not downloaded files - these warnings are "
+#~ "most of the time false negatives. Future versions will maybe include a "
+#~ "way to really prefer uncompressed files to support the usage of local "
+#~ "mirrors."
 #~ msgstr ""
-#~ "file スキームは、システム内の任意のディレクトリを、アーカイブとして扱える"
-#~ "ようにします。これは NFS マウントやローカルミラーで便利です。"
-
-# type: <example></example>
-#~ msgid "   file:/var/debian"
-#~ msgstr "   file:/var/debian"
-
-# type: <tag></tag>
-#~ msgid "smb"
-#~ msgstr "smb"
-
-# type: <tag></tag>
-#~ msgid "X-Auto"
-#~ msgstr "X-Auto"
-
-# type: <tag></tag>
-#~ msgid "X-TargetDist"
-#~ msgstr "X-TargetDist"
-
-# type: <tag></tag>
-#~ msgid "X-TargetVersion"
-#~ msgstr "X-TargetVersion"
-
-# type: <tag></tag>
-#~ msgid "Archive-[access]"
-#~ msgstr "Archive-[access]"
-
-# type: <tag></tag>
-#~ msgid "WWW-[access]"
-#~ msgstr "WWW-[access]"
-
-# type: <tag></tag>
-#~ msgid "CDImage-[access]"
-#~ msgstr "CDImage-[access]"
-
-# type: <tag></tag>
-#~ msgid "Incoming-[access]"
-#~ msgstr "Incoming-[access]"
-
-# type: <tag></tag>
-#~ msgid "nonUS-[access]"
-#~ msgstr "nonUS-[access]"
+#~ "順序リストに空の圧縮タイプを追加できますが、最新版の APT では正しく解釈で"
+#~ "きず、ファイルをダウンロードできないと言う警告を大量に表示することになりま"
+#~ "す (この警告はたいてい見逃してしまいます)。将来のバージョンでは、ローカル"
+#~ "ミラーの利用をサポートするため、非圧縮ファイルを使用する方法が追加されるか"
+#~ "もしれません。"
 
 # type: Content of: <refentry><refsect1><para>
-#~ msgid "This is the email address of the maintainer of the mirror."
-#~ msgstr "ミラーサイトの管理者のメールアドレスです。"
-
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "Location"
-#~ msgstr "場所"
-
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "Comment"
-#~ msgstr "コメント"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "The Release File"
-#~ msgstr "ソースオーバーライドファイル"
-
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "Global configuration"
-#~ msgstr "共通設定"
-
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "archive file"
-#~ msgstr "sources.list"
-
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "source file"
-#~ msgstr "sources.list"
-
-# type: <tag></tag>
-#~ msgid "URI"
-#~ msgstr "URI"
-
-# type: <tag></tag>
-#~ msgid "method"
-#~ msgstr "メソッド"
-
-# type: <tag></tag>
-#~ msgid "method instance"
-#~ msgstr "メソッドインスタンス"
-
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "Specification"
-#~ msgstr "仕様"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#, fuzzy
-#~ msgid "601 Configuration - Sends the configuration space"
-#~ msgstr "設定箇所の内容を表示するだけです。"
-
-# type: <heading></heading>
-#, fuzzy
-#~ msgid "Header Fields"
-#~ msgstr "ヘッダ"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Filename"
-#~ msgstr "ファイル"
-
-# type: <tag></tag>
-#~ msgid "IMS-Hit"
-#~ msgstr "IMS-Hit"
-
-# type: <tag></tag>
-#~ msgid "MD5-Hash"
-#~ msgstr "MD5-Hash"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Fail"
-#~ msgstr "ファイル"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Operation failed"
-#~ msgstr "オプション"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "Single-Instance"
-#~ msgstr "Clean-Installed"
+#~ msgid ""
+#~ "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
+#~ "US directory."
+#~ msgstr ""
+#~ "nonus.debian.org のアーカイブに HTTP アクセスし、debian-non-US ディレクト"
+#~ "リ以下を使用します。"
 
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Local"
+# type: SH
+#~ msgid "OPTIONS"
 #~ msgstr "オプション"
 
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "Send-Config"
-#~ msgstr "ldconfig"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Send configuration to the method."
-#~ msgstr "ユーザの設定"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Version string for the method"
-#~ msgstr "ユーザの設定"
+# type: Plain text
+#~ msgid "None."
+#~ msgstr "なし。"
 
-#, fuzzy
-#~ msgid "Notes"
-#~ msgstr "contents"
+# type: SH
+#~ msgid "FILES"
+#~ msgstr "ファイル"
 
-#~ msgid "<literal>Debug::Vendor</literal>"
-#~ msgstr "<literal>Debug::Vendor</literal>"
+#~ msgid "<!ENTITY translation-title \"TRANSLATION\">"
+#~ msgstr "<!ENTITY translation-title \"訳者\">"