Reword: "So, <literal>dist-upgrade</literal> command may remove some packages."

[apt.git] / doc / po / ja.po

diff --git a/doc/po/ja.po b/doc/po/ja.po
index b79809055e9a9e215d1eeba70e01128d866d1312..60edbbad62cc3259c1b33f935d5b763b570bf62b 100644 (file)
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"

-"POT-Creation-Date: 2011-11-20 17:58+0100\n"
+"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+"POT-Creation-Date: 2012-05-29 15:35+0300\n"

 "PO-Revision-Date: 2010-09-07 07:38+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
 "PO-Revision-Date: 2010-09-07 07:38+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"


@@ -32,8 +33,8 @@ msgstr "16 June 1998"
 #. type: TH
 #: apt.8:17
 #, no-wrap
 #. type: TH
 #: apt.8:17
 #, no-wrap

-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "Debian"
+msgstr "Debian"

 
 # type: SH
 #. type: SH
 
 # type: SH
 #. type: SH


@@ -152,44 +153,7 @@ msgstr ""
 "apt は APT チーム E<lt>apt@packages.debian.orgE<gt> によって書かれました。"
 
 #. type: Plain text
 "apt は APT チーム 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:16
-#, no-wrap
-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"
-" </refentryinfo>\n"
-"\">\n"
-msgstr ""
-"<!-- 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"
-" </refentryinfo>\n"
-"\">\n"
-
-#. type: Plain text
-#: apt.ent:23
+#: apt.ent:7

 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"


@@ -207,7 +171,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

-#: apt.ent:29
+#: apt.ent:13

 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"


@@ -223,7 +187,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

-#: apt.ent:40
+#: apt.ent:24

 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"


@@ -249,7 +213,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

-#: apt.ent:48
+#: apt.ent:32

 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"


@@ -269,7 +233,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

-#: apt.ent:58
+#: apt.ent:42

 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"


@@ -293,7 +257,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
 "     </varlistentry>\n"
 
 #. type: Plain text

-#: apt.ent:66
+#: apt.ent:50

 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"


@@ -313,7 +277,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
 "     </varlistentry>\n"
 
 #. type: Plain text

-#: apt.ent:78
+#: apt.ent:62

 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"


@@ -340,7 +304,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
 "     </varlistentry>\n"
 
 #. type: Plain text

-#: apt.ent:90
+#: apt.ent:74

 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"


@@ -368,7 +332,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

-#: apt.ent:101
+#: apt.ent:85

 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"


@@ -395,7 +359,7 @@ msgstr ""
 "\n"
 
 #. type: Plain text
 "\n"
 
 #. type: Plain text

-#: apt.ent:107
+#: apt.ent:91

 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"


@@ -411,7 +375,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
 "     </varlistentry>\n"
 
 #. type: Plain text

-#: apt.ent:113
+#: apt.ent:97

 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"


@@ -427,7 +391,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

-#: apt.ent:119
+#: apt.ent:103

 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"


@@ -444,12 +408,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text

-#: apt.ent:125
-#, no-wrap
+#: apt.ent:109
+#, fuzzy, no-wrap
+#| 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"
 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>\n"
 "\">\n"
 msgstr ""


@@ -461,7 +431,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text

-#: apt.ent:135
+#: apt.ent:119

 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"


@@ -484,7 +454,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
 "     </varlistentry>\n"
 
 #. type: Plain text

-#: apt.ent:141
+#: apt.ent:125

 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"


@@ -500,7 +470,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

-#: apt.ent:147
+#: apt.ent:131

 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"


@@ -516,7 +486,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
 "     </varlistentry>\n"
 
 #. type: Plain text

-#: apt.ent:153
+#: apt.ent:137

 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"


@@ -533,7 +503,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text

-#: apt.ent:160
+#: apt.ent:144

 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"


@@ -551,12 +521,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text

-#: apt.ent:166
-#, no-wrap
+#: apt.ent:150
+#, fuzzy, no-wrap
+#| 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"
 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 ""
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""


@@ -568,7 +544,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text

-#: apt.ent:172
+#: apt.ent:156

 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"


@@ -585,7 +561,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text

-#: apt.ent:179
+#: apt.ent:163

 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"


@@ -602,7 +578,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

-#: apt.ent:187
+#: apt.ent:171

 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"


@@ -622,7 +598,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

-#: apt.ent:191
+#: apt.ent:175

 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"


@@ -634,7 +610,7 @@ msgstr ""
 "<!ENTITY translation-title \"翻訳\">\n"
 
 #. type: Plain text
 "<!ENTITY translation-title \"翻訳\">\n"
 
 #. type: Plain text

-#: apt.ent:200
+#: apt.ent:184

 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"


@@ -655,7 +631,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

-#: apt.ent:210
+#: apt.ent:195

 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"


@@ -680,37 +656,133 @@ msgstr ""
 "     内容を失わないようにこのようにしています。\n"
 "\">\n"
 
 "     内容を失わないようにこのようにしています。\n"
 "\">\n"
 

-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-cache.8.xml:16
-#, fuzzy
-#| msgid ""
-#| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#| "<date>14 February 2004</date>"
+#. type: Plain text
+#: apt.ent:198

 msgid ""
 msgid ""

-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
-"February 2011</date>"
+"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"

 msgstr ""
 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-cache.8.xml:25 apt-cache.8.xml:32
-msgid "apt-cache"
-msgstr "apt-cache"
+#. 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:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26

-#: apt-key.8.xml:18 apt-mark.8.xml:26 apt-secure.8.xml:18
+#: 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: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
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
 #: 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:19 apt-mark.8.xml:27 apt-secure.8.xml:19
-#: apt-sortpkgs.1.xml:27 apt.conf.5.xml:33 apt_preferences.5.xml:26
+#: 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 "APT"
 #: sources.list.5.xml:27
 msgid "APT"
 msgstr "APT"


@@ -720,87 +792,19 @@ msgstr "APT"
 msgid "query the APT cache"
 msgstr ""
 
 msgid "query the APT cache"
 msgstr ""
 

-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:39
-#, fuzzy
-#| 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>"
-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>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>"
-

 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
-#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+#: 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>
 #: sources.list.5.xml:36
 msgid "Description"
 msgstr "説明"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cache.8.xml:65
+#: 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 "
 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 "


@@ -814,7 +818,8 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cache.8.xml:70 apt-get.8.xml:127
+#: 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."
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."


@@ -822,32 +827,23 @@ msgstr ""
 "<option>-h</option> オプションや <option>--help</option> オプションを除き、以"
 "下に挙げるコマンドが必要です。"
 
 "<option>-h</option> オプションや <option>--help</option> オプションを除き、以"
 "下に挙げるコマンドが必要です。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:74
-msgid "gencaches"
-msgstr "gencaches"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:75
+#: apt-cache.8.xml:49

 msgid ""
 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>."
+"<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 ""
 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:81
-msgid "showpkg <replaceable>pkg(s)</replaceable>"
-msgstr "showpkg <replaceable>pkg(s)</replaceable>"
+#. 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 ""

 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:82
+#: 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 "
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "


@@ -870,7 +866,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>

-#: apt-cache.8.xml:94
+#: apt-cache.8.xml:66

 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"


@@ -898,7 +894,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:106
+#: 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, "
 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, "


@@ -916,14 +912,9 @@ msgstr ""
 "altdev はインストールする必要はありません。出力の残りの部分の意味については、"
 "apt のソースコードを調べるのが最良でしょう。"
 
 "altdev はインストールする必要はありません。出力の残りの部分の意味については、"
 "apt のソースコードを調べるのが最良でしょう。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:115
-msgid "stats"
-msgstr "stats"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:87

 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"


@@ -933,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>
 
 # 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:118
+#: apt-cache.8.xml:90

 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."


@@ -943,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>
 
 # 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:122
+#: 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 "
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "


@@ -956,53 +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>
 
 # 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:128
+#: 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, "
 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>は、仮想パッケージ名としてのみ存在する"
 "パッケージ (仮想パッケージ名のみを「提供」し、実際にはいかなるパッケージもそ"
 msgstr ""
 "<literal>純粋仮想パッケージ</literal>は、仮想パッケージ名としてのみ存在する"
 "パッケージ (仮想パッケージ名のみを「提供」し、実際にはいかなるパッケージもそ"

-"の名称を持たない) の数を表します。例えば、Debian GNU/Linux システムでは "
-"\"mail-transport-agent\" は純粋仮想パッケージです。\"mail-transport-agent\" "
-"ã\82\92æ\8f\90ä¾\9bã\81\99ã\82\8bã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81¯ã\81\84ã\81\8fã\81¤ã\82\82ã\81\82ã\82\8aã\81¾ã\81\99ã\81\8cã\80\81\"mail-transport-agent\" ã\81¨ã\81\84ã\81\86å\90\8d称"
-"ã\81®ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81¯ã\81\82ã\82\8aã\81¾ã\81\9bã\82\93ã\80\82"
+"の名称を持たない) の数を表します。例えば、Debian システムでは \"mail-"
+"transport-agent\" は純粋仮想パッケージです。\"mail-transport-agent\" を提供す"
+"ã\82\8bã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81¯ã\81\84ã\81\8fã\81¤ã\82\82ã\81\82ã\82\8aã\81¾ã\81\99ã\81\8cã\80\81\"mail-transport-agent\" ã\81¨ã\81\84ã\81\86å\90\8d称ã\81®ã\83\91ã\83\83"
+"ケージはありません。"

 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 
 # 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:136
+#: 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 "
 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>は、特定の仮想パッケージ名を提供するパッ"
 msgstr ""
 "<literal>単一仮想パッケージ</literal>は、特定の仮想パッケージ名を提供するパッ"

-"ケージが、ただ一つの場合の数を表します。例えば、Debian GNU/Linux システムで"
-"は、\"X11-text-viewer\" は仮想パッケージですが、\"X11-text-viewer\" を提供す"
-"ã\82\8bã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81¯ã\80\81xless ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81®ã\81¿ã\81¨ã\81\84ã\81\86ã\81\93ã\81¨ã\81§ã\81\99ã\80\82"
+"ケージが、ただ一つの場合の数を表します。例えば、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>
 
 # 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:142
+#: 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 "
 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>は、その仮想パッケージ名を提供するパッ"
 "ケージが複数あるか、またパッケージ名と同じ仮想パッケージ名を持つパッケージ数"
 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>
 
 # 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:149
+#: 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 "
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "


@@ -1018,13 +1009,20 @@ 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>
 
 # 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:156
+#: 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 "
 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>は、キャッシュに存在するパッケージのバー"
 "ジョンの数を表します。そのため、この値は最小でもパッケージ名総数と一致しま"
 msgstr ""
 "<literal>個別バージョン総数</literal>は、キャッシュに存在するパッケージのバー"
 "ジョンの数を表します。そのため、この値は最小でもパッケージ名総数と一致しま"


@@ -1033,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>
 
 # 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:163
+#: 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."
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."


@@ -1041,32 +1039,26 @@ msgstr ""
 "<literal>依存関係総数</literal>は、キャッシュにあるすべてのパッケージで要求さ"
 "れた依存関係の数です。"
 
 "<literal>依存関係総数</literal>は、キャッシュにあるすべてのパッケージで要求さ"
 "れた依存関係の数です。"
 

-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:170
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:171
+#: 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 "
 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> は、指定したパッケージ名に一致するソースパッケージ"
 "を、すべて表示します。バイナリになるときの名称を宣言したレコードと同様に、す"
 "べてのバージョンについて表示します。"
 
 msgstr ""
 "<literal>showsrc</literal> は、指定したパッケージ名に一致するソースパッケージ"
 "を、すべて表示します。バイナリになるときの名称を宣言したレコードと同様に、す"
 "べてのバージョンについて表示します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:176 apt-config.8.xml:87
-msgid "dump"
-msgstr "dump"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:149

 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."


@@ -1074,14 +1066,9 @@ msgstr ""
 "<literal>dump</literal> は、キャッシュ内のパッケージそれぞれについて、短い一"
 "覧を表示します。主にデバッグ用です。"
 
 "<literal>dump</literal> は、キャッシュ内のパッケージそれぞれについて、短い一"
 "覧を表示します。主にデバッグ用です。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:181
-msgid "dumpavail"
-msgstr "dumpavail"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:182
+#: 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."
 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."


@@ -1089,14 +1076,9 @@ msgstr ""
 "<literal>dumpavail</literal> は、標準出力に利用可能なものの一覧を出力しま"
 "す。 &dpkg; と共に使用すると便利ですし、&dselect; でも使用されます。"
 
 "<literal>dumpavail</literal> は、標準出力に利用可能なものの一覧を出力しま"
 "す。 &dpkg; と共に使用すると便利ですし、&dselect; でも使用されます。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:186
-msgid "unmet"
-msgstr "unmet"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:159

 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."


@@ -1104,15 +1086,9 @@ msgstr ""
 "<literal>unmet</literal> は、パッケージキャッシュ内にある、不適当な依存関係の"
 "概要を表示します。"
 
 "<literal>unmet</literal> は、パッケージキャッシュ内にある、不適当な依存関係の"
 "概要を表示します。"
 

-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:192
+#: 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."
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."


@@ -1120,25 +1096,35 @@ msgstr ""
 "<literal>show</literal> は、<command>dpkg --print-avail</command> と同様の機"
 "能を実行します。これは、指定したパッケージのパッケージレコードの表示です。"
 
 "<literal>show</literal> は、<command>dpkg --print-avail</command> と同様の機"
 "能を実行します。これは、指定したパッケージのパッケージレコードの表示です。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
-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>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:198
+#: 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 "
 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> "
 msgstr ""
 "<literal>search</literal> は、与えられた POSIX の正規表現 "
 "(<citerefentry><refentrytitle><command>regex</command></refentrytitle> "


@@ -1152,21 +1138,15 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:211
+#: apt-cache.8.xml:181

 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgstr "空白で区切った引数で、複数の検索パターンの and をとることができます。"
 
 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:215
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:216
+#: 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."
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."


@@ -1174,15 +1154,9 @@ msgstr ""
 "<literal>depends</literal> は、パッケージが持っている依存関係と、その依存関係"
 "を満たす他のパッケージの一覧を表示します。"
 
 "<literal>depends</literal> は、パッケージが持っている依存関係と、その依存関係"
 "を満たす他のパッケージの一覧を表示します。"
 

-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:220
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:191

 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."


@@ -1191,13 +1165,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:225
-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>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:226
+#: 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 "
 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 "


@@ -1211,7 +1185,7 @@ msgstr ""
 "generate</option> オプションと共に使用すると非常に便利です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "generate</option> オプションと共に使用すると非常に便利です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:231
+#: 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 "
 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 "


@@ -1221,15 +1195,9 @@ msgstr ""
 "ル済みである必要がないことに注意してください。つまり、仮想パッケージも生成し"
 "た一覧にあります。"
 
 "ル済みである必要がないことに注意してください。つまり、仮想パッケージも生成し"
 "た一覧にあります。"
 

-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:236
-msgid "dotty <replaceable>pkg(s)</replaceable>"
-msgstr "dotty <replaceable>pkg(s)</replaceable>"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:237
+#: 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."
 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."


@@ -1249,12 +1217,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:246
+#: 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, "
 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 ""
 "結果のノードは数種の形状をとります。通常パッケージは四角、純粋仮想パッケージ"
 "は三角、複合仮想パッケージは菱形、六角形は欠落パッケージをそれぞれ表します。"
 msgstr ""
 "結果のノードは数種の形状をとります。通常パッケージは四角、純粋仮想パッケージ"
 "は三角、複合仮想パッケージは菱形、六角形は欠落パッケージをそれぞれ表します。"


@@ -1263,18 +1237,12 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:251
+#: apt-cache.8.xml:221

 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr "注意) dotty は、パッケージのより大きなセットのグラフは描けません。"
 
 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:254
-msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgstr "xvcg <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:255
+#: 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>."
 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>."


@@ -1284,13 +1252,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:259
-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>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:260
+#: 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 "
 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 "


@@ -1301,15 +1269,9 @@ msgstr ""
 "します。引数を指定しなかった場合、取得元ごとの優先順位を表示します。一方、"
 "パッケージ名を指定した場合、優先順の詳細情報を表示します。"
 
 "します。引数を指定しなかった場合、取得元ごとの優先順位を表示します。一方、"
 "パッケージ名を指定した場合、優先順の詳細情報を表示します。"
 

-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:266
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:267
+#: 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 "
 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 "


@@ -1327,26 +1289,16 @@ msgstr ""
 "表示するだけです。"
 
 # type: Content of: <refentry><refsect1><title>
 "表示するだけです。"
 
 # type: Content of: <refentry><refsect1><title>

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
+#. 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 "オプション"
 
 msgid "options"
 msgstr "オプション"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
-msgid "<option>-p</option>"
-msgstr "<option>-p</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:283
+#: 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::"
 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::"


@@ -1356,20 +1308,9 @@ msgstr ""
 "すべての操作で使用される一次キャッシュです。設定項目 - <literal>Dir::Cache::"
 "pkgcache</literal>"
 
 "すべての操作で使用される一次キャッシュです。設定項目 - <literal>Dir::Cache::"
 "pkgcache</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
-#: apt-sortpkgs.1.xml:61
-msgid "<option>-s</option>"
-msgstr "<option>-s</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:289
+#: 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 "
 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 "


@@ -1383,19 +1324,9 @@ msgstr ""
 "シュは、全パッケージファイルを再解析を避ける上で便利です。設定項目 - "
 "<literal>Dir::Cache::srcpkgcache</literal>"
 
 "シュは、全パッケージファイルを再解析を避ける上で便利です。設定項目 - "
 "<literal>Dir::Cache::srcpkgcache</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
-msgid "<option>-q</option>"
-msgstr "<option>-q</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:297
+#: 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 "
 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 "


@@ -1407,71 +1338,21 @@ msgstr ""
 "レベルを指定して、設定ファイルを上書きすることもできます。設定項目 - "
 "<literal>quiet</literal>"
 
 "レベルを指定して、設定ファイルを上書きすることもできます。設定項目 - "
 "<literal>quiet</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
-msgid "<option>-i</option>"
-msgstr "<option>-i</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:304
+#: apt-cache.8.xml:274

 msgid ""
 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 ""
 msgstr ""

-"「重要」依存関係のみ表示 - unmet や depends と共に使用します。これは「依存」"
-"関係と「先行依存」関係のみを表示するためです。設定項目 - <literal>APT::"
-"Cache::Important</literal>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>--no-pre-depends</option>"
-msgstr "<option>--no-pre-depends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:310
-msgid "<option>--no-depends</option>"
-msgstr "<option>--no-depends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:311
-msgid "<option>--no-recommends</option>"
-msgstr "<option>--no-recommends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
-msgid "<option>--no-suggests</option>"
-msgstr "<option>--no-suggests</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313
-msgid "<option>--no-conflicts</option>"
-msgstr "<option>--no-conflicts</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314
-msgid "<option>--no-breaks</option>"
-msgstr "<option>--no-breaks</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
-msgid "<option>--no-replaces</option>"
-msgstr "<option>--no-replaces</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:316
-msgid "<option>--no-enhances</option>"
-msgstr "<option>--no-enhances</option>"
+"「重要」依存関係のみ表示 - <literal>unmet</literal> や <literal>depends</"
+"literal> と共に使用します。これは「依存」関係と「先行依存」関係のみを表示する"
+"ためです。設定項目 - <literal>APT::Cache::Important</literal>"

 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:288

 #, fuzzy
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 #, fuzzy
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "


@@ -1484,19 +1365,9 @@ msgstr ""
 "ケージを再帰的に一度に表示します。設定項目 - <literal>APT::Cache::"
 "RecurseDepends</literal>"
 
 "ケージを再帰的に一度に表示します。設定項目 - <literal>APT::Cache::"
 "RecurseDepends</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
-msgid "<option>-f</option>"
-msgstr "<option>-f</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:324
+#: apt-cache.8.xml:295

 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."


@@ -1504,24 +1375,13 @@ msgstr ""
 "search 時に全パッケージレコードを表示します。設定項目 - <literal>APT::Cache::"
 "ShowFull</literal>"
 
 "search 時に全パッケージレコードを表示します。設定項目 - <literal>APT::Cache::"
 "ShowFull</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
-#: apt-get.8.xml:447
-msgid "<option>-a</option>"
-msgstr "<option>-a</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:329
+#: 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-"
 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>."
 "(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>."


@@ -1532,19 +1392,9 @@ msgstr ""
 "の際に選択されるもの) だけ表示します。このオプションは、show コマンドでのみ適"
 "用できます。設定項目 - <literal>APT::Cache::AllVersions</literal>"
 
 "の際に選択されるもの) だけ表示します。このオプションは、show コマンドでのみ適"
 "用できます。設定項目 - <literal>APT::Cache::AllVersions</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
-msgid "<option>-g</option>"
-msgstr "<option>-g</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
-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>
 # 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: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</"
 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</"


@@ -1555,19 +1405,9 @@ msgstr ""
 "option> を使用してください。設定項目 - <literal>APT::Cache::Generate</"
 "literal>"
 
 "option> を使用してください。設定項目 - <literal>APT::Cache::Generate</"
 "literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
-msgid "<option>--names-only</option>"
-msgstr "<option>--names-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343 apt-cdrom.8.xml:142
-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>
 # 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:315

 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."


@@ -1575,14 +1415,9 @@ msgstr ""
 "説明文ではなく、パッケージ名からのみ検索します。設定項目 - <literal>APT::"
 "Cache::NamesOnly</literal>"
 
 "説明文ではなく、パッケージ名からのみ検索します。設定項目 - <literal>APT::"
 "Cache::NamesOnly</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:348
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:320

 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"


@@ -1591,14 +1426,9 @@ msgstr ""
 "<literal>pkgnames</literal> で、仮想パッケージや欠落依存関係を含めた全名称を"
 "表示します。設定項目 - <literal>APT::Cache::AllNames</literal>"
 
 "<literal>pkgnames</literal> で、仮想パッケージや欠落依存関係を含めた全名称を"
 "表示します。設定項目 - <literal>APT::Cache::AllNames</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:354
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:355
+#: 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: "
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "


@@ -1608,14 +1438,9 @@ msgstr ""
 "ケージを再帰的に一度に表示します。設定項目 - <literal>APT::Cache::"
 "RecurseDepends</literal>"
 
 "ケージを再帰的に一度に表示します。設定項目 - <literal>APT::Cache::"
 "RecurseDepends</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:360
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:362
+#: 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: "
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "


@@ -1625,53 +1450,40 @@ msgstr ""
 "ストールされているパッケージに限定します。設定項目 - <literal>APT::Cache::"
 "Installed</literal>"
 
 "ストールされているパッケージに限定します。設定項目 - <literal>APT::Cache::"
 "Installed</literal>"
 

-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
-msgid "&apt-commonoptions;"
-msgstr "&apt-commonoptions;"
-

 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144
-#: apt.conf.5.xml:1110 apt_preferences.5.xml:697
+#: 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 "ファイル"
 
 msgid "Files"
 msgstr "ファイル"
 

-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:374
-msgid "&file-sourceslist; &file-statelists;"
-msgstr "&file-sourceslist; &file-statelists;"
-

 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606
-#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
-#: sources.list.5.xml:250
+#: 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>
 msgid "See Also"
 msgstr "関連項目"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cache.8.xml:380
+#: 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>
 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:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: 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>
 msgid "Diagnostics"
 msgstr "診断メッセージ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cache.8.xml:385
+#: apt-cache.8.xml:356

 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."


@@ -1679,108 +1491,68 @@ msgstr ""
 "<command>apt-cache</command> は正常終了時に 0 を返します。エラー時には十進の "
 "100 を返します。"
 
 "<command>apt-cache</command> は正常終了時に 0 を返します。エラー時には十進の "
 "100 を返します。"
 

-#. type: Content of: <refentry><refentryinfo>
-#: apt-cdrom.8.xml:16
-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:24 apt-cdrom.8.xml:31
-msgid "apt-cdrom"
-msgstr "apt-cdrom"
-

 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-cdrom.8.xml:32
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-cdrom.8.xml:32

-msgid "APT CDROM management utility"
-msgstr "APT CDROM 管理ユーティリティ"
-
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:38
-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>"
+msgid "APT CD-ROM management utility"
+msgstr "APT CD-ROM 管理ユーティリティ"

 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cdrom.8.xml:51
+#: apt-cdrom.8.xml:38

 msgid ""
 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 のリストに新しい "
 "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>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:45

 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 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 枚づつ、焼き損じを"
 "補正できるか評価しなければなりません。"
 
 "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:68
-msgid "add"
-msgstr "add"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:69
+#. 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 "
 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 proceed "
+"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 "
 "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 ""
 "title."
 msgstr ""

-"<literal>add</literal> は、新しいディスクを取得元リストに追加します。CDROM デ"
-"バイスのアンマウント、ディスク挿入のプロンプト表示の後に、ディスクのスキャン"
-"とインデックスファイルのコピーを行います。ディスクに正しい <filename>disk</"
-"filename> ディレクトリが存在しない場合、タイトルを入力するよう促します。"
+"<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>

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:77
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:64

 msgid ""
 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 ""
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
 "filename>"
 msgstr ""

-"APT は、現在ドライブにあるディスクのトラックから取得した、CDROM ID を使用しま"
-"す。またその ID を、<filename>&statedir;/cdroms.list</filename> 内のデータ"
+"APT は、現在ドライブにあるディスクのトラックから取得した、CD-ROM ID を使用し"
+"ã\81¾ã\81\99ã\80\82ã\81¾ã\81\9fã\81\9dã\81® ID ã\82\92ã\80\81<filename>&statedir;/cdroms.list</filename> å\86\85ã\81®ã\83\87ã\83¼ã\82¿"

 "ベースで管理します。"
 
 "ベースで管理します。"
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:84
-msgid "ident"
-msgstr "ident"
-

 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:85
+#. 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"
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"


@@ -1788,38 +1560,17 @@ msgstr ""
 "格納されているファイル名と現在のディスクが同一かどうかをレポートする、デバッ"
 "グツールです。"
 
 "格納されているファイル名と現在のディスクが同一かどうかをレポートする、デバッ"
 "グツールです。"
 

-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:64
-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>
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-cdrom.8.xml:94 apt-key.8.xml:161
+#: apt-cdrom.8.xml:80 apt-key.8.xml:160

 msgid "Options"
 msgstr "オプション"
 
 msgid "Options"
 msgstr "オプション"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
-msgid "<option>-d</option>"
-msgstr "<option>-d</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:99
+#: apt-cdrom.8.xml:85

 msgid ""
 msgid ""

-"Mount point; specify the location to mount the cdrom. This mount point must "
+"Mount point; specify the location to mount the CD-ROM. This mount point must "

 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
 "Configuration Item: <literal>Acquire::cdrom::mount</literal>."
 msgstr ""
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
 "Configuration Item: <literal>Acquire::cdrom::mount</literal>."
 msgstr ""


@@ -1827,41 +1578,21 @@ msgstr ""
 "は、<filename>/etc/fstab</filename> に正しく設定されている必要があります。設"
 "定項目 - <literal>Acquire::cdrom::mount</literal>"
 
 "は、<filename>/etc/fstab</filename> に正しく設定されている必要があります。設"
 "定項目 - <literal>Acquire::cdrom::mount</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
-msgid "<option>-r</option>"
-msgstr "<option>-r</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:108
+#: apt-cdrom.8.xml:94

 msgid ""
 msgid ""

-"Rename a disc; change the label of a disk or override the disks given label. "
-"This option will cause <command>apt-cdrom</command> to prompt for a new "
-"label.  Configuration Item: <literal>APT::CDROM::Rename</literal>."
+"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 ""
 "ディスクの名前変更 - 指定した名前でディスクのラベルを変更・更新します。このオ"
 "プションにより、<command>apt-cdrom</command> が新しいラベルを入力するよう促し"
 "ます。設定項目 - <literal>APT::CDROM::Rename</literal>"
 
 msgstr ""
 "ディスクの名前変更 - 指定した名前でディスクのラベルを変更・更新します。このオ"
 "プションにより、<command>apt-cdrom</command> が新しいラベルを入力するよう促し"
 "ます。設定項目 - <literal>APT::CDROM::Rename</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:375
-msgid "<option>-m</option>"
-msgstr "<option>-m</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:117
+#: 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::"
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"


@@ -1871,14 +1602,9 @@ msgstr ""
 "アンマウントしないようにします。設定項目 - <literal>APT::CDROM::NoMount</"
 "literal>"
 
 "アンマウントしないようにします。設定項目 - <literal>APT::CDROM::NoMount</"
 "literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:124
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:125
+#: 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 "
 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 "


@@ -1890,14 +1616,9 @@ msgstr ""
 "ており、エラーを検出しなかった場合のみ使用すべきです。設定項目 - "
 "<literal>APT::CDROM::Fast</literal>"
 
 "ており、エラーを検出しなかった場合のみ使用すべきです。設定項目 - "
 "<literal>APT::CDROM::Fast</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:134
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:135
+#: 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 "
 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 "


@@ -1908,24 +1629,9 @@ msgstr ""
 "キャンするのに非常に時間がかかりますが、全パッケージファイルを抽出することが"
 "できます。"
 
 "キャンするのに非常に時間がかかりますが、全パッケージファイルを抽出することが"
 "できます。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:406
-msgid "<option>--just-print</option>"
-msgstr "<option>--just-print</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:408
-msgid "<option>--recon</option>"
-msgstr "<option>--recon</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:409
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:146
+#: 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: "
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "


@@ -1937,13 +1643,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cdrom.8.xml:159
+#: 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>
 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:164
+#: apt-cdrom.8.xml:150

 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."


@@ -1951,81 +1657,42 @@ msgstr ""
 "<command>apt-cdrom</command> は正常終了時に 0 を返します。エラー時には十進の "
 "100 を返します。"
 
 "<command>apt-cdrom</command> は正常終了時に 0 を返します。エラー時には十進の "
 "100 を返します。"
 

-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-config.8.xml:16 apt-extracttemplates.1.xml:16 apt-sortpkgs.1.xml:16
-#: sources.list.5.xml:16
-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-config.8.xml:25 apt-config.8.xml:32
-msgid "apt-config"
-msgstr "apt-config"
-

 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-config.8.xml:33
 msgid "APT Configuration Query program"
 msgstr "APT 設定取得プログラム"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: 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:39
-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>
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-config.8.xml:51
+#: 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 "
 "the main configuration file <filename>/etc/apt/apt.conf</filename> in a "
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
 "the main configuration file <filename>/etc/apt/apt.conf</filename> in a "

-"manner that is easy to use by scripted applications."
+"manner that is easy to use for scripted applications."

 msgstr ""
 "<command>apt-config</command> は、APT スイートの様々な所で一貫した設定を行う"
 "ために使用する、内部ツールです。スクリプトアプリケーションで使いやすい方法"
 "で、メイン設定ファイル <filename>/etc/apt/apt.conf</filename> にアクセスしま"
 "す。"
 
 msgstr ""
 "<command>apt-config</command> は、APT スイートの様々な所で一貫した設定を行う"
 "ために使用する、内部ツールです。スクリプトアプリケーションで使いやすい方法"
 "で、メイン設定ファイル <filename>/etc/apt/apt.conf</filename> にアクセスしま"
 "す。"
 

-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:56 apt-ftparchive.1.xml:75
-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:61
-msgid "shell"
-msgstr "shell"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-config.8.xml:63
+#: apt-config.8.xml:51
+#, fuzzy
+#| 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 second the configuration value to query. As output it lists a "
+#| "series of shell assignments commands for each present value.  In a shell "
+#| "script it should be used like:"

 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 "
 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 "

-"second the configuration value to query. As output it lists a series of "
-"shell assignments commands for each present value.  In a shell script it "
-"should be used like:"
+"second the configuration value to query. As output it lists shell assignment "
+"commands for each value present.  In a shell script it should be used as "
+"follows:"

 msgstr ""
 "shell は、シェルスクリプトから設定情報にアクセスするのに使用します。引数とし"
 "て、まずシェル変数、次に取得したい設定値をペアで与えます。出力として、現在の"
 msgstr ""
 "shell は、シェルスクリプトから設定情報にアクセスするのに使用します。引数とし"
 "て、まずシェル変数、次に取得したい設定値をペアで与えます。出力として、現在の"


@@ -2034,7 +1701,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>

-#: apt-config.8.xml:71
+#: apt-config.8.xml:59

 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"


@@ -2048,7 +1715,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-config.8.xml:76
+#: 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>."
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."


@@ -2058,7 +1725,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-config.8.xml:80
+#: 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 "
 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 "


@@ -2070,20 +1737,43 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-config.8.xml:89
+#: apt-config.8.xml:77

 msgid "Just show the contents of the configuration space."
 msgstr "設定箇所の内容を表示するだけです。"
 
 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 "
+"its individual name, &percnt;f with its full hierarchical name and &percnt;v "
+"with its value.  Use uppercase letters and special characters in the value "
+"will be encoded to ensure that it can e.g. be safely used in a quoted-string "
+"as defined by RFC822. Additionally &percnt;n will be replaced by a newline, "
+"and &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>
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
-#: apt-sortpkgs.1.xml:73
+#: 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>
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-config.8.xml:112
+#: apt-config.8.xml:115

 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."


@@ -2091,12 +1781,6 @@ msgstr ""
 "<command>apt-config</command> は正常終了時に 0 を返します。エラー時には十進"
 "の 100 を返します。"
 
 "<command>apt-config</command> は正常終了時に 0 を返します。エラー時には十進"
 "の 100 を返します。"
 

-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-extracttemplates.1.xml:25 apt-extracttemplates.1.xml:32
-msgid "apt-extracttemplates"
-msgstr "apt-extracttemplates"
-

 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
 msgid "1"
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
 msgid "1"


@@ -2105,28 +1789,18 @@ msgstr "1"
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-extracttemplates.1.xml:33
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-extracttemplates.1.xml:33

-msgid "Utility to extract DebConf config and templates from Debian packages"
+#, fuzzy
+#| msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"

 msgstr ""
 "Debian パッケージから DebConf 設定と DebConf テンプレートを抽出するユーティリ"
 "ティ"
 
 msgstr ""
 "Debian パッケージから DebConf 設定と DebConf テンプレートを抽出するユーティリ"
 "ティ"
 

-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:39
-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>
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-extracttemplates.1.xml:47
+#: 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 "
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "


@@ -2141,48 +1815,47 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-extracttemplates.1.xml:52
+#: 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>
 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:53
+#: 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 "
 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> と言った形になります。"
 
 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:63 apt-get.8.xml:525
-msgid "<option>-t</option>"
-msgstr "<option>-t</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-extracttemplates.1.xml:65
+#: apt-extracttemplates.1.xml:58

 msgid ""
 msgid ""

-"Temporary directory in which to write extracted debconf template files and "
-"config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts.  Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"

 msgstr ""
 msgstr ""

-"抽出した debconf テンプレートファイルや設定スクリプトを書き出す一時ディレクト"
-"リ。設定項目 - <literal>APT::ExtractTemplates::TempDir</literal>"
+"抽出した <command>debconf</command> テンプレートファイルや設定スクリプトを書"
+"き出す一時ディレクトリ。設定項目 - <literal>APT::ExtractTemplates::TempDir</"
+"literal>"

 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-extracttemplates.1.xml:82
+#: apt-extracttemplates.1.xml:75

 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."


@@ -2190,73 +1863,15 @@ msgstr ""
 "<command>apt-extracttemplates</command> は正常終了時に 0 を返します。エラー時"
 "には十進の 100 を返します。"
 
 "<command>apt-extracttemplates</command> は正常終了時に 0 を返します。エラー時"
 "には十進の 100 を返します。"
 

-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-ftparchive.1.xml:16
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
-"August 2009</date>"
-msgstr ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
-"August 2009</date>"
-
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-ftparchive.1.xml:25 apt-ftparchive.1.xml:32
-msgid "apt-ftparchive"
-msgstr "apt-ftparchive"
-

 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-ftparchive.1.xml:33
 msgid "Utility to generate index files"
 msgstr "インデックスファイル生成ユーティリティ"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: 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:39
-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>--arch <replaceable>architecture</replaceable></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>--arch <replaceable>architecture</replaceable></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>"
-

 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:60
+#: 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 "
 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 "


@@ -2269,7 +1884,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:64
+#: 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</"
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"


@@ -2284,7 +1899,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:70
+#: 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 "
 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 "


@@ -2297,15 +1912,9 @@ msgstr ""
 "部プログラムにも依存しません。すべて生成する際には、ファイル変更点の検出と希"
 "望した圧縮出力ファイルの作成を自動的に実行します。"
 
 "部プログラムにも依存しません。すべて生成する際には、ファイル変更点の検出と希"
 "望した圧縮出力ファイルの作成を自動的に実行します。"
 

-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:79
-msgid "packages"
-msgstr "packages"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:81
+#: 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, "
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "


@@ -2319,20 +1928,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+#: 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 を指定できます。"
 
 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:89
-msgid "sources"
-msgstr "sources"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:91
+#: 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 "
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "


@@ -2346,7 +1949,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:96
+#: 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 "
 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 "


@@ -2356,14 +1959,9 @@ msgstr ""
 "ルを探します。使用するソースオーバーライドファイルを変更するのには、--source-"
 "override オプションを使用します。"
 
 "ルを探します。使用するソースオーバーライドファイルを変更するのには、--source-"
 "override オプションを使用します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:101
-msgid "contents"
-msgstr "contents"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:103
+#: 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 "
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "


@@ -2379,13 +1977,8 @@ msgstr ""
 "ません。複数のパッケージが同じファイルを持つ場合、パッケージ名をカンマ区切り"
 "で出力します。"
 
 "ません。複数のパッケージが同じファイルを持つ場合、パッケージ名をカンマ区切り"
 "で出力します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:113
-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:115
+#: 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 uncompressed "
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "


@@ -2400,7 +1993,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:125
+#: 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</"
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"


@@ -2419,14 +2012,9 @@ msgstr ""
 "literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, "
 "<literal>Components</literal>, <literal>Description</literal> です。"
 
 "literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, "
 "<literal>Components</literal>, <literal>Description</literal> です。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:136
-msgid "generate"
-msgstr "generate"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:138
+#: 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 "
 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 "


@@ -2439,14 +2027,9 @@ msgstr ""
 "は、必要な設定を維持する簡単な方法を提供すると共に、インデックスファイルをど"
 "のディレクトリから作成するかを指定する、柔軟な方法を提供します。"
 
 "は、必要な設定を維持する簡単な方法を提供すると共に、インデックスファイルをど"
 "のディレクトリから作成するかを指定する、柔軟な方法を提供します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
-msgid "clean"
-msgstr "clean"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:147
+#: 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."
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."


@@ -2456,13 +2039,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-ftparchive.1.xml:153
+#: apt-ftparchive.1.xml:132

 msgid "The Generate Configuration"
 msgstr "Generate 設定"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 msgid "The Generate Configuration"
 msgstr "Generate 設定"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:155
+#: 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 "
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "


@@ -2480,22 +2063,23 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:163
+#: apt-ftparchive.1.xml:142

 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
 "generate 設定には 4 個の独立したセクションがあります。以下それぞれ説明しま"
 "す。"
 
 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>
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:165
-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>
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:167
+#: 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 "
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "


@@ -2506,15 +2090,9 @@ msgstr ""
 "めに必要な、標準ディレクトリを定義します。このディレクトリは、完全な絶対パス"
 "を生成するため、後のセクションで定義される相対パスの前に結合されます。"
 
 "めに必要な、標準ディレクトリを定義します。このディレクトリは、完全な絶対パス"
 "を生成するため、後のセクションで定義される相対パスの前に結合されます。"
 

-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
-msgid "ArchiveDir"
-msgstr "ArchiveDir"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:174
+#: 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 "
 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 "


@@ -2523,37 +2101,21 @@ msgstr ""
 "FTP アーカイブのルートを指定します。標準的な Debian 設定では、このディレクト"
 "リには <filename>ls-LR</filename> と dist ノードがあります。"
 
 "FTP アーカイブのルートを指定します。標準的な Debian 設定では、このディレクト"
 "リには <filename>ls-LR</filename> と dist ノードがあります。"
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:179
-msgid "OverrideDir"
-msgstr "OverrideDir"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:160

 msgid "Specifies the location of the override files."
 msgstr "オーバーライドファイルの場所を指定します。"
 
 msgid "Specifies the location of the override files."
 msgstr "オーバーライドファイルの場所を指定します。"
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:184
-msgid "CacheDir"
-msgstr "CacheDir"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:165

 msgid "Specifies the location of the cache files"
 msgstr "キャッシュファイルの場所を指定します。"
 
 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:189
-msgid "FileListDir"
-msgstr "FileListDir"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:170

 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."


@@ -2561,15 +2123,16 @@ msgstr ""
 "<literal>FileList</literal> 設定が以下で使用されている場合、ファイルリスト"
 "ファイルの場所を指定します。"
 
 "<literal>FileList</literal> 設定が以下で使用されている場合、ファイルリスト"
 "ファイルの場所を指定します。"
 

-# type: Content of: <refentry><refsect1><refsect2><title>

 #. type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:197
-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>
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:199
+#: 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 "
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "


@@ -2579,15 +2142,9 @@ msgstr ""
 "器の動作を制御する設定も行います。他のセクションでは、ここにあるデフォルト値"
 "を、セクションごとの設定で上書きします。"
 
 "器の動作を制御する設定も行います。他のセクションでは、ここにあるデフォルト値"
 "を、セクションごとの設定で上書きします。"
 

-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
-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>
 # 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: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 "
 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 "


@@ -2598,14 +2155,9 @@ msgstr ""
 "とつは '.' (圧縮なし), 'gzip', 'bzip2' が入る、空白区切りの文字列です。圧縮方"
 "法のデフォルトはすべて '. gzip' です。"
 
 "とつは '.' (圧縮なし), 'gzip', 'bzip2' が入る、空白区切りの文字列です。圧縮方"
 "法のデフォルトはすべて '. gzip' です。"
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:211
-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>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:213
+#: apt-ftparchive.1.xml:192

 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."


@@ -2613,14 +2165,9 @@ msgstr ""
 "パッケージファイル拡張子のデフォルト値を列挙します。このデフォルト値は '."
 "deb' です。"
 
 "パッケージファイル拡張子のデフォルト値を列挙します。このデフォルト値は '."
 "deb' です。"
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:217
-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>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:219
+#: apt-ftparchive.1.xml:198

 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."


@@ -2628,14 +2175,9 @@ msgstr ""
 "<literal>Packages::Compress</literal> と同様に、Sources ファイルの圧縮方法を"
 "指定します。"
 
 "<literal>Packages::Compress</literal> と同様に、Sources ファイルの圧縮方法を"
 "指定します。"
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:223
-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>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:225
+#: apt-ftparchive.1.xml:204

 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."


@@ -2643,14 +2185,9 @@ msgstr ""
 "ソースファイル拡張子のデフォルト値を列挙します。このデフォルト値は '.dsc' で"
 "す。"
 
 "ソースファイル拡張子のデフォルト値を列挙します。このデフォルト値は '.dsc' で"
 "す。"
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:229
-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>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:210

 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."


@@ -2658,13 +2195,8 @@ msgstr ""
 "<literal>Packages::Compress</literal> と同様に、Contents ファイルの圧縮方法を"
 "指定します。"
 
 "<literal>Packages::Compress</literal> と同様に、Contents ファイルの圧縮方法を"
 "指定します。"
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
-msgid "Translation::Compress"
-msgstr "Translation::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:237
+#: 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."
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."


@@ -2672,14 +2204,9 @@ msgstr ""
 "<literal>Packages::Compress</literal> と同様に、Translation-en マスターファイ"
 "ルの圧縮を制御します。"
 
 "<literal>Packages::Compress</literal> と同様に、Translation-en マスターファイ"
 "ルの圧縮を制御します。"
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
-msgid "DeLinkLimit"
-msgstr "DeLinkLimit"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:243
+#: 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-"
 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-"


@@ -2689,15 +2216,9 @@ msgstr ""
 "指定します。セクションごとの <literal>External-Links</literal> 設定と合わせて"
 "使います。"
 
 "指定します。セクションごとの <literal>External-Links</literal> 設定と合わせて"
 "使います。"
 

-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248
-msgid "FileMode"
-msgstr "FileMode"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:250
+#: 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."
 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."


@@ -2705,28 +2226,23 @@ msgstr ""
 "作成したインデックスファイルのモードを指定します。デフォルトは 0644 です。全"
 "インデックスファイルは、umask を無視してこのモードを使用します。"
 
 "作成したインデックスファイルのモードを指定します。デフォルトは 0644 です。全"
 "インデックスファイルは、umask を無視してこのモードを使用します。"
 

-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
-msgid "LongDescription"
-msgstr "LongDescription"
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+#: 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 ""
 
 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>

 #. type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:263
-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>
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:265
+#: 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), "
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "


@@ -2736,14 +2252,9 @@ msgstr ""
 "数はすべて置換変数であり、文字列 $(DIST), $(SECTION), $(ARCH) をそれぞれの値"
 "に展開します。"
 
 "数はすべて置換変数であり、文字列 $(DIST), $(SECTION), $(ARCH) をそれぞれの値"
 "に展開します。"
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
-msgid "MaxContentsChange"
-msgstr "MaxContentsChange"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:272
+#: 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 "
 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 "


@@ -2752,15 +2263,9 @@ msgstr ""
 "日毎に生成する contents ファイルをキロバイト単位で設定します。contents ファイ"
 "ルをラウンドロビンし、数日経つとすべて再生成します。"
 
 "日毎に生成する contents ファイルをキロバイト単位で設定します。contents ファイ"
 "ルをラウンドロビンし、数日経つとすべて再生成します。"
 

-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:277
-msgid "ContentsAge"
-msgstr "ContentsAge"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:279
+#: 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. "
 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. "


@@ -2775,15 +2280,9 @@ msgstr ""
 "とが発生します。新しい .deb ファイルをインストールしたい場合、保留を解除で"
 "き、少なくとも新しいファイルが必要です。デフォルトは 10 で、単位は日です。"
 
 "とが発生します。新しい .deb ファイルをインストールしたい場合、保留を解除で"
 "き、少なくとも新しいファイルが必要です。デフォルトは 10 で、単位は日です。"
 

-# type: Content of: <refentry><refsect1><refsect2><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:288
-msgid "Directory"
-msgstr "Directory"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:290
+#: apt-ftparchive.1.xml:269

 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"


@@ -2791,15 +2290,9 @@ msgstr ""
 ".deb ディレクトリツリーの先頭を設定します。デフォルトは <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename> です。"
 
 ".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:294
-msgid "SrcDirectory"
-msgstr "SrcDirectory"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:296
+#: apt-ftparchive.1.xml:275

 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"


@@ -2807,15 +2300,9 @@ msgstr ""
 "ソースパッケージディレクトリツリーの先頭を設定します。デフォルトは <filename>"
 "$(DIST)/$(SECTION)/source/</filename> です。"
 
 "ソースパッケージディレクトリツリーの先頭を設定します。デフォルトは <filename>"
 "$(DIST)/$(SECTION)/source/</filename> です。"
 

-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
-msgid "Packages"
-msgstr "Packages"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:281

 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"


@@ -2823,15 +2310,9 @@ msgstr ""
 "Packages ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/Packages</filename> です。"
 
 "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:306 apt-ftparchive.1.xml:444
-msgid "Sources"
-msgstr "Sources"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:287

 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"


@@ -2839,28 +2320,17 @@ msgstr ""
 "Sources ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
 "$(SECTION)/source/Sources</filename> です。"
 
 "Sources ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
 "$(SECTION)/source/Sources</filename> です。"
 

-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
-msgid "Translation"
-msgstr "Translation"
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:314
+#: 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 ""
 
 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><term>
-#: apt-ftparchive.1.xml:319
-msgid "InternalPrefix"
-msgstr "InternalPrefix"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # 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: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)/</"
 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)/</"


@@ -2869,15 +2339,9 @@ msgstr ""
 "外部リンクではなく、内部リンクと見なす判断材料となる、パスのプレフィックスを"
 "設定します。デフォルトは、<filename>$(DIST)/$(SECTION)/</filename> です。"
 
 "外部リンクではなく、内部リンクと見なす判断材料となる、パスのプレフィックスを"
 "設定します。デフォルトは、<filename>$(DIST)/$(SECTION)/</filename> です。"
 

-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
-msgid "Contents"
-msgstr "Contents"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # 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: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 "
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "


@@ -2889,25 +2353,15 @@ msgstr ""
 "Contents ファイルにまとめられる設定 (デフォルト) の場合、<command>apt-"
 "ftparchive</command> は自動でパッケージファイルをまとめます。"
 
 "Contents ファイルにまとめられる設定 (デフォルト) の場合、<command>apt-"
 "ftparchive</command> は自動でパッケージファイルをまとめます。"
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:335
-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>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:316

 msgid "Sets header file to prepend to the contents output."
 msgstr "contents の出力に付けるヘッダファイルを設定します。"
 
 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:340 apt-ftparchive.1.xml:475
-msgid "BinCacheDB"
-msgstr "BinCacheDB"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:342
+#: apt-ftparchive.1.xml:321

 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."


@@ -2915,15 +2369,9 @@ msgstr ""
 "このセクションで使用するバイナリキャッシュデータベースを設定します。複数のセ"
 "クションで同じデータベースを共有できます。"
 
 "このセクションで使用するバイナリキャッシュデータベースを設定します。複数のセ"
 "クションで同じデータベースを共有できます。"
 

-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
-msgid "FileList"
-msgstr "FileList"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:348
+#: 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. "
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "


@@ -2933,15 +2381,9 @@ msgstr ""
 "み込むファイル一覧ファイルを指定します。相対ファイル名は、アーカイブディレク"
 "トリが先頭につきます。"
 
 "み込むファイル一覧ファイルを指定します。相対ファイル名は、アーカイブディレク"
 "トリが先頭につきます。"
 

-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:353
-msgid "SourceFileList"
-msgstr "SourceFileList"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:355
+#: 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. "
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "


@@ -2952,15 +2394,16 @@ msgstr ""
 "み込むファイル一覧ファイルを指定します。相対ファイル名は、アーカイブディレク"
 "トリが先頭につきます。ソースインデックスを処理する際に使用します。"
 
 "み込むファイル一覧ファイルを指定します。相対ファイル名は、アーカイブディレク"
 "トリが先頭につきます。ソースインデックスを処理する際に使用します。"
 

-# type: Content of: <refentry><refsect1><refsect2><title>

 #. type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:363
-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>
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:365
+#: 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 "
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "


@@ -2974,7 +2417,7 @@ msgstr ""
 "<literal>Directory</literal> 変数で定義されます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "<literal>Directory</literal> 変数で定義されます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:370
+#: 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 "
 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 "


@@ -2988,7 +2431,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:375
+#: 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 "
 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 "


@@ -2999,7 +2442,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 
 # type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt-ftparchive.1.xml:381
+#: apt-ftparchive.1.xml:360

 #, no-wrap
 msgid ""
 "for i in Sections do \n"
 #, no-wrap
 msgid ""
 "for i in Sections do \n"


@@ -3014,7 +2457,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><informalexample>
 #. type: Content of: <refentry><refsect1><refsect2><para>
 
 # type: Content of: <refentry><refsect1><refsect2><para><informalexample>
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:378
+#: 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"
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"


@@ -3024,15 +2467,9 @@ msgstr ""
 "command> は以下のような操作を行います。<placeholder type=\"programlisting\" "
 "id=\"0\"/>"
 
 "command> は以下のような操作を行います。<placeholder type=\"programlisting\" "
 "id=\"0\"/>"
 

-# type: Content of: <refentry><refsect1><refsect2><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
-msgid "Sections"
-msgstr "Sections"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:389
+#: 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-"
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"


@@ -3041,15 +2478,9 @@ msgstr ""
 "distribution 以下に現れるセクションを、空白区切りで指定したリストです。通常、"
 "<literal>main contrib non-free</literal>のようになります。"
 
 "distribution 以下に現れるセクションを、空白区切りで指定したリストです。通常、"
 "<literal>main contrib non-free</literal>のようになります。"
 

-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
-msgid "Architectures"
-msgstr "Architectures"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:396
+#: 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 "
 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 "


@@ -3059,15 +2490,9 @@ msgstr ""
 "す。特殊アーキテクチャ 'source' は、ソースアーカイブのツリーであることを示し"
 "ます。"
 
 "す。特殊アーキテクチャ 'source' は、ソースアーカイブのツリーであることを示し"
 "ます。"
 

-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
-msgid "BinOverride"
-msgstr "BinOverride"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:388

 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."


@@ -3075,15 +2500,9 @@ msgstr ""
 "バイナリオーバーライドファイルを設定します。このオーバーライドファイルには、"
 "セクション、優先度、メンテナのアドレスといった情報が含まれています。"
 
 "バイナリオーバーライドファイルを設定します。このオーバーライドファイルには、"
 "セクション、優先度、メンテナのアドレスといった情報が含まれています。"
 

-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
-msgid "SrcOverride"
-msgstr "SrcOverride"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:415
+#: apt-ftparchive.1.xml:394

 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."


@@ -3091,39 +2510,29 @@ msgstr ""
 "ソースオーバーライドファイルを設定します。このオーバーライドファイルには、セ"
 "クションの情報が含まれています。"
 
 "ソースオーバーライドファイルを設定します。このオーバーライドファイルには、セ"
 "クションの情報が含まれています。"
 

-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
-msgid "ExtraOverride"
-msgstr "ExtraOverride"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446

 msgid "Sets the binary extra override file."
 msgstr "バイナリ特別オーバーライドファイルを設定します。"
 
 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:424 apt-ftparchive.1.xml:470
-msgid "SrcExtraOverride"
-msgstr "SrcExtraOverride"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+#: 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>
 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:431
-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>
 msgstr "BinDirectory セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:433
+#: 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 "
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "


@@ -3138,13 +2547,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:441
+#: 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>
 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:446
+#: apt-ftparchive.1.xml:425

 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."


@@ -3154,59 +2563,49 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:452
+#: 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>
 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:457
+#: 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>
 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:462
+#: 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>
 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:477
+#: apt-ftparchive.1.xml:456

 msgid "Sets the cache DB."
 msgstr "キャッシュ DB を設定します。"
 
 msgid "Sets the cache DB."
 msgstr "キャッシュ DB を設定します。"
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:480
-msgid "PathPrefix"
-msgstr "PathPrefix"
-

 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:461

 msgid "Appends a path to all the output paths."
 msgstr "全出力パスに付加するパス。"
 
 msgid "Appends a path to all the output paths."
 msgstr "全出力パスに付加するパス。"
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:485
-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>
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:466

 msgid "Specifies the file list file."
 msgstr "ファイル一覧ファイルを指定します。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 msgid "Specifies the file list file."
 msgstr "ファイル一覧ファイルを指定します。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:473

 msgid "The Binary Override File"
 msgstr "バイナリオーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 msgid "The Binary Override File"
 msgstr "バイナリオーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:495
+#: 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, "
 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, "


@@ -3221,20 +2620,20 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>

-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:480

 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>

-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:482

 #, no-wrap
 msgid "new"
 msgstr "new"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:500
+#: apt-ftparchive.1.xml:479

 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "


@@ -3252,13 +2651,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:490

 msgid "The Source Override File"
 msgstr "ソースオーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 msgid "The Source Override File"
 msgstr "ソースオーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:513
+#: 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 "
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "


@@ -3270,13 +2669,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:497

 msgid "The Extra Override File"
 msgstr "特別オーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 msgid "The Extra Override File"
 msgstr "特別オーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:520
+#: 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 "
 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 "


@@ -3285,14 +2684,18 @@ msgstr ""
 "特別オーバーライドファイルは、出力中に任意のタグを追加・置換できるようにしま"
 "す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。"
 
 "特別オーバーライドファイルは、出力中に任意のタグを追加・置換できるようにしま"
 "す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
-msgid ""
-"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:531
+#: 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.  "
 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.  "


@@ -3304,15 +2707,17 @@ msgid ""
 "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
 "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 msgstr ""
 "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
 "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 msgstr ""

-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:540
-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>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:542
+#: 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>."
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."


@@ -3322,7 +2727,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:548
+#: 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 "
 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 "


@@ -3334,14 +2739,9 @@ msgstr ""
 "ベルを指定して、設定ファイルを上書きすることもできます。設定項目 - "
 "<literal>quiet</literal>"
 
 "ベルを指定して、設定ファイルを上書きすることもできます。設定項目 - "
 "<literal>quiet</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:554
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:556
+#: 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 "
 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 "


@@ -3353,14 +2753,9 @@ msgstr ""
 "off にするには <option>--no-delink</option> としてください。設定項目 - "
 "<literal>APT::FTPArchive::DeLinkAct</literal>"
 
 "off にするには <option>--no-delink</option> としてください。設定項目 - "
 "<literal>APT::FTPArchive::DeLinkAct</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:562
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:564
+#: 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 "
 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 "


@@ -3374,14 +2769,9 @@ msgstr ""
 "Contents ファイルも作成できます。デフォルトは on です。設定項目 - "
 "<literal>APT::FTPArchive::Contents</literal>"
 
 "Contents ファイルも作成できます。デフォルトは on です。設定項目 - "
 "<literal>APT::FTPArchive::Contents</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:572
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:574
+#: 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</"
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"


@@ -3390,14 +2780,9 @@ msgstr ""
 "<literal>sources</literal> コマンドで使用する、ソースオーバーライドファイルを"
 "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
 
 "<literal>sources</literal> コマンドで使用する、ソースオーバーライドファイルを"
 "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:578
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:559

 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."


@@ -3405,14 +2790,9 @@ msgstr ""
 "キャッシュデータベースを読み取り専用にします。設定項目 - <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>"
 
 "キャッシュデータベースを読み取り専用にします。設定項目 - <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:584
-msgid "<option>--arch</option>"
-msgstr "<option>--arch</option>"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:585
+#: apt-ftparchive.1.xml:564

 #, fuzzy
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 #, fuzzy
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "


@@ -3425,13 +2805,8 @@ msgstr ""
 "literal> のように動作します。設定項目 - <literal>APT::Get::AutomaticRemove</"
 "literal>"
 
 "literal> のように動作します。設定項目 - <literal>APT::Get::AutomaticRemove</"
 "literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:591
-msgid "<option>APT::FTPArchive::AlwaysStat</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:593
+#: 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 "
 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 "


@@ -3444,13 +2819,8 @@ msgid ""
 "are useless."
 msgstr ""
 
 "are useless."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:603
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr "<option>APT::FTPArchive::LongDescription</option>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:605
+#: apt-ftparchive.1.xml:584

 #, fuzzy
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 #, fuzzy
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "


@@ -3466,14 +2836,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
-#: sources.list.5.xml:209
+#: 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>
 msgid "Examples"
 msgstr "サンプル"
 
 # type: Content of: <refentry><refsect1><para><programlisting>
 #. type: Content of: <refentry><refsect1><para><programlisting>

-#: apt-ftparchive.1.xml:623
+#: 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 ""
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""


@@ -3482,7 +2852,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:598

 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"


@@ -3492,7 +2862,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:633
+#: apt-ftparchive.1.xml:612

 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."


@@ -3500,117 +2870,14 @@ msgstr ""
 "<command>apt-ftparchive</command> は正常終了時に 0 を返します。エラー時には十"
 "進の 100 を返します。"
 
 "<command>apt-ftparchive</command> は正常終了時に 0 を返します。エラー時には十"
 "進の 100 を返します。"
 

-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-get.8.xml:16
-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:25 apt-get.8.xml:32 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:33
 msgid "APT package handling utility -- command-line interface"
 msgstr "APT パッケージ操作ユーティリティ -- コマンドラインインターフェース"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: 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:39
-#, 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> <arg choice='plain'> "
-#| "<replaceable>target_release</replaceable> </arg> </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</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</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>"
-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> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
-"<replaceable>default_architecture</replaceable> </arg> </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</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</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> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </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</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</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>"
-

 #. type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-get.8.xml:122
+#: 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 "
 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 "


@@ -3622,14 +2889,9 @@ msgstr ""
 "「フロントエンド」インターフェースには、&dselect;, &aptitude;, &synaptic;, "
 "&wajig; などがあります。"
 
 "「フロントエンド」インターフェースには、&dselect;, &aptitude;, &synaptic;, "
 "&wajig; などがあります。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:131 apt-key.8.xml:127
-msgid "update"
-msgstr "update"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:132
+#: 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 "
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "


@@ -3650,15 +2912,9 @@ msgstr ""
 "upgrade</literal> を行う前に常に実行してください。前もってパッケージファイル"
 "のサイズを知ることができないため、全体の進捗メータは正しく表示されません。"
 
 "upgrade</literal> を行う前に常に実行してください。前もってパッケージファイル"
 "のサイズを知ることができないため、全体の進捗メータは正しく表示されません。"
 

-# type: <tag></tag>
-#. type: <tag></tag>
-#: apt-get.8.xml:143 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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:144
+#: 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 "
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "


@@ -3680,46 +2936,16 @@ msgstr ""
 "<literal>update</literal> を実行しておき、<command>apt-get</command> にパッ"
 "ケージの新しいバージョンがあることを知らせる必要があります。"
 
 "<literal>update</literal> を実行しておき、<command>apt-get</command> にパッ"
 "ケージの新しいバージョンがあることを知らせる必要があります。"
 

-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:156
-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:157
-msgid ""
-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"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:166 guide.sgml:140
-msgid "dist-upgrade"
-msgstr "dist-upgrade"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:167
+#: apt-get.8.xml:74

 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "conflict resolution system, and it will attempt to upgrade the most "
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "conflict resolution system, and it will attempt to upgrade the most "

-"important packages at the expense of less important ones if necessary.  So, "
-"<literal>dist-upgrade</literal> command may remove some packages.  The "
+"important packages at the expense of less important ones if necessary.  The <literal>dist-upgrade</literal> command may therefore remove some packages. "
+" The "

 "<filename>/etc/apt/sources.list</filename> file contains a list of locations "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "for a mechanism for overriding the general settings for individual packages."
 "<filename>/etc/apt/sources.list</filename> file contains a list of locations "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "for a mechanism for overriding the general settings for individual packages."


@@ -3734,33 +2960,44 @@ msgstr ""
 "向けに、一般的な設定を上書きする機構については、&apt-preferences; をご覧くだ"
 "さい。"
 
 "向けに、一般的な設定を上書きする機構については、&apt-preferences; をご覧くだ"
 "さい。"
 

-# type: <tag></tag>
-#. type: <tag></tag>
-#: apt-get.8.xml:179 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:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+"<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>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:181
+#: 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 "
 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 つ以上指"
 "定します。指定するパッケージは、完全なファイル名ではなくパッケージ名です (例"
 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> ファイルを、要求するパッケージの場所を特定するのに使用します。パッ"
 "ケージ名の後ろに (空白を含まず) ハイフンが追加されている場合、そのパッケージ"
 "がインストールされていれば削除します。同様に、インストールするパッケージを明"
 "filename> ファイルを、要求するパッケージの場所を特定するのに使用します。パッ"
 "ケージ名の後ろに (空白を含まず) ハイフンが追加されている場合、そのパッケージ"
 "がインストールされていれば削除します。同様に、インストールするパッケージを明"


@@ -3769,7 +3006,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:199
+#: 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 "
 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 "


@@ -3787,7 +3024,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:206
+#: apt-get.8.xml:123

 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."


@@ -3796,7 +3033,7 @@ msgstr ""
 "なりません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "なりません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:209
+#: 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. "
 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. "


@@ -3816,7 +3053,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:220
+#: apt-get.8.xml:137

 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."


@@ -3826,7 +3063,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # 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: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 "
 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 "


@@ -3842,14 +3079,9 @@ msgstr ""
 "は、'how-lo' や 'lowest' にマッチすることに注意してください。そうしたくなけれ"
 "ば、'^' や '$' を付けるか、もっと詳しい正規表現を指定してください。"
 
 "は、'how-lo' や 'lowest' にマッチすることに注意してください。そうしたくなけれ"
 "ば、'^' や '$' を付けるか、もっと詳しい正規表現を指定してください。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:233
-msgid "remove"
-msgstr "remove"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:234
+#: 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 "
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "


@@ -3863,14 +3095,9 @@ msgstr ""
 "(間に空白を含まずに) 付加されると、識別されたパッケージを、削除ではなくインス"
 "トールします。"
 
 "(間に空白を含まずに) 付加されると、識別されたパッケージを、削除ではなくインス"
 "トールします。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:241
-msgid "purge"
-msgstr "purge"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:242
+#: 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 "
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "


@@ -3879,20 +3106,14 @@ msgstr ""
 "パッケージが削除かつ完全削除 (すべての設定ファイルも削除) されるのを除き、"
 "<literal>purge</literal> は <literal>remove</literal> と同じです。"
 
 "パッケージが削除かつ完全削除 (すべての設定ファイルも削除) されるのを除き、"
 "<literal>purge</literal> は <literal>remove</literal> と同じです。"
 

-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:246
-msgid "source"
-msgstr "source"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:247
+#: 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 "
 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."
 "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."


@@ -3906,7 +3127,7 @@ msgstr ""
 "literal> 構文で指定します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "literal> 構文で指定します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:255
+#: 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 "
 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 "


@@ -3921,7 +3142,7 @@ msgstr ""
 "もっと適切なものを取得します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "もっと適切なものを取得します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:262
+#: apt-get.8.xml:179

 #, fuzzy
 #| msgid ""
 #| "If the <option>--compile</option> option is specified then the package "
 #, fuzzy
 #| msgid ""
 #| "If the <option>--compile</option> option is specified then the package "


@@ -3942,7 +3163,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:269
+#: 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 "
 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 "


@@ -3957,7 +3178,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:275
+#: 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 "
 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 "


@@ -3966,14 +3187,9 @@ msgstr ""
 "tar ball はカレントディレクトリにのみダウンロードされ、カレントディレクトリに"
 "展開されることに注意してください。"
 
 "tar ball はカレントディレクトリにのみダウンロードされ、カレントディレクトリに"
 "展開されることに注意してください。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:280
-msgid "build-dep"
-msgstr "build-dep"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:281
+#: apt-get.8.xml:198

 #, fuzzy
 #| msgid ""
 #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
 #, fuzzy
 #| msgid ""
 #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "


@@ -3988,14 +3204,9 @@ msgstr ""
 "<literal>build-dep</literal> は、ソースパッケージの構築依存関係を満たすよう"
 "に、パッケージのインストール・削除を行います。"
 
 "<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>
 # 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."
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."


@@ -4003,13 +3214,8 @@ msgstr ""
 "<literal>check</literal> は、パッケージキャッシュの更新や壊れた依存関係を"
 "チェックする診断ツールです。"
 
 "<literal>check</literal> は、パッケージキャッシュの更新や壊れた依存関係を"
 "チェックする診断ツールです。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
-msgid "download"
-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:210

 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."


@@ -4017,7 +3223,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:299
+#: 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 "
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "


@@ -4034,14 +3240,9 @@ msgstr ""
 "ます。dselectを使用しない場合は、ディスクスペースを解放するため、時々 "
 "<literal>apt-get clean</literal> を実行したくなるでしょう。"
 
 "ます。dselectを使用しない場合は、ディスクスペースを解放するため、時々 "
 "<literal>apt-get clean</literal> を実行したくなるでしょう。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:308
-msgid "autoclean"
-msgstr "autoclean"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:309
+#: 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 "
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "


@@ -4059,14 +3260,9 @@ msgstr ""
 "に off をセットしていれば、インストール済のパッケージファイルが削除されるのを"
 "防げます。"
 
 "に off をセットしていれば、インストール済のパッケージファイルが削除されるのを"
 "防げます。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:318
-msgid "autoremove"
-msgstr "autoremove"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:319
+#: apt-get.8.xml:236

 #, fuzzy
 #| msgid ""
 #| "<literal>autoremove</literal> is used to remove packages that were "
 #, fuzzy
 #| msgid ""
 #| "<literal>autoremove</literal> is used to remove packages that were "


@@ -4080,32 +3276,23 @@ msgstr ""
 "<literal>autoremove</literal> は、依存関係を満たすために自動的にインストール"
 "され、もう必要なくなったパッケージを削除するのに使用します。"
 
 "<literal>autoremove</literal> は、依存関係を満たすために自動的にインストール"
 "され、もう必要なくなったパッケージを削除するのに使用します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323
-msgid "changelog"
-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: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> "
 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>http://packages.debian.org/changelogs</ulink> for "
-"Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu).  By default it displays the changelog for the version that is "
+"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 ""
 
 "installed.  However, you can specify the same options as for the "
 "<option>install</option> command."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:346
-msgid "<option>--no-install-recommends</option>"
-msgstr "<option>--no-install-recommends</option>"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:347
+#: apt-get.8.xml:264

 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."


@@ -4113,16 +3300,9 @@ msgstr ""
 "「推奨」パッケージをインストールする依存関係と見なしません。設定項目 - "
 "<literal>APT::Install-Recommends</literal>"
 
 "「推奨」パッケージをインストールする依存関係と見なしません。設定項目 - "
 "<literal>APT::Install-Recommends</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:351
-#, fuzzy
-#| msgid "<option>--no-suggests</option>"
-msgid "<option>--install-suggests</option>"
-msgstr "<option>--no-suggests</option>"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:352
+#: apt-get.8.xml:269

 #, fuzzy
 #| msgid ""
 #| "Do not consider recommended packages as a dependency for installing.  "
 #, fuzzy
 #| msgid ""
 #| "Do not consider recommended packages as a dependency for installing.  "


@@ -4134,14 +3314,9 @@ msgstr ""
 "「推奨」パッケージをインストールする依存関係と見なしません。設定項目 - "
 "<literal>APT::Install-Recommends</literal>"
 
 "「推奨」パッケージをインストールする依存関係と見なしません。設定項目 - "
 "<literal>APT::Install-Recommends</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:356
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:357
+#: 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>."
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."


@@ -4149,14 +3324,9 @@ msgstr ""
 "ダウンロードのみ - パッケージファイルの取得のみを行い、展開・インストールを行"
 "いません。設定項目 - <literal>APT::Get::Download-Only</literal>"
 
 "ダウンロードのみ - パッケージファイルの取得のみを行い、展開・インストールを行"
 "いません。設定項目 - <literal>APT::Get::Download-Only</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:361
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:362
+#: 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 "
 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 "


@@ -4181,19 +3351,9 @@ msgstr ""
 "ションと同時に使用すると、エラーになる状況があるかもしれません。設定項目 - "
 "<literal>APT::Get::Fix-Broken</literal>"
 
 "ションと同時に使用すると、エラーになる状況があるかもしれません。設定項目 - "
 "<literal>APT::Get::Fix-Broken</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:375
-msgid "<option>--ignore-missing</option>"
-msgstr "<option>--ignore-missing</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
-msgid "<option>--fix-missing</option>"
-msgstr "<option>--fix-missing</option>"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:377
+#: 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 "
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "


@@ -4211,14 +3371,9 @@ msgstr ""
 "かった場合に、なにも表示せず保留することになります。設定項目 - <literal>APT::"
 "Get::Fix-Missing</literal>"
 
 "かった場合に、なにも表示せず保留することになります。設定項目 - <literal>APT::"
 "Get::Fix-Missing</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:387
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:388
+#: 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 "
 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 "


@@ -4230,7 +3385,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:395
+#: 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 "
 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 "


@@ -4248,19 +3403,9 @@ msgstr ""
 "をつけずに -qq を使用するべきではありません。設定項目 - <literal>quiet</"
 "literal>"
 
 "をつけずに -qq を使用するべきではありません。設定項目 - <literal>quiet</"
 "literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:405
-msgid "<option>--simulate</option>"
-msgstr "<option>--simulate</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:410
+#: 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::"
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"


@@ -4270,7 +3415,7 @@ msgstr ""
 "行いません。設定項目 - <literal>APT::Get::Simulate</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "行いません。設定項目 - <literal>APT::Get::Simulate</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:414
+#: 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 "
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "


@@ -4288,7 +3433,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:420
+#: 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 "
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "


@@ -4299,24 +3444,9 @@ msgstr ""
 "(Remv)、展開 (Inst) を表示します。角カッコは壊れたパッケージを表し、(まれに) "
 "空の角カッコは大した問題ではないことを表します。"
 
 "(Remv)、展開 (Inst) を表示します。角カッコは壊れたパッケージを表し、(まれに) "
 "空の角カッコは大した問題ではないことを表します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
-msgid "<option>-y</option>"
-msgstr "<option>-y</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
-msgid "<option>--yes</option>"
-msgstr "<option>--yes</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:428
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:429
+#: 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 "
 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 "


@@ -4329,19 +3459,23 @@ msgstr ""
 "るような不適切な状況の場合、<literal>apt-get</literal> は処理を中断します。設"
 "定項目 - <literal>APT::Get::Assume-Yes</literal>"
 
 "るような不適切な状況の場合、<literal>apt-get</literal> は処理を中断します。設"
 "定項目 - <literal>APT::Get::Assume-Yes</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
-msgid "<option>-u</option>"
-msgstr "<option>-u</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
-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>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:437
+#: 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>."
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."


@@ -4349,19 +3483,9 @@ msgstr ""
 "更新パッケージ表示 - 更新される全パッケージを一覧表示します。設定項目 - "
 "<literal>APT::Get::Show-Upgraded</literal>"
 
 "更新パッケージ表示 - 更新される全パッケージを一覧表示します。設定項目 - "
 "<literal>APT::Get::Show-Upgraded</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
-msgid "<option>-V</option>"
-msgstr "<option>-V</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:443
+#: apt-get.8.xml:365

 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."


@@ -4369,15 +3493,8 @@ msgstr ""
 "更新・インストールするパッケージのバージョンをすべて表示します。設定項目 - "
 "<literal>APT::Get::Show-Versions</literal>"
 
 "更新・インストールするパッケージのバージョンをすべて表示します。設定項目 - "
 "<literal>APT::Get::Show-Versions</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:448
-#, fuzzy
-#| msgid "<option>--recurse</option>"
-msgid "<option>--host-architecture</option>"
-msgstr "<option>--recurse</option>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:449
+#: 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 "
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "


@@ -4387,24 +3504,9 @@ msgid ""
 "Architecture</literal>"
 msgstr ""
 
 "Architecture</literal>"
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
-msgid "<option>-b</option>"
-msgstr "<option>-b</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
-msgid "<option>--compile</option>"
-msgstr "<option>--compile</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:458
-msgid "<option>--build</option>"
-msgstr "<option>--build</option>"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:459
+#: apt-get.8.xml:381

 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."


@@ -4412,14 +3514,9 @@ msgstr ""
 "ソースパッケージをダウンロード後、コンパイルします。設定項目 - <literal>APT::"
 "Get::Compile</literal>"
 
 "ソースパッケージをダウンロード後、コンパイルします。設定項目 - <literal>APT::"
 "Get::Compile</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:464
+#: 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 "
 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 "


@@ -4431,14 +3528,9 @@ msgstr ""
 "を保留の解除をするのに使用すると便利です。設定項目 - <literal>APT::Ignore-"
 "Hold</literal>"
 
 "を保留の解除をするのに使用すると便利です。設定項目 - <literal>APT::Ignore-"
 "Hold</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:470
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:471
+#: 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 "
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "


@@ -4449,32 +3541,22 @@ msgstr ""
 "<literal>no-upgrade</literal> は、指定したパッケージがすでにインストールして"
 "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
 
 "<literal>no-upgrade</literal> は、指定したパッケージがすでにインストールして"
 "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:477
-msgid "<option>--only-upgrade</option>"
-msgstr "<option>--only-upgrade</option>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:478
+#: apt-get.8.xml:400

 #, fuzzy
 msgid ""
 "Do not install new packages; When used in conjunction with <literal>install</"
 #, fuzzy
 msgid ""
 "Do not install new packages; When used in conjunction with <literal>install</"

-"literal>, <literal>only-upgrade</literal> will prevent packages on the "
-"command line from being upgraded if they are not already installed.  "
+"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>"
 
 "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><term>
-#: apt-get.8.xml:484
-msgid "<option>--force-yes</option>"
-msgstr "<option>--force-yes</option>"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:485
+#: 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 "
 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 "


@@ -4487,14 +3569,9 @@ msgstr ""
 "方がいいでしょう。<literal>force-yes</literal> は、あなたのシステムを破壊しか"
 "ねません! 設定項目 - <literal>APT::Get::force-yes</literal>"
 
 "方がいいでしょう。<literal>force-yes</literal> は、あなたのシステムを破壊しか"
 "ねません! 設定項目 - <literal>APT::Get::force-yes</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:492
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:493
+#: 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 "
 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 "


@@ -4514,14 +3591,9 @@ msgstr ""
 "の展開はユーザの責任において行ってください。設定項目 - <literal>APT::Get::"
 "Print-URIs</literal>"
 
 "の展開はユーザの責任において行ってください。設定項目 - <literal>APT::Get::"
 "Print-URIs</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:503
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:504
+#: 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. "
 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. "


@@ -4533,14 +3605,9 @@ msgstr ""
 "purge</option> は <option>purge</option> コマンドと等価です。 設定項目 - "
 "<literal>APT::Get::Purge</literal>"
 
 "purge</option> は <option>purge</option> コマンドと等価です。 設定項目 - "
 "<literal>APT::Get::Purge</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:512
+#: 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>."
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."


@@ -4548,14 +3615,9 @@ msgstr ""
 "すでに最新版がインストールされていても、パッケージを再インストールします。設"
 "定項目 - <literal>APT::Get::ReInstall</literal>"
 
 "すでに最新版がインストールされていても、パッケージを再インストールします。設"
 "定項目 - <literal>APT::Get::ReInstall</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:517
+#: 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 "
 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 "


@@ -4570,19 +3632,9 @@ msgstr ""
 "filename> の中身を管理します。これを OFF にするのは、取得元リストを頻繁に変更"
 "する時ぐらいでしょう。設定項目 - <literal>APT::Get::List-Cleanup</literal>"
 
 "filename> の中身を管理します。これを OFF にするのは、取得元リストを頻繁に変更"
 "する時ぐらいでしょう。設定項目 - <literal>APT::Get::List-Cleanup</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:526
-msgid "<option>--target-release</option>"
-msgstr "<option>--target-release</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:527
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:528
+#: 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 "
 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 "


@@ -4603,14 +3655,9 @@ msgstr ""
 "option>、<option>-t sid</option> でしょう。設定項目 - <literal>APT::Default-"
 "Release</literal>。&apt-preferences; のマニュアルページもご覧ください。"
 
 "option>、<option>-t sid</option> でしょう。設定項目 - <literal>APT::Default-"
 "Release</literal>。&apt-preferences; のマニュアルページもご覧ください。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
-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>
 # 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:466

 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"


@@ -4622,14 +3669,9 @@ msgstr ""
 "と答えますが、<option>--trivial-only</option> はすべて no と答えます。設定項"
 "目 - <literal>APT::Get::Trivial-Only</literal>"
 
 "と答えますが、<option>--trivial-only</option> はすべて no と答えます。設定項"
 "目 - <literal>APT::Get::Trivial-Only</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:550
+#: 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>."
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."


@@ -4637,14 +3679,9 @@ msgstr ""
 "パッケージが削除される状況になったとき、プロンプトを表示せず中断します。設定"
 "項目 - <literal>APT::Get::Remove</literal>"
 
 "パッケージが削除される状況になったとき、プロンプトを表示せず中断します。設定"
 "項目 - <literal>APT::Get::Remove</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:555
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:556
+#: 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> "
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "


@@ -4656,14 +3693,9 @@ msgstr ""
 "literal> のように動作します。設定項目 - <literal>APT::Get::AutomaticRemove</"
 "literal>"
 
 "literal> のように動作します。設定項目 - <literal>APT::Get::AutomaticRemove</"
 "literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:562
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:563
+#: 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 "
 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 "


@@ -4680,24 +3712,9 @@ msgstr ""
 "付けなくなる、ということです。設定項目 - <literal>APT::Get::Only-Source</"
 "literal>"
 
 "付けなくなる、ということです。設定項目 - <literal>APT::Get::Only-Source</"
 "literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
-msgid "<option>--diff-only</option>"
-msgstr "<option>--diff-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
-msgid "<option>--dsc-only</option>"
-msgstr "<option>--dsc-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:574
+#: 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</"
 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</"


@@ -4707,14 +3724,9 @@ msgstr ""
 "設定項目 - <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Tar-"
 "Only</literal>"
 
 "設定項目 - <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Tar-"
 "Only</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:579
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:580
+#: apt-get.8.xml:503

 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."


@@ -4722,14 +3734,9 @@ msgstr ""
 "構築依存関係の解決を、アーキテクチャに依存したもののみ行います。設定項目 - "
 "<literal>APT::Get::Arch-Only</literal>"
 
 "構築依存関係の解決を、アーキテクチャに依存したもののみ行います。設定項目 - "
 "<literal>APT::Get::Arch-Only</literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:584
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:585
+#: 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::"
 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::"


@@ -4739,18 +3746,9 @@ msgstr ""
 "うなツールで便利です。設定項目 - <literal>APT::Get::AllowUnauthenticated</"
 "literal>"
 
 "うなツールで便利です。設定項目 - <literal>APT::Get::AllowUnauthenticated</"
 "literal>"
 

-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:598
-msgid ""
-"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-"&file-statelists;"
-msgstr ""
-"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-"&file-statelists;"
-

 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-get.8.xml:607
+#: 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-"
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"


@@ -4762,7 +3760,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-get.8.xml:613
+#: apt-get.8.xml:536

 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."


@@ -4770,55 +3768,15 @@ msgstr ""
 "<command>apt-get</command> は正常終了時に 0 を返します。エラー時には十進の "
 "100 を返します。"
 
 "<command>apt-get</command> は正常終了時に 0 を返します。エラー時には十進の "
 "100 を返します。"
 

-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:616
-msgid "ORIGINAL AUTHORS"
-msgstr "原著者"
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:617
-msgid "&apt-author.jgunthorpe;"
-msgstr "&apt-author.jgunthorpe;"
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:620
-msgid "CURRENT AUTHORS"
-msgstr "現著者"
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:622
-msgid "&apt-author.team;"
-msgstr "&apt-author.team;"
-
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-key.8.xml:17 apt-key.8.xml:24
-msgid "apt-key"
-msgstr "apt-key"
-

 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-key.8.xml:25
+#: apt-key.8.xml:32

 msgid "APT key management utility"
 msgstr "APT キー管理ユーティリティ"
 
 msgid "APT key management utility"
 msgstr "APT キー管理ユーティリティ"
 

-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:31
-msgid ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
-"arg>"
-msgstr ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-"replaceable></option></arg> <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>
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-key.8.xml:40
+#: 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 "
 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 "


@@ -4830,94 +3788,59 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-key.8.xml:46
+#: apt-key.8.xml:45

 msgid "Commands"
 msgstr "コマンド"
 
 msgid "Commands"
 msgstr "コマンド"
 

-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:48
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:52
+#: 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 ""
 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> とすると、標準入力から読み込みます。"
 
 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:60
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:64
+#: apt-key.8.xml:63

 msgid "Remove a key from the list of trusted keys."
 msgstr "信頼キー一覧からキーを削除します。"
 
 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:71
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:75
-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:82
-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>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:86
+#: apt-key.8.xml:85

 msgid "Output all trusted keys to standard output."
 msgstr "信頼するキーをすべて標準出力に出力します。"
 
 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:93
-msgid "list"
-msgstr "list"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:97
+#: apt-key.8.xml:96

 msgid "List trusted keys."
 msgstr "信頼キーを一覧表示します。"
 
 msgid "List trusted keys."
 msgstr "信頼キーを一覧表示します。"
 

-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:104
-msgid "finger"
-msgstr "finger"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:108
+#: apt-key.8.xml:107

 msgid "List fingerprints of trusted keys."
 msgstr "信頼キーのフィンガープリントを一覧表示します。"
 
 msgid "List fingerprints of trusted keys."
 msgstr "信頼キーのフィンガープリントを一覧表示します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:115
-msgid "adv"
-msgstr "adv"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:119
+#: apt-key.8.xml:118

 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."


@@ -4926,7 +3849,7 @@ msgstr ""
 "できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:131
+#: apt-key.8.xml:130

 msgid ""
 "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 "
 msgid ""
 "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 "


@@ -4935,15 +3858,8 @@ msgid ""
 "Debian."
 msgstr ""
 
 "Debian."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:141
-#, fuzzy
-#| msgid "update"
-msgid "net-update"
-msgstr "update"
-

 #. 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:144

 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.  "
 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.  "


@@ -4954,7 +3870,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-key.8.xml:162
+#: apt-key.8.xml:161

 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."


@@ -4962,14 +3878,16 @@ msgstr ""
 "前節で説明したコマンドの前に、このオプションを定義する必要があることに注意し"
 "てください。"
 
 "前節で説明したコマンドの前に、このオプションを定義する必要があることに注意し"
 "てください。"
 

-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:164
-msgid "--keyring <replaceable>filename</replaceable>"
-msgstr "--keyring <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:165
+#: 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 "
 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 "


@@ -4984,36 +3902,31 @@ msgstr ""
 "gpg</filename> がプライマリキーリングです。つまり新しいキーはこのファイルに追"
 "加されます。"
 
 "gpg</filename> がプライマリキーリングです。つまり新しいキーはこのファイルに追"
 "加されます。"
 

-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:178
-msgid "&file-trustedgpg;"
-msgstr "&file-trustedgpg;"
-

 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-key.8.xml:180
+#: 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>
 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:181
+#: apt-key.8.xml:180

 msgid "Local trust database of archive keys."
 msgstr "アーカイブキーのローカル信頼データベースです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Local trust database of archive keys."
 msgstr "アーカイブキーのローカル信頼データベースです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-key.8.xml:184
+#: 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>
 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:185
+#: apt-key.8.xml:184

 msgid "Keyring of Debian archive trusted keys."
 msgstr "Debian アーカイブ信頼キーのキーリングです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Keyring of Debian archive trusted keys."
 msgstr "Debian アーカイブ信頼キーのキーリングです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-key.8.xml:188
+#: apt-key.8.xml:187

 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""


@@ -5021,72 +3934,25 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:189
+#: 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>
 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:198
+#: apt-key.8.xml:197

 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 

-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-mark.8.xml:16
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-#| "August 2009</date>"
-msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
-"April 2011</date>"
-msgstr ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
-
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-mark.8.xml:25 apt-mark.8.xml:32
-msgid "apt-mark"
-msgstr "apt-mark"
-

 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml:33
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "パッケージが自動的にインストールされたかどうかのマークを変更します。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: 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:39
-#, fuzzy
-#| 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>"
-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"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
-msgstr ""
-"  <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>"
-

 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:39

 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."


@@ -5096,7 +3962,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-mark.8.xml:61
+#: 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 "
 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 "


@@ -5110,16 +3976,9 @@ msgstr ""
 "たパッケージに依存されなくなると、そのパッケージは、例えば <command>apt-get</"
 "command> や <command>aptitude</command> により削除されます。"
 
 "たパッケージに依存されなくなると、そのパッケージは、例えば <command>apt-get</"
 "command> や <command>aptitude</command> により削除されます。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
-#, fuzzy
-#| msgid "markauto"
-msgid "auto"
-msgstr "markauto"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:52

 #, fuzzy
 #| msgid ""
 #| "<literal>markauto</literal> is used to mark a package as being "
 #, fuzzy
 #| msgid ""
 #| "<literal>markauto</literal> is used to mark a package as being "


@@ -5134,14 +3993,9 @@ msgstr ""
 "マークします。このパッケージに依存する、手動でインストールされたパッケージが"
 "なくなると、このパッケージを削除します。"
 
 "マークします。このパッケージに依存する、手動でインストールされたパッケージが"
 "なくなると、このパッケージを削除します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "manual"
-msgstr ""
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-mark.8.xml:78
+#: apt-mark.8.xml:60

 #, fuzzy
 #| msgid ""
 #| "<literal>unmarkauto</literal> is used to mark a package as being manually "
 #, fuzzy
 #| msgid ""
 #| "<literal>unmarkauto</literal> is used to mark a package as being manually "


@@ -5156,13 +4010,8 @@ msgstr ""
 "マークします。このパッケージに依存する他のパッケージがなくなっても、このパッ"
 "ケージを自動的に削除するのを防ぎます。"
 
 "マークします。このパッケージに依存する他のパッケージがなくなっても、このパッ"
 "ケージを自動的に削除するのを防ぎます。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
-msgid "hold"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-mark.8.xml:86
+#: 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 "
 msgid ""
 "<literal>hold</literal> is used to mark a package as hold back, which will "
 "prevent the package from being automatically installed, upgraded or "


@@ -5171,14 +4020,9 @@ msgid ""
 "effected by the <option>--filename</option> option."
 msgstr ""
 
 "effected by the <option>--filename</option> option."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
-msgid "unhold"
-msgstr ""
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:78

 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "


@@ -5190,14 +4034,9 @@ msgstr ""
 "<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
 "ケージごとに改行して表示します。"
 
 "<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
 "ケージごとに改行して表示します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
-msgid "showauto"
-msgstr "showauto"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-mark.8.xml:102
+#: apt-mark.8.xml:84

 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "


@@ -5211,31 +4050,17 @@ msgstr ""
 "<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
 "ケージごとに改行して表示します。"
 
 "<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
 "ケージごとに改行して表示します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
-#, fuzzy
-#| msgid "showauto"
-msgid "showmanual"
-msgstr "showauto"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-mark.8.xml:110
+#: apt-mark.8.xml:92

 msgid ""
 "<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 ""
 
 msgid ""
 "<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><term>
-#: apt-mark.8.xml:116
-#, fuzzy
-#| msgid "showauto"
-msgid "showhold"
-msgstr "showauto"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:99

 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "


@@ -5247,28 +4072,18 @@ msgstr ""
 "<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
 "ケージごとに改行して表示します。"
 
 "<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
 "ケージごとに改行して表示します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
-msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
-msgstr ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:115
+#, fuzzy
+#| 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 ""
 msgid ""

-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
+"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 ""
 "<filename>extended_status</filename> in the directory defined by the "
 "Configuration Item: <literal>Dir::State</literal>."
 msgstr ""


@@ -5276,20 +4091,9 @@ msgstr ""
 "トリの <filename>extended_status</filename>) に代えて、<filename>FILENAME</"
 "filename> からパッケージの統計を読み書きします。"
 
 "トリの <filename>extended_status</filename>) に代えて、<filename>FILENAME</"
 "filename> からパッケージの統計を読み書きします。"
 

-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
-msgid "  &file-extended_states;"
-msgstr "  &file-extended_states;"
-
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
-msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-get;,&aptitude;,&apt-conf;"
-

 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:136

 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."


@@ -5297,21 +4101,15 @@ msgstr ""
 "<command>apt-mark</command> は正常終了時に 0 を返します。エラー時には十進の "
 "100 を返します。"
 
 "<command>apt-mark</command> は正常終了時に 0 を返します。エラー時には十進の "
 "100 を返します。"
 

-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-secure.8.xml:17 apt-secure.8.xml:39
-msgid "apt-secure"
-msgstr "apt-secure"
-

 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-secure.8.xml:40
+#: 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>
 msgid "Archive authentication support for APT"
 msgstr "APT アーカイブ認証サポート"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:45
+#: 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 "
 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 "


@@ -5324,7 +4122,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:53
+#: 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 "
 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 "


@@ -5340,7 +4138,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:69

 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."


@@ -5350,13 +4148,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-secure.8.xml:67
+#: apt-secure.8.xml:74

 msgid "Trusted archives"
 msgstr "信頼済アーカイブ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 msgid "Trusted archives"
 msgstr "信頼済アーカイブ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:70
+#: 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 "
 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 "


@@ -5374,7 +4172,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:78
+#: 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 "
 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 "


@@ -5388,7 +4186,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:85
+#: 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 "
 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 "


@@ -5406,7 +4204,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:95
+#: 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 "
 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 "


@@ -5423,7 +4221,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:105
+#: 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 "
 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 "


@@ -5439,7 +4237,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:112
+#: 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:"
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"


@@ -5449,7 +4247,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:117
+#: 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 "
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, a malicious agent can introduce himself in the package download "


@@ -5465,7 +4263,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:125
+#: 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 "
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "


@@ -5478,7 +4276,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:132
+#: 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 "
 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 "


@@ -5491,13 +4289,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-secure.8.xml:138
+#: apt-secure.8.xml:145

 msgid "User configuration"
 msgstr "ユーザの設定"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 msgid "User configuration"
 msgstr "ユーザの設定"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:140
+#: 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 "
 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 "


@@ -5511,7 +4309,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:147
+#: apt-secure.8.xml:154

 #, fuzzy
 #| msgid ""
 #| "In order to add a new key you need to first download it (you should make "
 #, fuzzy
 #| msgid ""
 #| "In order to add a new key you need to first download it (you should make "


@@ -5537,13 +4335,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-secure.8.xml:156
+#: apt-secure.8.xml:163

 msgid "Archive configuration"
 msgstr "アーカイブの設定"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 msgid "Archive configuration"
 msgstr "アーカイブの設定"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:158
+#: apt-secure.8.xml:165

 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"


@@ -5553,7 +4351,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:163
+#: 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</"
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"


@@ -5565,7 +4363,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:168
+#: apt-secure.8.xml:175

 #, fuzzy
 #| msgid ""
 #| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"
 #, fuzzy
 #| msgid ""
 #| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"


@@ -5580,7 +4378,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:172
+#: 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 "
 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 "


@@ -5592,7 +4390,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:179
+#: 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 "
 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 "


@@ -5603,7 +4401,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:194

 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"


@@ -5613,30 +4411,30 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:191
+#: apt-secure.8.xml:198

 msgid ""
 "For more background information you might want to review the <ulink url="
 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-"
 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>
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-secure.8.xml:204
+#: apt-secure.8.xml:211

 msgid "Manpage Authors"
 msgstr "マニュアルページ作者"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 msgid "Manpage Authors"
 msgstr "マニュアルページ作者"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:206
+#: 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."
 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."


@@ -5644,35 +4442,15 @@ msgstr ""
 "このマニュアルページは Javier Fernández-Sanguino Peña, Isaac Jones, Colin "
 "Walters, Florian Weimer, Michael Vogt の作業を元にしています。"
 
 "このマニュアルページは 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:25 apt-sortpkgs.1.xml:32
-msgid "apt-sortpkgs"
-msgstr "apt-sortpkgs"
-

 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-sortpkgs.1.xml:33
 msgid "Utility to sort package index files"
 msgstr "パッケージインデックスファイルのソートユーティリティ"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: 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:39
-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>
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-sortpkgs.1.xml:48
+#: 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 "
 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 "


@@ -5685,19 +4463,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-sortpkgs.1.xml:54
+#: apt-sortpkgs.1.xml:45

 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 "出力はすべて標準出力に送られ、入力は検索できるファイルでなければなりません。"
 
 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:61
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-sortpkgs.1.xml:63
+#: apt-sortpkgs.1.xml:54

 msgid ""
 "Use Source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
 msgid ""
 "Use Source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."


@@ -5707,7 +4480,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-sortpkgs.1.xml:77
+#: apt-sortpkgs.1.xml:68

 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."


@@ -5715,39 +4488,29 @@ msgstr ""
 "<command>apt-sortpkgs</command> は正常終了時に 0 を返します。エラー時には十進"
 "の 100 を返します。"
 
 "<command>apt-sortpkgs</command> は正常終了時に 0 を返します。エラー時には十進"
 "の 100 を返します。"
 

-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt.conf.5.xml:16
-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>16 January 2010</date>"
+#. type: Content of: <refentry><refentryinfo><author><contrib>
+#: apt.conf.5.xml:20
+msgid "Initial documentation of Debug::*."

 msgstr ""
 msgstr ""

-"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-"firstname> <surname>Burrows</surname> <contrib>Debug::*. の最初のドキュメント"
-"</contrib> <email>dburrows@debian.org</email> </author> &apt-email; &apt-"
-"product; <date>16 January 2010</date>"

 
 

-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt.conf.5.xml:31 apt.conf.5.xml:38
-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>
 
 #. type: Content of: <refentry><refmeta><manvolnum>

-#: apt.conf.5.xml:32 apt_preferences.5.xml:25 sources.list.5.xml:26
+#: 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>
 msgid "5"
 msgstr "5"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt.conf.5.xml:39
+#: apt.conf.5.xml:38

 msgid "Configuration file for APT"
 msgstr "APT の設定ファイル"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Configuration file for APT"
 msgstr "APT の設定ファイル"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:43
+#: apt.conf.5.xml:42

 msgid ""
 "<filename>apt.conf</filename> is the main configuration file for the APT "
 "suite of tools, but by far not the only place changes to options can be "
 msgid ""
 "<filename>apt.conf</filename> is the main configuration file for the APT "
 "suite of tools, but by far not the only place changes to options can be "


@@ -5760,21 +4523,21 @@ msgstr ""
 "ンドラインパーサも使用します。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
 "ンドラインパーサも使用します。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>

-#: apt.conf.5.xml:48
+#: 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>
 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:50
+#: 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>
 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:52
+#: apt.conf.5.xml:51

 #, fuzzy
 #| msgid ""
 #| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 #, fuzzy
 #| msgid ""
 #| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "


@@ -5797,13 +4560,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>

-#: apt.conf.5.xml:59
+#: 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>
 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:61
+#: apt.conf.5.xml:60

 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."


@@ -5812,13 +4575,13 @@ msgstr ""
 "加読み込みができます。"
 
 #. type: Content of: <refentry><refsect1><title>
 "加読み込みができます。"
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:65
+#: apt.conf.5.xml:64

 msgid "Syntax"
 msgstr "構文"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 msgid "Syntax"
 msgstr "構文"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:66
+#: 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 "
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "


@@ -5833,7 +4596,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:72
+#: 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 "
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "


@@ -5859,7 +4622,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
 
 # type: Content of: <refentry><refsect1><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>

-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:85

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


@@ -5878,7 +4641,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:94
+#: 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 "
 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 "


@@ -5890,7 +4653,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
 
 # type: Content of: <refentry><refsect1><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>

-#: apt.conf.5.xml:99
+#: apt.conf.5.xml:98

 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr ""
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr ""


@@ -5899,7 +4662,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:102
+#: 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."
 msgid ""
 "In general the sample configuration file in <filename>&docdir;examples/apt."
 "conf</filename> &configureindex; is a good guide for how it should look."


@@ -5908,7 +4671,7 @@ msgstr ""
 "定ファイルのサンプルです。どのように設定するか参考になるでしょう。"
 
 #. type: Content of: <refentry><refsect1><para>
 "定ファイルのサンプルです。どのように設定するか参考になるでしょう。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:106
+#: 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>."
 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>."


@@ -5917,7 +4680,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal> とできます。"
 
 #. type: Content of: <refentry><refsect1><para>
 "<literal>dpkg::pre-install-pkgs</literal> とできます。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:109
+#: 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. "
 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. "


@@ -5933,7 +4696,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:114
+#: 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</"
 msgid ""
 "Two specials are allowed, <literal>#include</literal> (which is deprecated "
 "and not supported by alternative implementations) and <literal>#clear</"


@@ -5952,7 +4715,7 @@ msgstr ""
 "があることに注意してください)。"
 
 #. type: Content of: <refentry><refsect1><para>
 "があることに注意してください)。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:122
+#: 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</"
 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</"


@@ -5967,13 +4730,21 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:127
+#: 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. (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) "
 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 ツールで、コマンドラインで任意の設定ディレクティブを指定できる -"
 "suspect: The scope syntax can't be used on the command line.)"
 msgstr ""
 "すべての APT ツールで、コマンドラインで任意の設定ディレクティブを指定できる -"


@@ -5983,12 +4754,26 @@ msgstr ""
 "コープ構文はコマンドラインで使用できません)。"
 
 #. type: Content of: <refentry><refsect1><para>
 "コープ構文はコマンドラインで使用できません)。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:134
+#: 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 "
 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 "
 "\"<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 "


@@ -6011,13 +4796,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:145

 msgid "The APT Group"
 msgstr "APT グループ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 msgid "The APT Group"
 msgstr "APT グループ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:147
+#: 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."
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."


@@ -6025,15 +4810,9 @@ msgstr ""
 "このオプショングループは、ツール全体に影響のある、一般的な APT の振る舞いを制"
 "御します。"
 
 "このオプショングループは、ツール全体に影響のある、一般的な APT の振る舞いを制"
 "御します。"
 

-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
-msgid "Architecture"
-msgstr "Architecture"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # 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:151

 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "


@@ -6044,24 +4823,20 @@ msgstr ""
 "ルしたアーキテクチャです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ルしたアーキテクチャです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:157

 msgid ""
 "All Architectures the system supports. Processors implementing the "
 msgid ""
 "All Architectures the system supports. Processors implementing the "

-"<literal>amd64</literal> are e.g. also able to execute binaries compiled for "
-"<literal>i386</literal>; 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>."
+"<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 ""
 
 msgstr ""
 

-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:165
-msgid "Default-Release"
-msgstr "Default-Release"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:166
+#: 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', "
 msgid ""
 "Default release to install packages from if more than one version available. "
 "Contains release name, codename or release version. Examples: 'stable', "


@@ -6073,14 +4848,9 @@ msgstr ""
 "'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
 "'4.0', '5.0*'  となります。&apt-preferences; も参照してください。"
 
 "'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
 "'4.0', '5.0*'  となります。&apt-preferences; も参照してください。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:171
-msgid "Ignore-Hold"
-msgstr "Ignore-Hold"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:172
+#: apt.conf.5.xml:173

 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."


@@ -6088,15 +4858,9 @@ msgstr ""
 "保留パッケージの無視 - このグローバルオプションは、問題解決器に保留と指定した"
 "パッケージを無視します。"
 
 "保留パッケージの無視 - このグローバルオプションは、問題解決器に保留と指定した"
 "パッケージを無視します。"
 

-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:176
-msgid "Clean-Installed"
-msgstr "Clean-Installed"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:177
+#: 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 "
 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 "


@@ -6109,14 +4873,8 @@ msgstr ""
 "たパッケージの再インストール方法を、直接提供するわけではないことに注意してく"
 "ださい。"
 
 "たパッケージの再インストール方法を、直接提供するわけではないことに注意してく"
 "ださい。"
 

-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:183
-msgid "Immediate-Configure"
-msgstr "Immediate-Configure"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:184
+#: 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 "
 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 "


@@ -6171,14 +4929,9 @@ msgstr ""
 "改善のため、バグのリンクにあるディストリビューションと APT チームにも、問題の"
 "レポートをおねがいします。"
 
 "改善のため、バグのリンクにあるディストリビューションと APT チームにも、問題の"
 "レポートをおねがいします。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
-msgid "Force-LoopBreak"
-msgstr "Force-LoopBreak"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:207
+#: 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/"
 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/"


@@ -6193,52 +4946,37 @@ msgstr ""
 "可欠パッケージを一時的に削除してループを抜けられるようにします。<emphasis>そ"
 "んなループはあり得ないはずで、あるとすれば重大なバグです。</emphasis>このオプ"
 "ションは、tar, gzip, libc, dpkg, bash とそれらが依存しているパッケージ以外の"
 "可欠パッケージを一時的に削除してループを抜けられるようにします。<emphasis>そ"
 "んなループはあり得ないはずで、あるとすれば重大なバグです。</emphasis>このオプ"
 "ションは、tar, gzip, libc, dpkg, bash とそれらが依存しているパッケージ以外の"

-"不可欠パッケージで動作します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:215
-msgid "Cache-Start, Cache-Grow and Cache-Limit"
-msgstr ""
+"不可欠パッケージで動作します。"

 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:217

 msgid ""
 "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 "
 msgid ""
 "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 these amount of space need to be available for APT otherwise it will "
-"likely fail ungracefully, so for memory restricted devices these value "
-"should be lowered while on systems with a lot of configured sources this "
-"might be increased.  <literal>Cache-Grow</literal> defines in byte 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."
+"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 ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:231
-msgid "Build-Essential"
-msgstr "Build-Essential"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:233

 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr "構築依存関係で不可欠なパッケージを定義します。"
 
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr "構築依存関係で不可欠なパッケージを定義します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
-msgid "Get"
-msgstr "Get"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:236
+#: 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."
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."


@@ -6246,14 +4984,9 @@ msgstr ""
 "Get サブセクションは &apt-get; ツールを制御します。このオプションの詳細は "
 "&apt-get; の文書を参照してください。"
 
 "Get サブセクションは &apt-get; ツールを制御します。このオプションの詳細は "
 "&apt-get; の文書を参照してください。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
-msgid "Cache"
-msgstr "Cache"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:241
+#: 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."
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."


@@ -6261,14 +4994,9 @@ msgstr ""
 "Cache サブセクションは &apt-cache; ツールを制御します。このオプションの詳細"
 "は &apt-cache; の文書を参照してください。"
 
 "Cache サブセクションは &apt-cache; ツールを制御します。このオプションの詳細"
 "は &apt-cache; の文書を参照してください。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245
-msgid "CDROM"
-msgstr "CDROM"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:246
+#: 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."
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."


@@ -6278,17 +5006,28 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:252
+#: apt.conf.5.xml:253

 msgid "The Acquire Group"
 msgstr "Acquire グループ"
 
 msgid "The Acquire Group"
 msgstr "Acquire グループ"
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:257
-msgid "Check-Valid-Until"
-msgstr "Check-Valid-Until"
+# 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>
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:258
+#: 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 "
 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 "


@@ -6299,31 +5038,19 @@ msgid ""
 "<literal>Max-ValidTime</literal> option can be used."
 msgstr ""
 
 "<literal>Max-ValidTime</literal> option can be used."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:268
-msgid "Max-ValidTime"
-msgstr "Max-ValidTime"
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:269
+#: 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</"
 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\".  Archive specific settings can be "
-"made by appending the label of the archive to the option name."
+"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 ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:279
-#, fuzzy
-#| msgid "Max-ValidTime"
-msgid "Min-ValidTime"
-msgstr "Max-ValidTime"
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:280
+#: 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 "
 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 "


@@ -6333,13 +5060,8 @@ msgid ""
 "should be used by appending the label of the archive to the option name."
 msgstr ""
 
 "should be used by appending the label of the archive to the option name."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:290
-msgid "PDiffs"
-msgstr "PDiffs"
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:291
+#: 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."
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."


@@ -6349,11 +5071,19 @@ msgstr ""
 "ルトでは True です。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 "ルトでは True です。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:294
+#: 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 "
 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 "
+"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."
 "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."


@@ -6364,14 +5094,9 @@ msgstr ""
 "パッチサイズの最大パーセンテージを指定します。どちらの制限を超えても、パッチ"
 "をダウンロードする代わりに、完全なファイルをダウンロードします。"
 
 "パッチサイズの最大パーセンテージを指定します。どちらの制限を超えても、パッチ"
 "をダウンロードする代わりに、完全なファイルをダウンロードします。"
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:303
-msgid "Queue-Mode"
-msgstr "Queue-Mode"
-

 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:304
+#: 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 "
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "


@@ -6384,15 +5109,9 @@ msgstr ""
 "<literal>host</literal> は、ターゲットホストごとに 1 接続を開きます。"
 "<literal>access</literal> は、URI タイプごとに 1 接続を開きます。"
 
 "<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:311
-msgid "Retries"
-msgstr "Retries"
-

 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 # 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
+#: 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."
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."


@@ -6400,14 +5119,9 @@ msgstr ""
 "リトライの回数を設定します。0 でない場合、APT は失敗したファイルに対して、与"
 "えられた回数だけリトライを行います。"
 
 "リトライの回数を設定します。0 でない場合、APT は失敗したファイルに対して、与"
 "えられた回数だけリトライを行います。"
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:316
-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>
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:317
+#: 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."
 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."


@@ -6416,15 +5130,9 @@ msgstr ""
 "き、可能ならコピーの代わりにシンボリックリンクを張ります。true がデフォルトで"
 "す。"
 
 "き、可能ならコピーの代わりにシンボリックリンクを張ります。true がデフォルトで"
 "す。"
 

-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:321 sources.list.5.xml:155
-msgid "http"
-msgstr "http"
-

 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:322
+#: 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 "
 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 "


@@ -6442,7 +5150,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:330
+#: 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 "
 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 "


@@ -6467,7 +5175,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:340 apt.conf.5.xml:404
+#: 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 "
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "


@@ -6477,29 +5185,28 @@ msgstr ""
 "設定します。これには、接続のタイムアウトとデータのタイムアウトが含まれていま"
 "す。"
 
 "設定します。これには、接続のタイムアウトとデータのタイムアウトが含まれていま"
 "す。"
 

-# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

 #. 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
-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:351
 msgid ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: 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 "
 "which deactivates the limit and tries uses as much as possible of the "
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobyte. The default value is 0 "
 "which deactivates the limit and tries uses as much as possible of the "


@@ -6512,7 +5219,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:356
+#: 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 "
 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 "


@@ -6522,14 +5229,8 @@ msgstr ""
 "場合、<literal>Acquire::http::User-Agent</literal> を使用して、http でダウン"
 "ロードするための、異なる User-Agent を設定できます。"
 
 "場合、<literal>Acquire::http::User-Agent</literal> を使用して、http でダウン"
 "ロードするための、異なる User-Agent を設定できます。"
 

-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:362
-msgid "https"
-msgstr "https"
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:363
+#: 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 "
 msgid ""
 "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 "options are the same as for <literal>http</literal> method and will also "


@@ -6544,7 +5245,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:369
+#: 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 "
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "


@@ -6579,15 +5280,9 @@ msgstr ""
 "を上書きします。'TLSv1' か 'SSLv3' という文字列を指定できます。<literal>&lt;"
 "host&gt;::SslForceVersion</literal> は、対応するホストごとのオプションです。"
 
 "を上書きします。'TLSv1' か 'SSLv3' という文字列を指定できます。<literal>&lt;"
 "host&gt;::SslForceVersion</literal> は、対応するホストごとのオプションです。"
 

-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:387 sources.list.5.xml:166
-msgid "ftp"
-msgstr "ftp"
-

 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:388
+#: 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 "
 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 "


@@ -6620,7 +5315,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:407
+#: 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 "
 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 "


@@ -6636,7 +5331,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:414
+#: 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 "
 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 "


@@ -6650,7 +5345,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:419
+#: 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 "
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "


@@ -6665,24 +5360,18 @@ msgstr ""
 "このコマンドを使用します。ほとんどの FTP サーバは RFC2428 をサポートしていな"
 "いことに注意してください。"
 
 "このコマンドを使用します。ほとんどの FTP サーバは RFC2428 をサポートしていな"
 "いことに注意してください。"
 

-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426 sources.list.5.xml:148
-msgid "cdrom"
-msgstr "cdrom"
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>

-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:435

 #, no-wrap
 msgid "/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>
 #, no-wrap
 msgid "/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:427
+#: apt.conf.5.xml:430

 msgid ""
 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 "
 "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 "


@@ -6690,23 +5379,18 @@ msgid ""
 "cdrom block. It is important to have the trailing slash. Unmount commands "
 "can be specified using UMount."
 msgstr ""
 "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 ドライブのマウントポイントを "
-"<literal>cdrom::Mount</literal> に設定しなければなりません。(SMB マウントや古"
-"い mount パッケージなど) マウントポイントが fstab に記述できない場合、かわり"
-"にマウント・アンマウントコマンドも使用できます。構文は、cdrom ブロックを "
-"<placeholder type=\"literallayout\" id=\"0\"/> の形で記述します。スラッシュを"
-"後につけるのが重要です。アンマウントコマンドは UMount で指定することができま"
-"す。"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:437
-msgid "gpgv"
-msgstr "gpgv"
+"CD-ROM URI - CD-ROM URI はマウントポイントの設定のみを行います。<filename>/"
+"etc/fstab</filename> で設定されているように、CD-ROM ドライブのマウントポイン"
+"トを <literal>cdrom::Mount</literal> に設定しなければなりません。(SMB マウン"
+"トや古い mount パッケージなど) マウントポイントが fstab に記述できない場合、"
+"かわりにマウント・アンマウントコマンドも使用できます。構文は、cdrom ブロック"
+"を <placeholder type=\"literallayout\" id=\"0\"/> の形で記述します。スラッ"
+"シュを後につけるのが重要です。アンマウントコマンドは UMount で指定することが"
+"できます。"

 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:438
+#: 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 "
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "


@@ -6716,19 +5400,14 @@ msgstr ""
 "ションです。<literal>gpgv::Options</literal> が gpgv に渡す追加オプションで"
 "す。"
 
 "ションです。<literal>gpgv::Options</literal> が gpgv に渡す追加オプションで"
 "す。"
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:443
-msgid "CompressionTypes"
-msgstr "CompressionTypes"
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>

-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:452

 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:444
+#: 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 "
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "


@@ -6746,19 +5425,19 @@ msgstr ""
 "す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 "す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>

-#: apt.conf.5.xml:454
+#: apt.conf.5.xml:457

 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>

-#: apt.conf.5.xml:457
+#: apt.conf.5.xml:460

 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:450
+#: 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 "
 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 "


@@ -6786,13 +5465,13 @@ msgstr ""
 "<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
 "<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>

-#: apt.conf.5.xml:461
+#: apt.conf.5.xml:464

 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:462

 #, fuzzy
 #| msgid ""
 #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 #, fuzzy
 #| msgid ""
 #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"


@@ -6828,21 +5507,15 @@ 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:466
+#: apt.conf.5.xml:469

 msgid ""
 "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 ""
 
 msgid ""
 "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: <tag></tag>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:471
-msgid "GzipIndexes"
-msgstr "GzipIndexes"
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:476

 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "


@@ -6850,13 +5523,8 @@ msgid ""
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
 
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:480
-msgid "Languages"
-msgstr "Languages"
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:481
+#: 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-"
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the Description-"


@@ -6869,13 +5537,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>

-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:500

 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:487
+#: apt.conf.5.xml:490

 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: It will be "
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: It will be "


@@ -6897,34 +5565,41 @@ msgid ""
 "\"0\"/>"
 msgstr ""
 
 "\"0\"/>"
 msgstr ""
 

-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:253
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:501

 msgid ""
 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 ""
 msgstr ""

-"オプションの <literal>Acquire</literal> グループは、パッケージのダウンロード"
-"や URI ハンドラの制御を行います。<placeholder type=\"variablelist\" id=\"0\"/"
-">"

 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><title>
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:512

 msgid "Directories"
 msgstr "ディレクトリ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 msgid "Directories"
 msgstr "ディレクトリ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:506
+#: 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 "
 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> は、ダウンロードしたパッケージ一覧"
 msgstr ""
 "<literal>Dir::State</literal> セクションは、ローカル状態情報に関するディレク"
 "トリを保持します。<literal>lists</literal> は、ダウンロードしたパッケージ一覧"


@@ -6936,7 +5611,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:513
+#: 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> "
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "


@@ -6958,7 +5633,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:522
+#: 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 "
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "


@@ -6973,7 +5648,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:528
+#: 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 "
 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 "


@@ -6985,7 +5660,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:532
+#: 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 "
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "


@@ -7003,7 +5678,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:540
+#: 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 "
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "


@@ -7023,7 +5698,7 @@ msgstr ""
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。"
 
 #. type: Content of: <refentry><refsect1><para>
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:553
+#: 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 "
 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 "


@@ -7035,13 +5710,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:570

 msgid "APT in DSelect"
 msgstr "DSelect での APT"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 msgid "APT in DSelect"
 msgstr "DSelect での APT"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:564
+#: 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> "
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "


@@ -7050,14 +5725,9 @@ msgstr ""
 "&dselect; 上で APT を使用する際、<literal>DSelect</literal> セクション以下の"
 "設定項目で、デフォルトの動作を制御します。"
 
 "&dselect; 上で APT を使用する際、<literal>DSelect</literal> セクション以下の"
 "設定項目で、デフォルトの動作を制御します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:568
-msgid "Clean"
-msgstr "Clean"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:569
+#: 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 "
 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 "


@@ -7074,7 +5744,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:578
+#: 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."
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."


@@ -7082,15 +5752,9 @@ msgstr ""
 "この変数の内容は、install 時のコマンドラインオプションと同様に &apt-get; に渡"
 "されます。"
 
 "この変数の内容は、install 時のコマンドラインオプションと同様に &apt-get; に渡"
 "されます。"
 

-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:582
-msgid "Updateoptions"
-msgstr "Updateoptions"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:583
+#: 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."
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."


@@ -7098,14 +5762,9 @@ msgstr ""
 "この変数の内容は、update 時のコマンドラインオプションと同様に &apt-get; に渡"
 "されます。"
 
 "この変数の内容は、update 時のコマンドラインオプションと同様に &apt-get; に渡"
 "されます。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:587
-msgid "PromptAfterUpdate"
-msgstr "PromptAfterUpdate"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:588
+#: 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."
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."


@@ -7115,13 +5774,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:594
+#: 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>
 msgid "How APT calls dpkg"
 msgstr "APT が dpkg を呼ぶ方法"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:603

 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."


@@ -7131,7 +5790,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:600
+#: 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 "
 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 "


@@ -7140,19 +5799,9 @@ msgstr ""
 "dpkg に渡すオプションのリストです。オプションは、リスト記法を使用して指定しな"
 "ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
 
 "dpkg に渡すオプションのリストです。オプションは、リスト記法を使用して指定しな"
 "ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:605
-msgid "Pre-Invoke"
-msgstr "Pre-Invoke"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:605
-msgid "Post-Invoke"
-msgstr "Post-Invoke"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:606
+#: 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 "
 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 "


@@ -7164,15 +5813,9 @@ msgstr ""
 "bin/sh</filename> を使用して呼び出され、何か問題があれば APT は異常終了しま"
 "す。"
 
 "bin/sh</filename> を使用して呼び出され、何か問題があれば APT は異常終了しま"
 "す。"
 

-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:612
-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>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:613
+#: 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 "
 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 "


@@ -7188,7 +5831,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:619
+#: 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 "
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "


@@ -7202,15 +5845,9 @@ msgstr ""
 "バージョン 2 を有効にできます。<literal>cmd</literal> は <literal>Pre-"
 "Install-Pkgs</literal> で与えられるコマンドです。"
 
 "バージョン 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:626
-msgid "Run-Directory"
-msgstr "Run-Directory"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:635

 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."
 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."


@@ -7218,15 +5855,9 @@ msgstr ""
 "APT は dpkg を呼び出す前にこのディレクトリに移動します。デフォルトは "
 "<filename>/</filename> です。"
 
 "APT は dpkg を呼び出す前にこのディレクトリに移動します。デフォルトは "
 "<filename>/</filename> です。"
 

-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:631
-msgid "Build-options"
-msgstr "Build-options"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:632
+#: 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."
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."


@@ -7235,12 +5866,12 @@ msgstr ""
 "ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:645

 msgid "dpkg trigger usage (and related options)"
 msgstr "dpkg トリガの使い方 (および関連オプション)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "dpkg trigger usage (and related options)"
 msgstr "dpkg トリガの使い方 (および関連オプション)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:646

 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
 "multiple calls of dpkg. Without further options dpkg will use triggers only "
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
 "multiple calls of dpkg. Without further options dpkg will use triggers only "


@@ -7255,7 +5886,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>

-#: apt.conf.5.xml:653
+#: apt.conf.5.xml:661

 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"


@@ -7269,7 +5900,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt.conf.5.xml:647
+#: 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 "
 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 "


@@ -7282,13 +5913,8 @@ msgid ""
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:659
-msgid "DPkg::NoTriggers"
-msgstr "DPkg::NoTriggers"
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:660
+#: 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 "
 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 "


@@ -7299,14 +5925,8 @@ msgid ""
 "dpkg - now apt will add these flag also to the unpack and remove calls."
 msgstr ""
 
 "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:667
-msgid "PackageManager::Configure"
-msgstr "PackageManager::Configure"
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:668
+#: 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 "
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "


@@ -7321,14 +5941,8 @@ msgid ""
 "the system could end in an unconfigured status which could be unbootable!"
 msgstr ""
 
 "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:678
-msgid "DPkg::ConfigurePending"
-msgstr "DPkg::ConfigurePending"
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:679
+#: 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 "
 msgid ""
 "If this option is set apt will call <command>dpkg --configure --pending</"
 "command> to let dpkg handle all required configurations and triggers. This "


@@ -7338,13 +5952,8 @@ msgid ""
 "you could deactivate this option in all but the last run."
 msgstr ""
 
 "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:685
-msgid "DPkg::TriggersPending"
-msgstr "DPkg::TriggersPending"
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:686
+#: 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 "
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "


@@ -7353,13 +5962,8 @@ msgid ""
 "triggers, not only the triggers needed to configure this package."
 msgstr ""
 
 "triggers, not only the triggers needed to configure this package."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:691
-msgid "PackageManager::UnpackAll"
-msgstr "PackageManager::UnpackAll"
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:692
+#: 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-"
 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-"


@@ -7370,13 +5974,8 @@ msgid ""
 "really useful."
 msgstr ""
 
 "really useful."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:699
-msgid "OrderList::Score::Immediate"
-msgstr "OrderList::Score::Immediate"
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>

-#: apt.conf.5.xml:707
+#: apt.conf.5.xml:715

 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"


@@ -7394,7 +5993,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:700
+#: 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 "
 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 "


@@ -7408,12 +6007,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:728

 msgid "Periodic and Archives options"
 msgstr "Periodic オプションと Archives オプション"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Periodic and Archives options"
 msgstr "Periodic オプションと Archives オプション"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:721
+#: 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 "
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "


@@ -7427,12 +6026,12 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:737

 msgid "Debug options"
 msgstr "デバッグオプション"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Debug options"
 msgstr "デバッグオプション"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:731
+#: 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 "
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "


@@ -7443,7 +6042,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>

-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:750

 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"


@@ -7454,7 +6053,7 @@ msgstr ""
 "にします。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 "にします。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>

-#: apt.conf.5.xml:750
+#: 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</"
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"


@@ -7465,7 +6064,7 @@ msgstr ""
 "literal>) を行う場合に使用します。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 "literal>) を行う場合に使用します。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>

-#: apt.conf.5.xml:759
+#: apt.conf.5.xml:767

 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."


@@ -7477,81 +6076,51 @@ msgstr ""
 #.        motivating example, except I haven't a clue why you'd want
 #.        to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #.        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:767
+#: apt.conf.5.xml:775

 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "

-"in CDROM IDs."
+"in CD-ROM IDs."

 msgstr ""
 msgstr ""

-"<literal>Debug::IdentCdrom</literal> は CDROM ID にある statfs データの方gain"
-"を無効にします。"
+"<literal>Debug::IdentCdrom</literal> は CD-ROM ID にある statfs データの方"
+"gainを無効にします。"

 
 #. type: Content of: <refentry><refsect1><para>
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:777
+#: apt.conf.5.xml:785

 msgid "A full list of debugging options to apt follows."
 msgstr "以下は apt に対するデバッグオプションのすべてです。"
 
 msgid "A full list of debugging options to apt follows."
 msgstr "以下は apt に対するデバッグオプションのすべてです。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:782
-msgid "<literal>Debug::Acquire::cdrom</literal>"
-msgstr "<literal>Debug::Acquire::cdrom</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:794

 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
 
 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:793
-msgid "<literal>Debug::Acquire::ftp</literal>"
-msgstr "<literal>Debug::Acquire::ftp</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:805

 msgid "Print information related to downloading packages using FTP."
 msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 msgid "Print information related to downloading packages using FTP."
 msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:804
-msgid "<literal>Debug::Acquire::http</literal>"
-msgstr "<literal>Debug::Acquire::http</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:816

 msgid "Print information related to downloading packages using HTTP."
 msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 msgid "Print information related to downloading packages using HTTP."
 msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:815
-msgid "<literal>Debug::Acquire::https</literal>"
-msgstr "<literal>Debug::Acquire::https</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:827

 msgid "Print information related to downloading packages using HTTPS."
 msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
 
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:826
-msgid "<literal>Debug::Acquire::gpgv</literal>"
-msgstr "<literal>Debug::Acquire::gpgv</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:838

 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
 
 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:837
-msgid "<literal>Debug::aptcdrom</literal>"
-msgstr "<literal>Debug::aptcdrom</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:849

 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."


@@ -7559,36 +6128,21 @@ msgstr ""
 "CD-ROM にあるパッケージ集合に対して、アクセスするプロセスについての情報を出力"
 "します。"
 
 "CD-ROM にあるパッケージ集合に対して、アクセスするプロセスについての情報を出力"
 "します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:848
-msgid "<literal>Debug::BuildDeps</literal>"
-msgstr "<literal>Debug::BuildDeps</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:859

 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
 
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:858
-msgid "<literal>Debug::Hashes</literal>"
-msgstr "<literal>Debug::Hashes</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:861
+#: apt.conf.5.xml:869

 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 "<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。"
 
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 "<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:868
-msgid "<literal>Debug::IdentCDROM</literal>"
-msgstr "<literal>Debug::IdentCDROM</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:871
+#: 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 "
 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 "


@@ -7597,13 +6151,8 @@ msgstr ""
 "CD-ROM の ID を生成する際に <literal>statfs</literal> という、CD-ROM ファイル"
 "システムにある使用済・未使用ブロックの数からの情報を含めないようにします。"
 
 "CD-ROM の ID を生成する際に <literal>statfs</literal> という、CD-ROM ファイル"
 "システムにある使用済・未使用ブロックの数からの情報を含めないようにします。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:879
-msgid "<literal>Debug::NoLocking</literal>"
-msgstr "<literal>Debug::NoLocking</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:882
+#: 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."
 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."


@@ -7611,24 +6160,14 @@ msgstr ""
 "ファイルのロックをすべて無効にします。例えば、同時にふたつの "
 "<quote><literal>apt-get update</literal></quote> を実行できるようになります。"
 
 "ファイルのロックをすべて無効にします。例えば、同時にふたつの "
 "<quote><literal>apt-get update</literal></quote> を実行できるようになります。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:890
-msgid "<literal>Debug::pkgAcquire</literal>"
-msgstr "<literal>Debug::pkgAcquire</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:894
+#: apt.conf.5.xml:902

 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。"
 
 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:901
-msgid "<literal>Debug::pkgAcquire::Auth</literal>"
-msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:904
+#: apt.conf.5.xml:912

 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."


@@ -7636,13 +6175,8 @@ msgstr ""
 "ダウンロードしたファイルのチェックサムや暗号署名の確認に関する、状態メッセー"
 "ジやエラーを出力します。"
 
 "ダウンロードしたファイルのチェックサムや暗号署名の確認に関する、状態メッセー"
 "ジやエラーを出力します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:911
-msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
-msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:914
+#: apt.conf.5.xml:922

 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."


@@ -7650,13 +6184,8 @@ msgstr ""
 "パッケージインデックスリスト差分のダウンロード・適用時の、情報やエラーを出力"
 "します。"
 
 "パッケージインデックスリスト差分のダウンロード・適用時の、情報やエラーを出力"
 "します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:922
-msgid "<literal>Debug::pkgAcquire::RRed</literal>"
-msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:926
+#: apt.conf.5.xml:934

 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."


@@ -7664,25 +6193,15 @@ msgstr ""
 "インデックス全体ではなくインデックス差分のダウンロードの際に、apt パッケージ"
 "リストへのパッチ適用に関する情報を出力します。"
 
 "インデックス全体ではなくインデックス差分のダウンロードの際に、apt パッケージ"
 "リストへのパッチ適用に関する情報を出力します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:933
-msgid "<literal>Debug::pkgAcquire::Worker</literal>"
-msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:937
+#: apt.conf.5.xml:945

 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 "実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。"
 
 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:944
-msgid "<literal>Debug::pkgAutoRemove</literal>"
-msgstr "<literal>Debug::pkgAutoRemove</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:948
+#: apt.conf.5.xml:956

 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."


@@ -7690,13 +6209,8 @@ msgstr ""
 "パッケージの自動インストールや、不要パッケージの削除に関するイベントを、ログ"
 "に出力します。"
 
 "パッケージの自動インストールや、不要パッケージの削除に関するイベントを、ログ"
 "に出力します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:955
-msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:958
+#: 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-"
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"


@@ -7710,13 +6224,8 @@ msgstr ""
 "ば <literal>apt-get install</literal> で実行された、初期の自動インストール経"
 "路に対応しています。"
 
 "ば <literal>apt-get install</literal> で実行された、初期の自動インストール経"
 "路に対応しています。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:969
-msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:972
+#: 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 "
 msgid ""
 "Generate debug messages describing which package is marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "


@@ -7732,23 +6241,13 @@ msgid ""
 "<literal>section</literal> is the name of the section the package appears in."
 msgstr ""
 
 "<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:991
-msgid "<literal>Debug::pkgInitConfig</literal>"
-msgstr "<literal>Debug::pkgInitConfig</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:994
+#: apt.conf.5.xml:1002

 msgid "Dump the default configuration to standard error on startup."
 msgstr "起動時に、標準エラー出力へデフォルト設定を出力します。"
 
 msgid "Dump the default configuration to standard error on startup."
 msgstr "起動時に、標準エラー出力へデフォルト設定を出力します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1001
-msgid "<literal>Debug::pkgDPkgPM</literal>"
-msgstr "<literal>Debug::pkgDPkgPM</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1004
+#: 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."
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."


@@ -7756,13 +6255,8 @@ msgstr ""
 "&dpkg; 起動時に、起動した際の正確なコマンドラインを出力します。引数は空白で区"
 "切られます。"
 
 "&dpkg; 起動時に、起動した際の正確なコマンドラインを出力します。引数は空白で区"
 "切られます。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1012
-msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1015
+#: 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."
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."


@@ -7770,13 +6264,8 @@ msgstr ""
 "状態ファイルディスクリプタに、&dpkg; から受信したすべてのデータと、そのデータ"
 "を解析中に発生したエラーを出力します。"
 
 "状態ファイルディスクリプタに、&dpkg; から受信したすべてのデータと、そのデータ"
 "を解析中に発生したエラーを出力します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1022
-msgid "<literal>Debug::pkgOrderList</literal>"
-msgstr "<literal>Debug::pkgOrderList</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1026
+#: 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;."
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."


@@ -7784,34 +6273,19 @@ msgstr ""
 "<literal>apt</literal> が &dpkg; にパッケージを渡す順番を決める、アルゴリズム"
 "のトレースを生成します。"
 
 "<literal>apt</literal> が &dpkg; にパッケージを渡す順番を決める、アルゴリズム"
 "のトレースを生成します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1034
-msgid "<literal>Debug::pkgPackageManager</literal>"
-msgstr "<literal>Debug::pkgPackageManager</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1046

 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。"
 
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1045
-msgid "<literal>Debug::pkgPolicy</literal>"
-msgstr "<literal>Debug::pkgPolicy</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1049
+#: apt.conf.5.xml:1057

 msgid "Output the priority of each package list on startup."
 msgstr "起動時の各パッケージの優先度を表示します。"
 
 msgid "Output the priority of each package list on startup."
 msgstr "起動時の各パッケージの優先度を表示します。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1055
-msgid "<literal>Debug::pkgProblemResolver</literal>"
-msgstr "<literal>Debug::pkgProblemResolver</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1059
+#: 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)."
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."


@@ -7819,26 +6293,16 @@ msgstr ""
 "依存関係解決システムの実行内容を追跡します (これは複雑な依存関係の問題に遭遇"
 "した場合にのみ、適用されます)。"
 
 "依存関係解決システムの実行内容を追跡します (これは複雑な依存関係の問題に遭遇"
 "した場合にのみ、適用されます)。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1067
-msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1070
+#: 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 ""
 
 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:1078
-msgid "<literal>Debug::sourceList</literal>"
-msgstr "<literal>Debug::sourceList</literal>"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1090

 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."


@@ -7848,7 +6312,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1113

 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."


@@ -7856,33 +6320,13 @@ msgstr ""
 "&configureindex; に、全利用可能オプションのデフォルト値を参照できる、設定ファ"
 "イルのサンプルがあります。"
 
 "&configureindex; に、全利用可能オプションのデフォルト値を参照できる、設定ファ"
 "イルのサンプルがあります。"
 

-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1112
-msgid "&file-aptconf;"
-msgstr "&file-aptconf;"
-

 # type: Content of: <refentry><refsect1><para>
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
 # type: Content of: <refentry><refsect1><para>
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1125

 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 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:16
-msgid ""
-"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
-msgstr ""
-"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
-
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt_preferences.5.xml:24 apt_preferences.5.xml:31
-msgid "apt_preferences"
-msgstr "apt_preferences"
-

 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt_preferences.5.xml:32
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt_preferences.5.xml:32


@@ -8029,6 +6473,22 @@ msgstr ""
 "に注意してください。例えば以下のようになります。<placeholder type="
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 "に注意してください。例えば以下のようになります。<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
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:106


@@ -8086,18 +6546,6 @@ msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。"
 
 "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:101
-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:132
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:132


@@ -8440,20 +6888,15 @@ msgstr ""
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml:273
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml:273

-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
+#, no-wrap

 msgid ""
 "Package: gnome* /kde/\n"
 "Pin: release n=experimental\n"
 "Pin-Priority: 500\n"
 msgstr ""
 msgid ""
 "Package: gnome* /kde/\n"
 "Pin: release n=experimental\n"
 "Pin-Priority: 500\n"
 msgstr ""

-"Package: *\n"
-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-"\n"
+"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
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:279


@@ -8466,48 +6909,57 @@ msgstr ""
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml:285
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml:285

-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release a=unstable\n"
-#| "Pin-Priority: 50\n"
+#, no-wrap

 msgid ""
 "Package: *\n"
 "Pin: release n=karmic*\n"
 "Pin-Priority: 990\n"
 msgstr ""
 "Package: *\n"
 msgid ""
 "Package: *\n"
 "Pin: release n=karmic*\n"
 "Pin-Priority: 990\n"
 msgstr ""
 "Package: *\n"

-"Pin: release a=unstable\n"
-"Pin-Priority: 50\n"
-"\n"
-
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-#, fuzzy
-#| msgid "Packages"
-msgid "Package"
-msgstr "Packages"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"

 
 

-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
+#. 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>
 msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:307

 msgid "How APT Interprets Priorities"
 msgstr "APT が優先度に割り込む方法"
 
 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>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:314
+#: 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>
 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:315
+#: apt_preferences.5.xml:316

 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"


@@ -8515,13 +6967,13 @@ msgstr ""
 "パッケージがダウングレードしても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "パッケージがダウングレードしても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:319
+#: 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>
 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:320
+#: 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"
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"


@@ -8530,13 +6982,13 @@ msgstr ""
 "含まれなくても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "含まれなくても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:325
+#: 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>
 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:326
+#: 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"
 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"


@@ -8545,13 +6997,13 @@ msgstr ""
 "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:331
+#: 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>
 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:332
+#: 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"
 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"


@@ -8561,13 +7013,13 @@ msgstr ""
 "ル"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "ル"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:337
+#: 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>
 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:338
+#: apt_preferences.5.xml:339

 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"


@@ -8576,31 +7028,19 @@ msgstr ""
 "ンストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "ンストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:342
+#: 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>
 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:343
+#: 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>
 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:309
-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:348
+#: 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 "
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "


@@ -8614,7 +7054,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:355

 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"


@@ -8624,7 +7064,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 
 # type: Content of: <refentry><refsect1><refsect2><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>

-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:359

 #, no-wrap
 msgid ""
 "Package: perl\n"
 #, no-wrap
 msgid ""
 "Package: perl\n"


@@ -8654,13 +7094,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:371
+#: 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>
 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:373
+#: 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 "
 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 "


@@ -8675,7 +7115,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:378
+#: 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 "
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "


@@ -8687,7 +7127,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:382
+#: 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</"
 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</"


@@ -8701,13 +7141,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:392
+#: 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>
 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:394
+#: 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 "
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "


@@ -8717,57 +7157,89 @@ msgstr ""
 "述した、<filename>Packages</filename> ファイルや <filename>Release</"
 "filename> ファイルを提供します。"
 
 "述した、<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>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:406
+#: 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>
 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:407
+#: apt_preferences.5.xml:408

 msgid "gives the package name"
 msgstr "パッケージ名"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgid "gives the package name"
 msgstr "パッケージ名"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: 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>
 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:411
+#: 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>
 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:398
+#: apt_preferences.5.xml:417
+#, fuzzy

 msgid ""
 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 ""
 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>
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:427
+#: 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>
 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:428
+#: 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 "
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "


@@ -8784,19 +7256,19 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 
 # 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:438
+#: 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>
 #, 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:444
+#: 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>
 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:445
+#: apt_preferences.5.xml:446

 #, fuzzy
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 #, fuzzy
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "


@@ -8814,18 +7286,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 
 # 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:454
+#: apt_preferences.5.xml:455

 #, no-wrap
 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>
 #, no-wrap
 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:461
+#: apt_preferences.5.xml:462

 msgid ""
 "names the release version.  For example, the packages in the tree might "
 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 ""
 "literal> distributions because they have not been released yet.  Specifying "
 "this in the APT preferences file would require one of the following lines."
 msgstr ""


@@ -8837,7 +7309,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 
 # 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:470
+#: apt_preferences.5.xml:471

 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"


@@ -8850,13 +7322,13 @@ msgstr ""
 "\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:479
+#: 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>
 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:480
+#: 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 "
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "


@@ -8874,19 +7346,19 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 
 # 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:489
+#: 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>
 #, 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:495
+#: 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>
 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:496
+#: 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</"
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"


@@ -8899,7 +7371,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 
 # 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:502
+#: apt_preferences.5.xml:503

 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""


@@ -8907,13 +7379,13 @@ msgstr ""
 "\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:508
+#: 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>
 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:509
+#: 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</"
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"


@@ -8926,7 +7398,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 
 # 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:515
+#: apt_preferences.5.xml:516

 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""


@@ -8935,31 +7407,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:416
-#, 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/&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: <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 優先度の設定に関連します。"
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-
-# type: Content of: <refentry><refsect1><refsect2><para>
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: 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 "
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "


@@ -8985,13 +7433,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:535
+#: 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>
 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:537
+#: 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 "
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "


@@ -9002,13 +7450,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:546
+#: 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>
 msgid "Tracking Stable"
 msgstr "安定版の追跡"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:555

 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"


@@ -9034,7 +7482,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:548
+#: 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 "
 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 "


@@ -9050,8 +7498,8 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 
 # 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:617
-#: apt_preferences.5.xml:675
+#: 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"
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"


@@ -9064,7 +7512,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:566
+#: 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 "
 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 "


@@ -9077,14 +7525,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:583
+#: 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>
 #, 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:577
+#: 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 "
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "


@@ -9098,13 +7546,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:589
+#: 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>
 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:598
+#: apt_preferences.5.xml:599

 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"


@@ -9133,7 +7581,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:591
+#: 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 "
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "


@@ -9151,7 +7599,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:612
+#: 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 "
 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 "


@@ -9164,14 +7612,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:632
+#: 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>
 #, 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:623
+#: 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.  "
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "


@@ -9190,13 +7638,13 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:640

 msgid "Tracking the evolution of a codename release"
 msgstr "コード名リリースの進化の追跡"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgid "Tracking the evolution of a codename release"
 msgstr "コード名リリースの進化の追跡"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:654

 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"


@@ -9230,7 +7678,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:641
+#: 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 "
 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 "


@@ -9254,7 +7702,7 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:670
+#: 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 "
 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 "


@@ -9267,14 +7715,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:690
+#: 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>
 #, 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:681
+#: apt_preferences.5.xml:682

 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "


@@ -9292,24 +7740,12 @@ msgstr ""
 "literal> バージョンのパッケージが更新されていれば <literal>sid</literal>の最"
 "新版にアップグレードします。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 "literal> バージョンのパッケージが更新されていれば <literal>sid</literal>の最"
 "新版にアップグレードします。<placeholder type=\"programlisting\" id=\"0\"/>"
 

-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
-msgid "&file-preferences;"
-msgstr "&file-preferences;"
-

 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:706

 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 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:25 sources.list.5.xml:32
-msgid "sources.list"
-msgstr "sources.list"
-

 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: sources.list.5.xml:33
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: sources.list.5.xml:33


@@ -9322,13 +7758,13 @@ msgstr "APT 用パッケージリソースリスト"
 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 "
 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 ""
 "このパッケージリソースリストは、システムで使用するパッケージの保管場所を特定"
 msgstr ""
 "このパッケージリソースリストは、システムで使用するパッケージの保管場所を特定"

-"するのに使用されます。今回このマニュアルページには、Debian GNU/Linux システム"
-"ã\81§ä½¿ç\94¨ã\81\99ã\82\8bã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\82·ã\82¹ã\83\86ã\83 ã\81«ã\81¤ã\81\84ã\81¦ã\81®ã\81¿è¨\98è¿°ã\81\97ã\81¾ã\81\99ã\80\82ã\81\93ã\81®å\88¶å¾¡ã\83\95ã\82¡ã\82¤ã\83«ã\81¯ã\80\81"
-"<filename>/etc/apt/sources.list</filename> にあります。"
+"するのに使用されます。今回このマニュアルページには、Debian システムで使用する"
+"ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\82·ã\82¹ã\83\86ã\83 ã\81«ã\81¤ã\81\84ã\81¦ã\81®ã\81¿è¨\98è¿°ã\81\97ã\81¾ã\81\99ã\80\82ã\81\93ã\81®å\88¶å¾¡ã\83\95ã\82¡ã\82¤ã\83«ã\81¯ã\80\81<filename>/etc/"
+"apt/sources.list</filename> にあります。"

 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>


@@ -9531,9 +7967,20 @@ msgid ""
 "will be downloaded."
 msgstr ""
 
 "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>
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:123
+#: 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 "
 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 "


@@ -9547,12 +7994,12 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:128
+#: sources.list.5.xml:133

 msgid "Some examples:"
 msgstr "例:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 msgid "Some examples:"
 msgstr "例:"
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:130
+#: sources.list.5.xml:135

 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"


@@ -9565,19 +8012,20 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: sources.list.5.xml:136
+#: sources.list.5.xml:141

 msgid "URI specification"
 msgstr "URI の仕様"
 
 msgid "URI specification"
 msgstr "URI の仕様"
 

-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:141
-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>
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:143
+#: 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 "
 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 "


@@ -9588,9 +8036,9 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:150
+#: sources.list.5.xml:154

 msgid ""
 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 ドライブを、メディア交換しながら使え"
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
 msgstr ""
 "cdrom スキームは、APT がローカル CD-ROM ドライブを、メディア交換しながら使え"


@@ -9599,7 +8047,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:157
+#: 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:"
 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:"


@@ -9616,7 +8064,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:168
+#: 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. "
 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. "


@@ -9634,14 +8082,9 @@ msgstr ""
 "イルで http を使用する際に、ftp プロキシを使用するよう設定してあっても無視さ"
 "れます。"
 
 "イルで http を使用する際に、ftp プロキシを使用するよう設定してあっても無視さ"
 "れます。"
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:177
-msgid "copy"
-msgstr "copy"
-

 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:179
+#: 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.  "
 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.  "


@@ -9651,19 +8094,9 @@ msgstr ""
 "キャッシュディレクトリにコピーするところが違います。zip ディスクを使用してい"
 "て、APT でコピーを行う場合に便利です。"
 
 "キャッシュディレクトリにコピーするところが違います。zip ディスクを使用してい"
 "て、APT でコピーを行う場合に便利です。"
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
-msgid "rsh"
-msgstr "rsh"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
-msgid "ssh"
-msgstr "ssh"
-

 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:186
+#: 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 "
 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 "


@@ -9678,36 +8111,27 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 "します。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>

-#: sources.list.5.xml:194
-msgid "more recognizable URI types"
+#: 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>
 msgstr "さらに認識できる URI タイプ"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:196
+#: sources.list.5.xml:200

 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
 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. maintains "
-"also the <literal>apt-transport-https</literal> package which provides "
+"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 "
 "access methods for https-URIs with features similar 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:138
-msgid ""
-"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
-"rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
+"other methods for using e.g. debtorrent are also available, see &apt-"
+"transport-debtorrent;."

 msgstr ""
 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>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:210
+#: 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."
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."


@@ -9716,37 +8140,37 @@ msgstr ""
 "free 用のローカル (または NFS) アーカイブを使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 "free 用のローカル (または NFS) アーカイブを使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:212
+#: 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>
 #, 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:214
+#: sources.list.5.xml:216

 msgid "As above, except this uses the unstable (development) distribution."
 msgstr "上記同様ですが、不安定版 (開発版) を使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr "上記同様ですが、不安定版 (開発版) を使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:215
+#: 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>
 #, 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:217
+#: sources.list.5.xml:219

 msgid "Source line for the above"
 msgstr "上記のソース行"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 msgid "Source line for the above"
 msgstr "上記のソース行"
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:218
+#: 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>
 #, 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:220
+#: 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 "
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "


@@ -9754,23 +8178,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:222
-#, fuzzy, no-wrap
-#| msgid ""
-#| "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"
-#| "   "
+#: 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 ""
 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 contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-"   "
+"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>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:225
+#: sources.list.5.xml:227

 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."


@@ -9780,14 +8199,14 @@ msgstr ""
 
 # type: <example></example>
 #. type: Content of: <refentry><refsect1><literallayout>
 
 # type: <example></example>
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:227
+#: 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>
 #, 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:229
+#: 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-codename;/contrib area."
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."


@@ -9797,14 +8216,14 @@ msgstr ""
 
 # type: <example></example>
 #. type: Content of: <refentry><refsect1><literallayout>
 
 # type: <example></example>
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:231
+#: sources.list.5.xml:233

 #, no-wrap
 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>
 #, no-wrap
 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:233
+#: 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 "
 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 "


@@ -9818,21 +8237,20 @@ msgstr ""
 
 # type: <example></example>
 #. type: Content of: <refentry><refsect1><literallayout>
 
 # type: <example></example>
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:237
+#: 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><literallayout>
 #, 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><literallayout>

-#: sources.list.5.xml:246
-#, fuzzy, no-wrap
-#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+#: sources.list.5.xml:248
+#, no-wrap

 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"

-msgstr "deb http://ftp.de.debian.org/debian-non-US 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>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:239
+#: sources.list.5.xml:241

 #, fuzzy
 #| msgid ""
 #| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
 #, fuzzy
 #| msgid ""
 #| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"


@@ -9861,7 +8279,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:251
+#: sources.list.5.xml:253

 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 


@@ -9909,11 +8327,11 @@ msgstr ""
 #. type: <p></p>
 #: guide.sgml:24 offline.sgml:25
 msgid ""
 #. 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 ""
 msgstr ""

-"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."

 
 #. type: <heading></heading>
 #: guide.sgml:32
 
 #. type: <heading></heading>
 #: guide.sgml:32


@@ -10006,6 +8424,12 @@ msgid ""
 "packages for installation."
 msgstr ""
 
 "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 ""
 #. type: <p></p>
 #: guide.sgml:102
 msgid ""


@@ -10047,6 +8471,12 @@ msgstr ""
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 
 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 ""
 #. type: <p></p>
 #: guide.sgml:131
 msgid ""


@@ -10059,6 +8489,12 @@ msgid ""
 "<tt>apt-get install</tt> can be used to force these packages to install."
 msgstr ""
 
 "<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 ""
 #. type: <p></p>
 #: guide.sgml:140
 msgid ""


@@ -10071,6 +8507,12 @@ msgid ""
 "anything other than its arguments are changed."
 msgstr ""
 
 "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 ""
 #. type: <p></p>
 #: guide.sgml:149
 msgid ""


@@ -10123,12 +8565,12 @@ msgid ""
 "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 "
 "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 "
 "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 "
-"is a good idea to specify it first and then specify a mirror so that you "
+"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 "
 "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>
 msgstr ""
 
 #. type: <example></example>


@@ -11049,6 +9491,140 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。"
 
 msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。"
 

+# type: Content of: <refentry><refsect1><para>
+#~ msgid "&apt-commonoptions;"
+#~ msgstr "&apt-commonoptions;"
+
+#~ msgid "&file-sourceslist; &file-statelists;"
+#~ msgstr "&file-sourceslist; &file-statelists;"
+
+# type: Content of: <refentry><refsect1><para>
+#~ 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><para>
+#~ 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><refsect2><title>
+#~ msgid "Dir Section"
+#~ msgstr "Dir セクション"
+
+# type: Content of: <refentry><refsect1><refsect2><title>
+#~ msgid "Default Section"
+#~ msgstr "Default セクション"
+
+# type: Content of: <refentry><refsect1><refsect2><title>
+#~ msgid "TreeDefault Section"
+#~ msgstr "TreeDefault セクション"
+
+# type: Content of: <refentry><refsect1><refsect2><title>
+#~ msgid "Tree Section"
+#~ msgstr "Tree セクション"
+
+#~ msgid ""
+#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+#~ "&file-statelists;"
+#~ msgstr ""
+#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+#~ "&file-statelists;"
+
+#~ msgid "&file-trustedgpg;"
+#~ msgstr "&file-trustedgpg;"
+
+# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+#, fuzzy
+#~| msgid "xvcg <replaceable>pkg(s)</replaceable>"
+#~ msgid "<replaceable>&synopsis-filename;</replaceable>"
+#~ msgstr "<replaceable>&synopsis-filename;</replaceable>"
+
+#~ msgid "  &file-extended_states;"
+#~ msgstr "  &file-extended_states;"
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "&apt-get;,&aptitude;,&apt-conf;"
+#~ msgstr "&apt-get;,&aptitude;,&apt-conf;"
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "&file-aptconf;"
+#~ msgstr "&file-aptconf;"
+
+# type: Content of: <refentry><refnamediv><refname>
+#~ msgid "&file-preferences;"
+#~ msgstr "&file-preferences;"
+
+# type: Content of: <refentry><refsect1><title>
+#~ msgid "file"
+#~ msgstr "ファイル"
+
+# type: Content of: <refentry><refnamediv><refname>
+#~ msgid "cdrom"
+#~ msgstr "cdrom"
+
+# type: <tag></tag>
+#~ msgid "http"
+#~ msgstr "http"
+
+# type: <tag></tag>
+#~ msgid "ftp"
+#~ msgstr "ftp"
+
+#~ msgid "copy"
+#~ msgstr "copy"
+
+#~ msgid "rsh"
+#~ msgstr "rsh"
+
+#~ msgid "ssh"
+#~ msgstr "ssh"
+
+# 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: 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><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: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid ""
 #~ "Update the local keyring with the keyring of Debian archive keys and "
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid ""
 #~ "Update the local keyring with the keyring of Debian archive keys and "


@@ -11057,9 +9633,6 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する
 #~ "Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーを"
 #~ "キーリングから削除します。"
 
 #~ "Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーを"
 #~ "キーリングから削除します。"
 

-#~ msgid "<option>--md5</option>"
-#~ msgstr "<option>--md5</option>"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid ""
 #~ "Generate MD5 sums. This defaults to on, when turned off the generated "
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid ""
 #~ "Generate MD5 sums. This defaults to on, when turned off the generated "


@@ -11070,25 +9643,10 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する
 #~ "ンデックスファイルに MD5Sum フィールドがありません。設定項目 - "
 #~ "<literal>APT::FTPArchive::MD5</literal>"
 
 #~ "ンデックスファイルに MD5Sum フィールドがありません。設定項目 - "
 #~ "<literal>APT::FTPArchive::MD5</literal>"
 

-#~ msgid "unmarkauto"
-#~ msgstr "unmarkauto"
-
-#~ msgid "<option>-h</option>"
-#~ msgstr "<option>-h</option>"
-
-#~ msgid "<option>--help</option>"
-#~ msgstr "<option>--help</option>"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid "Show a short usage summary."
 #~ msgstr "短い使用方法を表示します。"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid "Show a short usage summary."
 #~ msgstr "短い使用方法を表示します。"
 

-#~ msgid "<option>-v</option>"
-#~ msgstr "<option>-v</option>"
-
-#~ msgid "<option>--version</option>"
-#~ msgstr "<option>--version</option>"
-

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid "Show the program version."
 #~ msgstr "プログラムのバージョン情報を表示します"
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid "Show the program version."
 #~ msgstr "プログラムのバージョン情報を表示します"


@@ -11127,9 +9685,6 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する
 #~ "たファイルを再帰検索します。その後、ファイルごとの MD5 ダイジェストと "
 #~ "SHA1 ダイジェストを含んだ Release ファイルを、標準出力に書き出します。"
 
 #~ "たファイルを再帰検索します。その後、ファイルごとの MD5 ダイジェストと "
 #~ "SHA1 ダイジェストを含んだ Release ファイルを、標準出力に書き出します。"
 

-#~ msgid "<option>--install-recommends</option>"
-#~ msgstr "<option>--install-recommends</option>"
-

 #~ msgid "Also install recommended packages."
 #~ msgstr "「推奨」パッケージもインストールします。"
 
 #~ msgid "Also install recommended packages."
 #~ msgstr "「推奨」パッケージもインストールします。"
 


@@ -11158,13 +9713,6 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する
 #~ "nonus.debian.org のアーカイブに HTTP アクセスし、debian-non-US ディレクト"
 #~ "リ以下を使用します。"
 
 #~ "nonus.debian.org のアーカイブに HTTP アクセスし、debian-non-US ディレクト"
 #~ "リ以下を使用します。"
 

-#~ 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: SH
 #~ msgid "OPTIONS"
 #~ msgstr "オプション"
 # type: SH
 #~ msgid "OPTIONS"
 #~ msgstr "オプション"