X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/a7307a8727c85b0166339a54fb14ba3812f7a608..4bec02c237e8e218bc7d4bcf7142e0450480138b:/doc/po/ja.po?ds=sidebyside

diff --git a/doc/po/ja.po b/doc/po/ja.po
index 58012cfb6..11a0d446f 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-03-14 16:41+0100\n"
+"POT-Creation-Date: 2010-07-30 12:46+0300\n"
 "PO-Revision-Date: 2009-07-30 22:55+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -573,22 +574,6 @@ msgstr ""
 #: apt.ent:150
 #, no-wrap
 msgid ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-
-#. type: Plain text
-#: apt.ent:156
-#, no-wrap
-msgid ""
 "<!ENTITY wajig \"<citerefentry>\n"
 "    <refentrytitle><command>wajig</command></refentrytitle>\n"
 "    <manvolnum>1</manvolnum>\n"
@@ -602,7 +587,7 @@ msgstr ""
 ">\n"
 
 #. type: Plain text
-#: apt.ent:168
+#: apt.ent:162
 #, fuzzy, no-wrap
 #| msgid ""
 #| "<!-- Boiler plate docinfo section -->\n"
@@ -636,7 +621,7 @@ msgstr ""
 "   <productname>Linux</productname>\n"
 
 #. type: Plain text
-#: apt.ent:171
+#: apt.ent:165
 #, no-wrap
 msgid ""
 " </refentryinfo>\n"
@@ -646,7 +631,7 @@ msgstr ""
 "\"> \n"
 
 #. type: Plain text
-#: apt.ent:177
+#: apt.ent:171
 #, no-wrap
 msgid ""
 "<!ENTITY apt-email \"\n"
@@ -662,7 +647,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:185
+#: apt.ent:179
 #, fuzzy, no-wrap
 #| msgid ""
 #| "<!ENTITY apt-author.jgunthorpe \"\n"
@@ -688,7 +673,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:193
+#: apt.ent:187
 #, fuzzy, no-wrap
 #| msgid ""
 #| "<!ENTITY apt-author.moconnor \"\n"
@@ -714,7 +699,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:194
 #, fuzzy, no-wrap
 #| msgid ""
 #| "<!ENTITY apt-author.team \"\n"
@@ -737,7 +722,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:204 apt.ent:215
+#: apt.ent:198 apt.ent:209
 #, no-wrap
 msgid ""
 "<!ENTITY apt-product \"\n"
@@ -749,7 +734,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:205
 #, no-wrap
 msgid ""
 "<!ENTITY apt-copyright \"\n"
@@ -767,7 +752,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:221
+#: apt.ent:215
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -783,7 +768,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:226
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -809,7 +794,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:240
+#: apt.ent:234
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -829,7 +814,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:244
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -853,7 +838,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:258
+#: apt.ent:252
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -873,15 +858,27 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:268
-#, no-wrap
+#: apt.ent:264
+#, fuzzy, no-wrap
+#| msgid ""
+#| "     <varlistentry>\n"
+#| "      <term><option>-c</option></term>\n"
+#| "      <term><option>--config-file</option></term>\n"
+#| "     <listitem><para>Configuration File; Specify a configuration file to use. \n"
+#| "     The program will read the default configuration file and then this \n"
+#| "     configuration file. See &apt-conf; for syntax information.     \n"
+#| "     </para>\n"
+#| "     </listitem>\n"
+#| "     </varlistentry>\n"
 msgid ""
 "     <varlistentry>\n"
 "      <term><option>-c</option></term>\n"
 "      <term><option>--config-file</option></term>\n"
 "     <listitem><para>Configuration File; Specify a configuration file to use. \n"
 "     The program will read the default configuration file and then this \n"
-"     configuration file. See &apt-conf; for syntax information.     \n"
+"     configuration file. If configuration settings need to be set before the\n"
+"     default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
+"     environment variable. See &apt-conf; for syntax information.\n"
 "     </para>\n"
 "     </listitem>\n"
 "     </varlistentry>\n"
@@ -897,7 +894,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
-#: apt.ent:280
+#: apt.ent:276
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -924,7 +921,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:291
+#: apt.ent:287
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -950,7 +947,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:297
+#: apt.ent:293
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -961,7 +958,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:303
+#: apt.ent:299
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -972,7 +969,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:309
+#: apt.ent:305
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -984,7 +981,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:315
+#: apt.ent:311
 #, fuzzy, no-wrap
 #| msgid "Storage area for package files in transit.  Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial)."
 msgid ""
@@ -997,7 +994,7 @@ msgstr "取得中パッケージファイル格納エリア。設定項目 - <li
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:325
+#: apt.ent:321
 #, fuzzy, no-wrap
 #| msgid "Version preferences file.  This is where you would specify \"pinning\", i.e. a preference to get certain packages from a separate source or from a different version of a distribution.  Configuration Item: <literal>Dir::Etc::Preferences</literal>."
 msgid ""
@@ -1013,7 +1010,7 @@ msgid ""
 msgstr "バージョン優先ファイル。ここに \"pin\" の設定を行います。つまり、別々の取得元や異なるディストリビューションのバージョンの、どこからパッケージを取得するかを設定します。設定項目 - <literal>Dir::Etc::Preferences</literal>"
 
 #. type: Plain text
-#: apt.ent:331
+#: apt.ent:327
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -1024,7 +1021,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:337
+#: apt.ent:333
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -1035,7 +1032,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:343
+#: apt.ent:339
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -1047,7 +1044,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:350
+#: apt.ent:346
 #, fuzzy, no-wrap
 #| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
 msgid ""
@@ -1061,7 +1058,7 @@ msgstr "&sources-list; に指定した、パッケージリソースごとの状
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:356
+#: apt.ent:352
 #, fuzzy, no-wrap
 #| msgid "Storage area for state information in transit.  Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)."
 msgid ""
@@ -1074,7 +1071,7 @@ msgstr "取得中状態情報格納エリア。設定項目 - <literal>Dir::Stat
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:362
+#: apt.ent:358
 #, fuzzy, no-wrap
 #| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
 msgid ""
@@ -1087,7 +1084,7 @@ msgstr "&sources-list; に指定した、パッケージリソースごとの状
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:369
+#: apt.ent:365
 #, fuzzy, no-wrap
 #| msgid "Storage area for state information in transit.  Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)."
 msgid ""
@@ -1099,16 +1096,35 @@ msgid ""
 "\">\n"
 msgstr "取得中状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)"
 
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Plain text
-#: apt.ent:371
-msgid "<!ENTITY translation-title \"TRANSLATION\">"
-msgstr "<!ENTITY translation-title \"訳者\">"
+#: apt.ent:373
+#, fuzzy, no-wrap
+#| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
+msgid ""
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Status list of auto-installed packages.\n"
+"      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
+msgstr "&sources-list; に指定した、パッケージリソースごとの状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal>"
 
 #. type: Plain text
-#: apt.ent:380
+#: apt.ent:377
 #, no-wrap
 msgid ""
-"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n"
+"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
+"     to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
+"<!ENTITY translation-title \"TRANSLATION\">\n"
+msgstr "<!ENTITY translation-title \"訳者\">\n"
+
+#. type: Plain text
+#: apt.ent:386
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
 "     to the translation in the past, who is responsible now and maybe further information\n"
 "     specially related to your translation. -->\n"
 "<!ENTITY translation-holder \"\n"
@@ -1123,11 +1139,14 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:387
+#: apt.ent:397
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
-"     in a shipped manpage will maybe appear english parts. -->\n"
+"     in a shipped manpage newer/modified paragraphs will maybe appear in english in\n"
+"     the generated manpage. This sentence is therefore here to tell the reader that this\n"
+"     is not a mistake by the translator - obviously the target is that at least for stable\n"
+"     releases this sentence is not needed. :) -->\n"
 "<!ENTITY translation-english \"\n"
 "     Note that this translated document may contain untranslated parts.\n"
 "     This is done on purpose, to avoid losing content when the\n"
@@ -1135,6 +1154,13 @@ msgid ""
 "\">\n"
 msgstr ""
 
+#. type: Plain text
+#: apt.ent:400
+msgid ""
+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
+"ENTITY testing-codename \"squeeze\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -1222,7 +1248,7 @@ msgstr ""
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:111
 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
 #: sources.list.5.xml:33
@@ -1245,7 +1271,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:68 apt-get.8.xml:131
+#: apt-cache.8.xml:68 apt-get.8.xml:117
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -1786,8 +1812,8 @@ msgstr ""
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
-#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
+#: apt-ftparchive.1.xml:519 apt-get.8.xml:305 apt-mark.8.xml:89
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:556 apt.conf.5.xml:578
 msgid "options"
 msgstr "オプション"
 
@@ -1814,7 +1840,7 @@ msgstr ""
 "pkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:562 apt-get.8.xml:362
 #: apt-sortpkgs.1.xml:58
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1841,12 +1867,12 @@ msgstr ""
 "<literal>Dir::Cache::srcpkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1887,18 +1913,93 @@ msgstr ""
 "Cache::Important</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
+#: apt-cache.8.xml:312
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--no-pre-depends</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:313
+#, fuzzy
+#| msgid "<option>--no-download</option>"
+msgid "<option>--no-depends</option>"
+msgstr "<option>--no-download</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:314
+#, fuzzy
+#| msgid "<option>--install-recommends</option>"
+msgid "<option>--no-recommends</option>"
+msgstr "<option>--install-recommends</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:315
+#, fuzzy
+#| msgid "<option>--no-upgrade</option>"
+msgid "<option>--no-suggests</option>"
+msgstr "<option>--no-upgrade</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:316
+#, fuzzy
+#| msgid "<option>--no-mount</option>"
+msgid "<option>--no-conflicts</option>"
+msgstr "<option>--no-mount</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:317
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-breaks</option>"
+msgstr "<option>--no-act</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:318
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-replaces</option>"
+msgstr "<option>--no-act</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:319
+#, fuzzy
+#| msgid "<option>--no-act</option>"
+msgid "<option>--no-enhances</option>"
+msgstr "<option>--no-act</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:320
+#, fuzzy
+#| msgid ""
+#| "Make <literal>depends</literal> and <literal>rdepends</literal> recursive "
+#| "so that all packages mentioned are printed once.  Configuration Item: "
+#| "<literal>APT::Cache::RecurseDepends</literal>."
+msgid ""
+"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"print all dependencies. This can be twicked with these flags which will omit "
+"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
+"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
+"Cache::ShowRecommends</literal>."
+msgstr ""
+"<literal>depends</literal> や <literal>rdepends</literal> で、指定した全パッ"
+"ケージを再帰的に一度に表示します。設定項目 - <literal>APT::Cache::"
+"RecurseDepends</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319
 msgid "<option>-f</option>"
 msgstr "<option>-f</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:326
 msgid "<option>--full</option>"
 msgstr "<option>--full</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:327
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1907,18 +2008,18 @@ msgstr ""
 "ShowFull</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548
+#: apt-cache.8.xml:331 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:574
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:331
 msgid "<option>--all-versions</option>"
 msgstr "<option>--all-versions</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:318
+#: apt-cache.8.xml:332
 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-"
@@ -1934,18 +2035,18 @@ msgstr ""
 "用できます。設定項目 - <literal>APT::Cache::AllVersions</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>-g</option>"
 msgstr "<option>-g</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340
 msgid "<option>--generate</option>"
 msgstr "<option>--generate</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:341
 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</"
@@ -1957,18 +2058,18 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
+#: apt-cache.8.xml:346
 msgid "<option>--names-only</option>"
 msgstr "<option>--names-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
+#: apt-cache.8.xml:346 apt-cdrom.8.xml:139
 msgid "<option>-n</option>"
 msgstr "<option>-n</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:347
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1977,13 +2078,13 @@ msgstr ""
 "Cache::NamesOnly</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:351
 msgid "<option>--all-names</option>"
 msgstr "<option>--all-names</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:352
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1993,13 +2094,13 @@ msgstr ""
 "表示します。設定項目 - <literal>APT::Cache::AllNames</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:357
 msgid "<option>--recurse</option>"
 msgstr "<option>--recurse</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:358
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2010,13 +2111,13 @@ msgstr ""
 "RecurseDepends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:363
 msgid "<option>--installed</option>"
 msgstr "<option>--installed</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:351
+#: apt-cache.8.xml:365
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2028,51 +2129,51 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561
+#: apt-cache.8.xml:370 apt-cdrom.8.xml:150 apt-config.8.xml:98
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:602 apt-get.8.xml:547
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122
-#: apt.conf.5.xml:1035 apt_preferences.5.xml:633
+#: apt-cache.8.xml:375 apt-get.8.xml:552 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1089 apt_preferences.5.xml:644
 msgid "Files"
 msgstr "ファイル"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:363
+#: apt-cache.8.xml:377
 msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576
-#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640
+#: apt-cache.8.xml:382 apt-cdrom.8.xml:155 apt-config.8.xml:103
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:618 apt-get.8.xml:562
+#: apt-key.8.xml:174 apt-mark.8.xml:128 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1095 apt_preferences.5.xml:651
 #: sources.list.5.xml:233
 msgid "See Also"
 msgstr "関連項目"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:369
+#: apt-cache.8.xml:383
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582
-#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:387 apt-cdrom.8.xml:160 apt-config.8.xml:108
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:622 apt-get.8.xml:568
+#: apt-mark.8.xml:132 apt-sortpkgs.1.xml:73
 msgid "Diagnostics"
 msgstr "診断メッセージ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:388
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2215,7 +2316,7 @@ msgid "Options"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:530 apt-get.8.xml:314
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -2259,7 +2360,7 @@ msgstr ""
 "ます。設定項目 - <literal>APT::CDROM::Rename</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113 apt-get.8.xml:347
+#: apt-cdrom.8.xml:113 apt-get.8.xml:333
 msgid "<option>-m</option>"
 msgstr "<option>-m</option>"
 
@@ -2318,17 +2419,17 @@ msgstr ""
 "できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:378
+#: apt-cdrom.8.xml:140 apt-get.8.xml:364
 msgid "<option>--just-print</option>"
 msgstr "<option>--just-print</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:380
+#: apt-cdrom.8.xml:141 apt-get.8.xml:366
 msgid "<option>--recon</option>"
 msgstr "<option>--recon</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:142 apt-get.8.xml:381
+#: apt-cdrom.8.xml:142 apt-get.8.xml:367
 msgid "<option>--no-act</option>"
 msgstr "<option>--no-act</option>"
 
@@ -2473,7 +2574,7 @@ msgstr "設定箇所の内容を表示するだけです。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:619
 #: apt-sortpkgs.1.xml:70
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -2557,7 +2658,7 @@ msgstr ""
 "<filename>package.config.XXXX</filename> と言った形になります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:481
 msgid "<option>-t</option>"
 msgstr "<option>-t</option>"
 
@@ -2828,14 +2929,25 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:119
+#, 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>Architectures</literal>, <literal>Components</literal>, "
+#| "<literal>Description</literal>."
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
 "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
 "supported fields are: <literal>Origin</literal>, <literal>Label</literal>, "
 "<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
-"literal>, <literal>Date</literal>, <literal>Architectures</literal>, "
-"<literal>Components</literal>, <literal>Description</literal>."
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 msgstr ""
 "Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::"
 "Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::"
@@ -2846,13 +2958,13 @@ msgstr ""
 "<literal>Description</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:129
+#: apt-ftparchive.1.xml:130
 msgid "generate"
 msgstr "generate"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:131
+#: apt-ftparchive.1.xml:132
 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 "
@@ -2866,13 +2978,13 @@ msgstr ""
 "のディレクトリから作成するかを指定する、柔軟な方法を提供します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:138 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:139 apt-get.8.xml:278
 msgid "clean"
 msgstr "clean"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:140
+#: apt-ftparchive.1.xml:141
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -2882,13 +2994,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:147
 msgid "The Generate Configuration"
 msgstr "Generate 設定"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:149
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2906,7 +3018,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:156
+#: apt-ftparchive.1.xml:157
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
@@ -2915,13 +3027,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:158
+#: apt-ftparchive.1.xml:159
 msgid "Dir Section"
 msgstr "Dir セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:160
+#: apt-ftparchive.1.xml:161
 #, fuzzy
 #| msgid ""
 #| "The <literal>Dir</literal> section defines the standard directories "
@@ -2940,13 +3052,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:166
 msgid "ArchiveDir"
 msgstr "ArchiveDir"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:168
 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 "
@@ -2956,36 +3068,36 @@ msgstr ""
 "リには <filename>ls-LR</filename> と dist ノードがあります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:173
 msgid "OverrideDir"
 msgstr "OverrideDir"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:175
 msgid "Specifies the location of the override files."
 msgstr "オーバーライドファイルの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:177
+#: apt-ftparchive.1.xml:178
 msgid "CacheDir"
 msgstr "CacheDir"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:180
 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:182
+#: apt-ftparchive.1.xml:183
 msgid "FileListDir"
 msgstr "FileListDir"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:185
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -2995,13 +3107,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:190
+#: apt-ftparchive.1.xml:191
 msgid "Default Section"
 msgstr "Default セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:192
+#: apt-ftparchive.1.xml:193
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -3013,13 +3125,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
+#: apt-ftparchive.1.xml:197
 msgid "Packages::Compress"
 msgstr "Packages::Compress"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:198
+#: apt-ftparchive.1.xml:199
 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 "
@@ -3031,13 +3143,13 @@ msgstr ""
 "法のデフォルトはすべて '. gzip' です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:204
+#: apt-ftparchive.1.xml:205
 msgid "Packages::Extensions"
 msgstr "Packages::Extensions"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:207
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -3046,13 +3158,13 @@ msgstr ""
 "deb' です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:210
+#: apt-ftparchive.1.xml:211
 msgid "Sources::Compress"
 msgstr "Sources::Compress"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:213
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -3061,13 +3173,13 @@ msgstr ""
 "指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:216
+#: apt-ftparchive.1.xml:217
 msgid "Sources::Extensions"
 msgstr "Sources::Extensions"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:219
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -3076,13 +3188,13 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:222
+#: apt-ftparchive.1.xml:223
 msgid "Contents::Compress"
 msgstr "Contents::Compress"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:225
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -3091,13 +3203,34 @@ msgstr ""
 "指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:228
+#: apt-ftparchive.1.xml:229
+#, fuzzy
+#| msgid "Contents::Compress"
+msgid "Translation::Compress"
+msgstr "Contents::Compress"
+
+# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:231
+#, fuzzy
+#| 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 Translation-en master file."
+msgstr ""
+"<literal>Packages::Compress</literal> と同様に、Contents ファイルの圧縮方法を"
+"指定します。"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:235
 msgid "DeLinkLimit"
 msgstr "DeLinkLimit"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:230
+#: apt-ftparchive.1.xml:237
 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-"
@@ -3109,13 +3242,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:242
 msgid "FileMode"
 msgstr "FileMode"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:244
 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."
@@ -3123,15 +3256,30 @@ msgstr ""
 "作成したインデックスファイルのモードを指定します。デフォルトは 0644 です。全"
 "インデックスファイルは、umask を無視してこのモードを使用します。"
 
+# type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
+#, fuzzy
+#| msgid "Description"
+msgid "LongDescription"
+msgstr "説明"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
+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>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:257
 msgid "TreeDefault Section"
 msgstr "TreeDefault セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:259
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -3142,13 +3290,13 @@ msgstr ""
 "に展開します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:251
+#: apt-ftparchive.1.xml:264
 msgid "MaxContentsChange"
 msgstr "MaxContentsChange"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:266
 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 "
@@ -3159,13 +3307,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:271
 msgid "ContentsAge"
 msgstr "ContentsAge"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:273
 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. "
@@ -3182,13 +3330,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:269
+#: apt-ftparchive.1.xml:282
 msgid "Directory"
 msgstr "Directory"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:284
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -3198,13 +3346,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:275
+#: apt-ftparchive.1.xml:288
 msgid "SrcDirectory"
 msgstr "SrcDirectory"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:290
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -3214,13 +3362,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407
+#: apt-ftparchive.1.xml:294 apt-ftparchive.1.xml:433
 msgid "Packages"
 msgstr "Packages"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -3230,13 +3378,13 @@ msgstr ""
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:438
 msgid "Sources"
 msgstr "Sources"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:302
 #, fuzzy
 #| msgid ""
 #| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
@@ -3248,14 +3396,29 @@ msgstr ""
 "Packages ファイルの出力先を設定します。デフォルトは <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:306
+#, fuzzy
+msgid "Translation"
+msgstr "オプション"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:308
+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:293
+#: apt-ftparchive.1.xml:313
 msgid "InternalPrefix"
 msgstr "InternalPrefix"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:315
 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)/</"
@@ -3266,13 +3429,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418
+#: apt-ftparchive.1.xml:320 apt-ftparchive.1.xml:444
 msgid "Contents"
 msgstr "Contents"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:322
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -3285,24 +3448,24 @@ msgstr ""
 "ftparchive</command> は自動でパッケージファイルをまとめます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:329
 msgid "Contents::Header"
 msgstr "Contents::Header"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:311
+#: apt-ftparchive.1.xml:331
 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:314 apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:334 apt-ftparchive.1.xml:469
 msgid "BinCacheDB"
 msgstr "BinCacheDB"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:316
+#: apt-ftparchive.1.xml:336
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -3312,13 +3475,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:320
+#: apt-ftparchive.1.xml:340
 msgid "FileList"
 msgstr "FileList"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:322
+#: apt-ftparchive.1.xml:342
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3330,13 +3493,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:327
+#: apt-ftparchive.1.xml:347
 msgid "SourceFileList"
 msgstr "SourceFileList"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:349
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -3349,13 +3512,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:357
 msgid "Tree Section"
 msgstr "Tree セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:339
+#: apt-ftparchive.1.xml:359
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -3370,12 +3533,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:364
+#, fuzzy
+#| msgid ""
+#| "The <literal>Tree</literal> section takes a scope tag which sets the "
+#| "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
+#| "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
+#| "setting such as <filename>dists/woody</filename>."
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
-"setting such as <filename>dists/woody</filename>."
+"setting such as <filename>dists/&stable-codename;</filename>."
 msgstr ""
 "<literal>Tree</literal> セクションは、<literal>$(DIST)</literal> 変数で設定さ"
 "れているスコープタグをとり、ツリーのルート (<literal>ArchiveDir</literal>が先"
@@ -3384,7 +3553,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:349
+#: apt-ftparchive.1.xml:369
 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 "
@@ -3395,7 +3564,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:375
 #, fuzzy, no-wrap
 #| msgid ""
 #| "for i in Sections do \n"
@@ -3413,7 +3582,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><informalexample>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:352
+#: apt-ftparchive.1.xml:372
 #, fuzzy
 #| msgid ""
 #| "When processing a <literal>Tree</literal> section <command>apt-"
@@ -3428,13 +3597,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:361
+#: apt-ftparchive.1.xml:381
 msgid "Sections"
 msgstr "Sections"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:383
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -3445,13 +3614,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:388
 msgid "Architectures"
 msgstr "Architectures"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:390
 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 "
@@ -3463,13 +3632,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:449
 msgid "BinOverride"
 msgstr "BinOverride"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:403
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -3479,13 +3648,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428
+#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:454
 msgid "SrcOverride"
 msgstr "SrcOverride"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:383
+#: apt-ftparchive.1.xml:409
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -3495,37 +3664,37 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459
 msgid "ExtraOverride"
 msgstr "ExtraOverride"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435
+#: apt-ftparchive.1.xml:415 apt-ftparchive.1.xml:461
 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:392 apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464
 msgid "SrcExtraOverride"
 msgstr "SrcExtraOverride"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440
+#: apt-ftparchive.1.xml:420 apt-ftparchive.1.xml:466
 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:399
+#: apt-ftparchive.1.xml:425
 msgid "BinDirectory Section"
 msgstr "BinDirectory セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:427
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -3540,13 +3709,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:435
 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:414
+#: apt-ftparchive.1.xml:440
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -3556,59 +3725,59 @@ 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:420
+#: apt-ftparchive.1.xml:446
 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:425
+#: apt-ftparchive.1.xml:451
 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:430
+#: apt-ftparchive.1.xml:456
 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:445
+#: apt-ftparchive.1.xml:471
 msgid "Sets the cache DB."
 msgstr "キャッシュ DB を設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:474
 msgid "PathPrefix"
 msgstr "PathPrefix"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:476
 msgid "Appends a path to all the output paths."
 msgstr "全出力パスに付加するパス。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:479
 msgid "FileList, SourceFileList"
 msgstr "FileList, SourceFileList"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:481
 msgid "Specifies the file list file."
 msgstr "ファイル一覧ファイルを指定します。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:488
 msgid "The Binary Override File"
 msgstr "バイナリオーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:489
 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, "
@@ -3623,20 +3792,20 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:469
+#: apt-ftparchive.1.xml:495
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:471
+#: apt-ftparchive.1.xml:497
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:494
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3654,13 +3823,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:479
+#: apt-ftparchive.1.xml:505
 msgid "The Source Override File"
 msgstr "ソースオーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:507
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -3672,13 +3841,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:486
+#: apt-ftparchive.1.xml:512
 msgid "The Extra Override File"
 msgstr "特別オーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:488
+#: apt-ftparchive.1.xml:514
 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 "
@@ -3688,13 +3857,13 @@ msgstr ""
 "す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:497
+#: apt-ftparchive.1.xml:523
 msgid "<option>--md5</option>"
 msgstr "<option>--md5</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:525
 msgid ""
 "Generate MD5 sums. This defaults to on, when turned off the generated index "
 "files will not have MD5Sum fields where possible.  Configuration Item: "
@@ -3705,13 +3874,13 @@ msgstr ""
 "FTPArchive::MD5</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:530
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:506
+#: apt-ftparchive.1.xml:532
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3721,7 +3890,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:538
 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 "
@@ -3734,13 +3903,13 @@ msgstr ""
 "<literal>quiet</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:544
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:546
 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 "
@@ -3753,13 +3922,13 @@ msgstr ""
 "<literal>APT::FTPArchive::DeLinkAct</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:526
+#: apt-ftparchive.1.xml:552
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:528
+#: apt-ftparchive.1.xml:554
 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 "
@@ -3774,13 +3943,13 @@ msgstr ""
 "<literal>APT::FTPArchive::Contents</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:562
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:538
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3790,13 +3959,13 @@ msgstr ""
 "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:568
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:544
+#: apt-ftparchive.1.xml:570
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3805,7 +3974,7 @@ msgstr ""
 "FTPArchive::ReadOnlyDB</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:574
 #, fuzzy
 #| msgid "<option>-a</option>"
 msgid "<option>--arch</option>"
@@ -3813,7 +3982,7 @@ msgstr "<option>-a</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml:575
 #, fuzzy
 #| msgid ""
 #| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -3832,14 +4001,14 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:581
 #, fuzzy
 #| msgid "<option>--version</option>"
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:557
+#: apt-ftparchive.1.xml:583
 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 "
@@ -3853,39 +4022,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:593
 #, fuzzy
 #| msgid "<option>--version</option>"
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:569
+#: apt-ftparchive.1.xml:595
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
 "&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
-"that it is currently not possible to create these files with <command>apt-"
-"ftparchive</command>."
+"that the <filename>Translation-en</filename> master file can only be created "
+"in the generate command."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480
+#: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491
 #: sources.list.5.xml:193
 msgid "Examples"
 msgstr "サンプル"
 
 # type: Content of: <refentry><refsect1><para><programlisting>
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:587
+#: apt-ftparchive.1.xml:613
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:583
+#: apt-ftparchive.1.xml:609
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3895,7 +4064,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:597
+#: apt-ftparchive.1.xml:623
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3963,26 +4132,21 @@ msgid ""
 "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
 "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
 "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <group choice='req'> <arg choice='plain'> "
-"<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> "
-"<replaceable>target_release_number_expression</replaceable> </arg> <arg "
-"choice='plain'> <replaceable>target_release_codename</replaceable> </arg> </"
-"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
-"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group "
-"choice='req'> <arg choice='plain'> =<replaceable>pkg_version_number</"
-"replaceable> </arg> <arg choice='plain'> /<replaceable>target_release_name</"
-"replaceable> </arg> <arg choice='plain'> /"
-"<replaceable>target_release_codename</replaceable> </arg> </group> </arg> </"
-"arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>purge <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
+"<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_name</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_codename</replaceable> </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 "
@@ -4023,12 +4187,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:126
+#: apt-get.8.xml:112
+#, fuzzy
+#| msgid ""
+#| "<command>apt-get</command> is the command-line tool for handling "
+#| "packages, and may be considered the user's \"back-end\" to other tools "
+#| "using the APT library.  Several \"front-end\" interfaces exist, such as "
+#| "&dselect;, &aptitude;, &synaptic;, &gnome-apt; and &wajig;."
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
 "library.  Several \"front-end\" interfaces exist, such as &dselect;, "
-"&aptitude;, &synaptic;, &gnome-apt; and &wajig;."
+"&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 "<command>apt-get</command> は、パッケージを操作するコマンドラインツールで、"
 "APT ライブラリを用いる他のツールのユーザ側「バックエンド」といえるものです。"
@@ -4036,13 +4206,13 @@ msgstr ""
 "&gnome-apt;, &wajig; などがあります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:124
+#: apt-get.8.xml:121 apt-key.8.xml:124
 msgid "update"
 msgstr "update"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:122
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -4065,13 +4235,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#: apt-get.8.xml:133 guide.sgml:121
 msgid "upgrade"
 msgstr "upgrade"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:148
+#: apt-get.8.xml:134
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -4095,13 +4265,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:146
 msgid "dselect-upgrade"
 msgstr "dselect-upgrade"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:147
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -4119,13 +4289,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#: apt-get.8.xml:156 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>
-#: apt-get.8.xml:171
+#: apt-get.8.xml:157
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -4149,13 +4319,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#: apt-get.8.xml:169 guide.sgml:131
 msgid "install"
 msgstr "install"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:185
+#: apt-get.8.xml:171
 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 "
@@ -4182,7 +4352,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:203
+#: apt-get.8.xml:189
 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 "
@@ -4200,7 +4370,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:196
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -4209,7 +4379,7 @@ msgstr ""
 "ばなりません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:199
 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. "
@@ -4222,7 +4392,7 @@ msgstr ""
 
 # 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:210
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -4232,7 +4402,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:214
 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 "
@@ -4249,13 +4419,13 @@ msgstr ""
 "ば、'^' や '$' を付けるか、もっと詳しい正規表現を指定してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:237
+#: apt-get.8.xml:223
 msgid "remove"
 msgstr "remove"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:238
+#: apt-get.8.xml:224
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -4270,13 +4440,13 @@ msgstr ""
 "トールします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:245
+#: apt-get.8.xml:231
 msgid "purge"
 msgstr "purge"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:232
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -4287,13 +4457,13 @@ msgstr ""
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:250
+#: apt-get.8.xml:236
 msgid "source"
 msgstr "source"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: apt-get.8.xml:237
 #, fuzzy
 #| msgid ""
 #| "<literal>source</literal> causes <command>apt-get</command> to fetch "
@@ -4327,7 +4497,7 @@ msgstr ""
 "います。--download-only の場合はソースパッケージを展開しません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:259
+#: apt-get.8.xml:245
 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 "
@@ -4337,7 +4507,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:252
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
@@ -4347,7 +4517,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:257
 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 "
@@ -4362,7 +4532,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:263
 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 "
@@ -4372,13 +4542,13 @@ msgstr ""
 "展開されることに注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:268
 msgid "build-dep"
 msgstr "build-dep"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:269
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package."
@@ -4387,13 +4557,13 @@ msgstr ""
 "に、パッケージのインストール・削除を行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:273
 msgid "check"
 msgstr "check"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:274
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -4403,7 +4573,7 @@ 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:279
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -4421,13 +4591,13 @@ msgstr ""
 "<literal>apt-get clean</literal> を実行したくなるでしょう。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:302
+#: apt-get.8.xml:288
 msgid "autoclean"
 msgstr "autoclean"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:289
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -4446,13 +4616,13 @@ msgstr ""
 "防げます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:298
 msgid "autoremove"
 msgstr "autoremove"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:299
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for some package and that "
@@ -4462,13 +4632,13 @@ msgstr ""
 "され、もう必要なくなったパッケージを削除するのに使用します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323 apt-get.8.xml:429
+#: apt-get.8.xml:309 apt-get.8.xml:415
 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>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:310
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -4477,13 +4647,13 @@ msgstr ""
 "<literal>APT::Install-Recommends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
+#: apt-get.8.xml:314
 msgid "<option>--download-only</option>"
 msgstr "<option>--download-only</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:315
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -4492,13 +4662,13 @@ msgstr ""
 "いません。設定項目 - <literal>APT::Get::Download-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:333
+#: apt-get.8.xml:319
 msgid "<option>--fix-broken</option>"
 msgstr "<option>--fix-broken</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:334
+#: apt-get.8.xml:320
 #, fuzzy
 #| msgid ""
 #| "Fix; attempt to correct a system with broken dependencies in place. This "
@@ -4537,18 +4707,18 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:333
 msgid "<option>--ignore-missing</option>"
 msgstr "<option>--ignore-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:348
+#: apt-get.8.xml:334
 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>
-#: apt-get.8.xml:349
+#: apt-get.8.xml:335
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -4567,13 +4737,13 @@ msgstr ""
 "Get::Fix-Missing</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
+#: apt-get.8.xml:345
 msgid "<option>--no-download</option>"
 msgstr "<option>--no-download</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:360
+#: apt-get.8.xml:346
 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 "
@@ -4585,7 +4755,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:367
+#: apt-get.8.xml:353
 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 "
@@ -4604,18 +4774,18 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:363
 msgid "<option>--simulate</option>"
 msgstr "<option>--simulate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:365
 msgid "<option>--dry-run</option>"
 msgstr "<option>--dry-run</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:382
+#: apt-get.8.xml:368
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -4625,7 +4795,7 @@ msgstr ""
 "行いません。設定項目 - <literal>APT::Get::Simulate</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:386
+#: apt-get.8.xml:372
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -4637,7 +4807,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:378
 #, fuzzy
 #| msgid ""
 #| "Simulate prints out a series of lines each one representing a dpkg "
@@ -4655,23 +4825,23 @@ msgstr ""
 "空の角カッコは大した問題ではないことを表します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>-y</option>"
 msgstr "<option>-y</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:385
 msgid "<option>--yes</option>"
 msgstr "<option>--yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
+#: apt-get.8.xml:386
 msgid "<option>--assume-yes</option>"
 msgstr "<option>--assume-yes</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:387
 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 "
@@ -4685,18 +4855,18 @@ msgstr ""
 "定項目 - <literal>APT::Get::Assume-Yes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 msgid "<option>-u</option>"
 msgstr "<option>-u</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:394
 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:409
+#: apt-get.8.xml:395
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4705,18 +4875,18 @@ msgstr ""
 "<literal>APT::Get::Show-Upgraded</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>-V</option>"
 msgstr "<option>-V</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:400
 msgid "<option>--verbose-versions</option>"
 msgstr "<option>--verbose-versions</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:401
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -4725,23 +4895,23 @@ msgstr ""
 "<literal>APT::Get::Show-Versions</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>-b</option>"
 msgstr "<option>-b</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:405
 msgid "<option>--compile</option>"
 msgstr "<option>--compile</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:406
 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>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:407
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -4750,28 +4920,28 @@ msgstr ""
 "Get::Compile</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
+#: apt-get.8.xml:411
 msgid "<option>--install-recommends</option>"
 msgstr "<option>--install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:412
 msgid "Also install recommended packages."
 msgstr "「推奨」パッケージもインストールします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:416
 msgid "Do not install recommended packages."
 msgstr "「推奨」パッケージをインストールしません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:433
+#: apt-get.8.xml:419
 msgid "<option>--ignore-hold</option>"
 msgstr "<option>--ignore-hold</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:434
+#: apt-get.8.xml:420
 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 "
@@ -4784,13 +4954,13 @@ msgstr ""
 "Hold</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:440
+#: apt-get.8.xml:426
 msgid "<option>--no-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:441
+#: apt-get.8.xml:427
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4802,7 +4972,7 @@ msgstr ""
 "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:447
+#: apt-get.8.xml:433
 #, fuzzy
 #| msgid "<option>--no-upgrade</option>"
 msgid "<option>--only-upgrade</option>"
@@ -4810,7 +4980,7 @@ msgstr "<option>--no-upgrade</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:434
 #, fuzzy
 #| msgid ""
 #| "Do not upgrade packages; When used in conjunction with <literal>install</"
@@ -4828,13 +4998,13 @@ msgstr ""
 "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:454
+#: apt-get.8.xml:440
 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>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:441
 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 "
@@ -4848,13 +5018,13 @@ msgstr ""
 "ねません! 設定項目 - <literal>APT::Get::force-yes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:448
 msgid "<option>--print-uris</option>"
 msgstr "<option>--print-uris</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:449
 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 "
@@ -4875,13 +5045,13 @@ msgstr ""
 "Print-URIs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:473
+#: apt-get.8.xml:459
 msgid "<option>--purge</option>"
 msgstr "<option>--purge</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:460
 #, fuzzy
 #| msgid ""
 #| "Use purge instead of remove for anything that would be removed.  An "
@@ -4901,13 +5071,13 @@ msgstr ""
 "<literal>APT::Get::Purge</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:467
 msgid "<option>--reinstall</option>"
 msgstr "<option>--reinstall</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:482
+#: apt-get.8.xml:468
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4916,13 +5086,13 @@ msgstr ""
 "定項目 - <literal>APT::Get::ReInstall</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:472
 msgid "<option>--list-cleanup</option>"
 msgstr "<option>--list-cleanup</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:473
 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 "
@@ -4938,18 +5108,18 @@ msgstr ""
 "する時ぐらいでしょう。設定項目 - <literal>APT::Get::List-Cleanup</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
+#: apt-get.8.xml:482
 msgid "<option>--target-release</option>"
 msgstr "<option>--target-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:497
+#: apt-get.8.xml:483
 msgid "<option>--default-release</option>"
 msgstr "<option>--default-release</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:498
+#: apt-get.8.xml:484
 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 "
@@ -4971,13 +5141,13 @@ msgstr ""
 "Release</literal>。&apt-preferences; のマニュアルページもご覧ください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:497
 msgid "<option>--trivial-only</option>"
 msgstr "<option>--trivial-only</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:499
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4990,13 +5160,13 @@ msgstr ""
 "目 - <literal>APT::Get::Trivial-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:505
 msgid "<option>--no-remove</option>"
 msgstr "<option>--no-remove</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:520
+#: apt-get.8.xml:506
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -5005,13 +5175,13 @@ msgstr ""
 "項目 - <literal>APT::Get::Remove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:511
 msgid "<option>--auto-remove</option>"
 msgstr "<option>--auto-remove</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:512
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -5024,13 +5194,13 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:532
+#: apt-get.8.xml:518
 msgid "<option>--only-source</option>"
 msgstr "<option>--only-source</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:533
+#: apt-get.8.xml:519
 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 "
@@ -5048,23 +5218,23 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--diff-only</option>"
 msgstr "<option>--diff-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--dsc-only</option>"
 msgstr "<option>--dsc-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:529
 msgid "<option>--tar-only</option>"
 msgstr "<option>--tar-only</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:544
+#: apt-get.8.xml:530
 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</"
@@ -5075,13 +5245,13 @@ msgstr ""
 "Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:535
 msgid "<option>--arch-only</option>"
 msgstr "<option>--arch-only</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:536
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -5090,13 +5260,13 @@ msgstr ""
 "<literal>APT::Get::Arch-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:554
+#: apt-get.8.xml:540
 msgid "<option>--allow-unauthenticated</option>"
 msgstr "<option>--allow-unauthenticated</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:541
 #, fuzzy
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
@@ -5108,7 +5278,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:568
+#: apt-get.8.xml:554
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
@@ -5116,7 +5286,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:577
+#: apt-get.8.xml:563
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -5127,7 +5297,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:569
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -5136,22 +5306,22 @@ msgstr ""
 "100 を返します。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:586
+#: apt-get.8.xml:572
 msgid "ORIGINAL AUTHORS"
 msgstr "原著者"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:587
+#: apt-get.8.xml:573
 msgid "&apt-author.jgunthorpe;"
 msgstr "&apt-author.jgunthorpe;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:590
+#: apt-get.8.xml:576
 msgid "CURRENT AUTHORS"
 msgstr "現著者"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:592
+#: apt-get.8.xml:578
 msgid "&apt-author.team;"
 msgstr "&apt-author.team;"
 
@@ -5579,25 +5749,14 @@ msgstr "<option>--version</option>"
 msgid "Show the program version."
 msgstr "プログラムのバージョン情報を表示します"
 
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist>
 #: apt-mark.8.xml:124
-#, fuzzy
-#| msgid "<filename>/etc/apt/preferences</filename>"
-msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr "<filename>/etc/apt/preferences</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:125
-msgid ""
-"Status list of auto-installed packages.  Configuration Item: <literal>Dir::"
-"State</literal> sets the path to the <filename>extended_states</filename> "
-"file."
+msgid "  &file-extended_states;"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:129
 #, fuzzy
 #| msgid "&apt-cache; &apt-conf;"
 msgid "&apt-get;,&aptitude;,&apt-conf;"
@@ -5605,7 +5764,7 @@ msgstr "&apt-cache; &apt-conf;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:133
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -6379,11 +6538,17 @@ msgstr "Default-Release"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:153
+#, fuzzy
+#| msgid ""
+#| "Default release to install packages from if more than one version "
+#| "available. Contains release name, codename or release version. Examples: "
+#| "'stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See "
+#| "also &apt-preferences;."
 msgid ""
 "Default release to install packages from if more than one version available. "
 "Contains release name, codename or release version. Examples: 'stable', "
-"'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-"
-"preferences;."
+"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
+"'5.0*'. See also &apt-preferences;."
 msgstr ""
 "ひとつ以上のバージョンがある場合に、パッケージをインストールを行うデフォルト"
 "リリースです。リリース名や、コード名、リリースバージョンです。例えば "
@@ -6391,13 +6556,13 @@ msgstr ""
 "す。 &apt-preferences; も参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:158
 msgid "Ignore-Hold"
 msgstr "Ignore-Hold"
 
 # 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:159
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -6407,13 +6572,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:162
+#: apt.conf.5.xml:163
 msgid "Clean-Installed"
 msgstr "Clean-Installed"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:164
 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 "
@@ -6428,12 +6593,12 @@ msgstr ""
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:170
 msgid "Immediate-Configure"
 msgstr "Immediate-Configure"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:170
+#: apt.conf.5.xml:171
 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 "
@@ -6466,13 +6631,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:193
 msgid "Force-LoopBreak"
 msgstr "Force-LoopBreak"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:193
+#: apt.conf.5.xml:194
 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/"
@@ -6490,39 +6655,49 @@ msgstr ""
 "不可欠パッケージで動作します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:201
-msgid "Cache-Limit"
-msgstr "Cache-Limit"
+#: apt.conf.5.xml:202
+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:202
+#: apt.conf.5.xml:203
 msgid ""
-"APT uses a fixed size memory mapped cache file to store the 'available' "
-"information. This sets the size of that cache (in bytes)."
+"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
+"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
+"to which size the Cache will grow and is therefore the amount of memory APT "
+"will request at startup. The default value is 20971520 bytes (~20 MB). Note "
+"that 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."
 msgstr ""
-"APT は「利用可能」情報を格納するために、固定サイズのメモリマップキャッシュ"
-"ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
+#: apt.conf.5.xml:218
 msgid "Build-Essential"
 msgstr "Build-Essential"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:219
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr "構築依存関係で不可欠なパッケージを定義します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:222
 msgid "Get"
 msgstr "Get"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:223
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
@@ -6531,13 +6706,13 @@ msgstr ""
 "&apt-get; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:215
+#: apt.conf.5.xml:227
 msgid "Cache"
 msgstr "Cache"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:228
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
@@ -6546,13 +6721,13 @@ msgstr ""
 "は &apt-cache; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:220
+#: apt.conf.5.xml:232
 msgid "CDROM"
 msgstr "CDROM"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:233
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
@@ -6562,17 +6737,53 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:239
 msgid "The Acquire Group"
 msgstr "Acquire グループ"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:244
+msgid "Check-Valid-Until"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:245
+msgid ""
+"Security related option defaulting to true as an expiring validation for a "
+"Release file prevents longtime replay attacks and can e.g. also help users "
+"to identify no longer updated mirrors - but the feature depends on the "
+"correctness of the time on the user system.  Archive maintainers are "
+"encouraged to create Release files with the <literal>Valid-Until</literal> "
+"header, but if they don't or a stricter value is volitional the following "
+"<literal>Max-ValidTime</literal> option can be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:255
+msgid "Max-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:256
+msgid ""
+"Seconds the Release file should be considered valid after it was created. "
+"The default is \"for ever\" (0) if the Release file of the archive doesn't "
+"include a <literal>Valid-Until</literal> header.  If it does then this date "
+"is the default. The date from the Release file or the date specified by the "
+"creation time of the Release file (<literal>Date</literal> header) plus the "
+"seconds specified with this options are used to check if the validation of a "
+"file has expired by using the earlier date of the two. Archive specific "
+"settings can be made by appending the label of the archive to the option "
+"name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:268
 msgid "PDiffs"
 msgstr "PDiffs"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:269
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
@@ -6582,7 +6793,7 @@ msgstr ""
 "ルトでは True です。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:272
 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 "
@@ -6593,13 +6804,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:281
 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>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:282
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6614,13 +6825,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:289
 msgid "Retries"
 msgstr "Retries"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:290
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -6629,13 +6840,13 @@ msgstr ""
 "えられた回数だけリトライを行います。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:258
+#: apt.conf.5.xml:294
 msgid "Source-Symlinks"
 msgstr "Source-Symlinks"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#: apt.conf.5.xml:295
 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."
@@ -6646,13 +6857,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:263 sources.list.5.xml:139
+#: apt.conf.5.xml:299 sources.list.5.xml:139
 msgid "http"
 msgstr "http"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:300
 #, fuzzy
 #| msgid ""
 #| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
@@ -6678,7 +6889,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:272
+#: apt.conf.5.xml:308
 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 "
@@ -6703,7 +6914,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:282 apt.conf.5.xml:346
+#: apt.conf.5.xml:318 apt.conf.5.xml:382
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "
@@ -6715,7 +6926,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:285
+#: apt.conf.5.xml:321
 #, fuzzy
 #| msgid ""
 #| "One setting is provided to control the pipeline depth in cases where the "
@@ -6743,7 +6954,7 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:329
 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 "
@@ -6753,7 +6964,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:298
+#: apt.conf.5.xml:334
 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 "
@@ -6762,12 +6973,12 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:340
 msgid "https"
 msgstr "https"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:341
 #, fuzzy
 #| msgid ""
 #| "HTTPS URIs. Cache-control and proxy options are the same as for "
@@ -6785,7 +6996,7 @@ msgstr ""
 "していません。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:311
+#: apt.conf.5.xml:347
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6807,13 +7018,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:329 sources.list.5.xml:150
+#: apt.conf.5.xml:365 sources.list.5.xml:150
 msgid "ftp"
 msgstr "ftp"
 
 # 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:366
 #, fuzzy
 #| msgid ""
 #| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the "
@@ -6856,7 +7067,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:349
+#: apt.conf.5.xml:385
 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 "
@@ -6872,7 +7083,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:392
 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 "
@@ -6886,7 +7097,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:361
+#: apt.conf.5.xml:397
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6903,12 +7114,12 @@ msgstr ""
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:368 sources.list.5.xml:132
+#: apt.conf.5.xml:404 sources.list.5.xml:132
 msgid "cdrom"
 msgstr "cdrom"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:410
 #, fuzzy, no-wrap
 #| msgid "\"/cdrom/\"::Mount \"foo\";"
 msgid "/cdrom/::Mount \"foo\";"
@@ -6916,7 +7127,7 @@ 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:369
+#: apt.conf.5.xml:405
 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 "
@@ -6937,13 +7148,13 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:415
 msgid "gpgv"
 msgstr "gpgv"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:416
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@ -6954,18 +7165,18 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:421
 msgid "CompressionTypes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:427
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:422
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -6977,19 +7188,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:432
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:399
+#: apt.conf.5.xml:435
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:428
 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 "
@@ -7006,13 +7217,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:439
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:437
 msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "
@@ -7027,7 +7238,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:408
+#: apt.conf.5.xml:444
 msgid ""
 "While it is possible to add an empty compression type to the order list, but "
 "APT in its current version doesn't understand it correctly and will display "
@@ -7036,13 +7247,30 @@ msgid ""
 "prefer uncompressed files to support the usage of local mirrors."
 msgstr ""
 
+# type: <tag></tag>
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:450
+#, fuzzy
+#| msgid "IndexType"
+msgid "GzipIndexes"
+msgstr "IndexType"
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:452
+msgid ""
+"When downloading <literal>gzip</literal> compressed indexes (Packages, "
+"Sources, or Translations), keep them gzip compressed locally instead of "
+"unpacking them. This saves quite a lot of disk space at the expense of more "
+"CPU requirements when building the local package caches. False by default."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:414
+#: apt.conf.5.xml:459
 msgid "Languages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:415
+#: apt.conf.5.xml:460
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the Description-"
@@ -7055,13 +7283,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:431
+#: apt.conf.5.xml:476
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:421
+#: apt.conf.5.xml:466
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -7079,13 +7307,13 @@ msgid ""
 "configuration will result in the order \"en, de\" in an english and in \"de, "
 "en\" in a german localization. Note that \"fr\" is downloaded, but not used "
 "if APT is not used in a french localization, in such an environment the "
-"order would be \"fr, de, en\".  <placeholder type=\"programlisting\" id=\"0"
-"\"/>"
+"order would be \"fr, de, en\".  <placeholder type=\"programlisting\" id="
+"\"0\"/>"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:240
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -7096,13 +7324,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:483
 msgid "Directories"
 msgstr "ディレクトリ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:485
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -7122,7 +7350,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:492
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -7144,7 +7372,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:501
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -7159,7 +7387,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:462
+#: apt.conf.5.xml:507
 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 "
@@ -7171,7 +7399,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:466
+#: apt.conf.5.xml:511
 #, fuzzy
 #| msgid ""
 #| "Binary programs are pointed to by <literal>Dir::Bin</literal>. "
@@ -7196,7 +7424,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:474
+#: apt.conf.5.xml:519
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -7215,15 +7443,26 @@ msgstr ""
 "lib/dpkg/status</filename> にセットされている場合、status ファイルを "
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。"
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:532
+msgid ""
+"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
+"which files APT should silently ignore while parsing the files in the "
+"fragment directories. Per default a file which end with <literal>.disabled</"
+"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
+"z]+</literal> is silently ignored. As seen in the last default value these "
+"patterns can use regular expression syntax."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:487
+#: apt.conf.5.xml:541
 msgid "APT in DSelect"
 msgstr "DSelect での APT"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:543
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -7233,13 +7472,13 @@ msgstr ""
 "設定項目で、デフォルトの動作を制御します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:493
+#: apt.conf.5.xml:547
 msgid "Clean"
 msgstr "Clean"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:548
 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 "
@@ -7256,7 +7495,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:557
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."
@@ -7266,13 +7505,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:561
 msgid "Updateoptions"
 msgstr "Updateoptions"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:508
+#: apt.conf.5.xml:562
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."
@@ -7281,13 +7520,13 @@ msgstr ""
 "されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:566
 msgid "PromptAfterUpdate"
 msgstr "PromptAfterUpdate"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:567
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -7297,13 +7536,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:573
 msgid "How APT calls dpkg"
 msgstr "APT が dpkg を呼ぶ方法"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:574
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -7313,7 +7552,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:525
+#: apt.conf.5.xml:579
 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 "
@@ -7323,18 +7562,18 @@ msgstr ""
 "ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:584
 msgid "Pre-Invoke"
 msgstr "Pre-Invoke"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:584
 msgid "Post-Invoke"
 msgstr "Post-Invoke"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:585
 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 "
@@ -7348,13 +7587,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:591
 msgid "Pre-Install-Pkgs"
 msgstr "Pre-Install-Pkgs"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:592
 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 "
@@ -7370,7 +7609,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:598
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -7386,13 +7625,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:551
+#: apt.conf.5.xml:605
 msgid "Run-Directory"
 msgstr "Run-Directory"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:606
 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."
@@ -7402,13 +7641,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:556
+#: apt.conf.5.xml:610
 msgid "Build-options"
 msgstr "Build-options"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:557
+#: apt.conf.5.xml:611
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."
@@ -7417,12 +7656,12 @@ msgstr ""
 "ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:616
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:617
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
 "multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -7437,7 +7676,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:632
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -7447,7 +7686,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:626
 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 "
@@ -7461,12 +7700,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:584
+#: apt.conf.5.xml:638
 msgid "DPkg::NoTriggers"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:639
 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 "
@@ -7479,14 +7718,14 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:646
 #, fuzzy
 #| msgid "Packages::Compress"
 msgid "PackageManager::Configure"
 msgstr "Packages::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:647
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@ -7503,13 +7742,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:603
+#: apt.conf.5.xml:657
 #, fuzzy
 msgid "DPkg::ConfigurePending"
 msgstr "ユーザの設定"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:604
+#: apt.conf.5.xml:658
 msgid ""
 "If this option is set apt will call <command>dpkg --configure --pending</"
 "command> to let dpkg handle all required configurations and triggers. This "
@@ -7520,12 +7759,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:664
 msgid "DPkg::TriggersPending"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:611
+#: apt.conf.5.xml:665
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7535,12 +7774,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:670
 msgid "PackageManager::UnpackAll"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:671
 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-"
@@ -7552,12 +7791,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml:678
 msgid "OrderList::Score::Immediate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:686
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -7569,7 +7808,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:679
 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 "
@@ -7583,12 +7822,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:645
+#: apt.conf.5.xml:699
 msgid "Periodic and Archives options"
 msgstr "Periodic オプションと Archives オプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:700
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "
@@ -7602,12 +7841,12 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:708
 msgid "Debug options"
 msgstr "デバッグオプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:710
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -7618,7 +7857,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:721
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7629,7 +7868,7 @@ msgstr ""
 "にします。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:675
+#: apt.conf.5.xml:729
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7640,7 +7879,7 @@ msgstr ""
 "literal>) を行う場合に使用します。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:738
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -7650,66 +7889,66 @@ 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>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:746
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CDROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:702
+#: apt.conf.5.xml:756
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:707
+#: apt.conf.5.xml:761
 msgid "<literal>Debug::Acquire::cdrom</literal>"
 msgstr "<literal>Debug::Acquire::cdrom</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:765
 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:718
+#: apt.conf.5.xml:772
 msgid "<literal>Debug::Acquire::ftp</literal>"
 msgstr "<literal>Debug::Acquire::ftp</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:776
 msgid "Print information related to downloading packages using FTP."
 msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:783
 msgid "<literal>Debug::Acquire::http</literal>"
 msgstr "<literal>Debug::Acquire::http</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:787
 msgid "Print information related to downloading packages using HTTP."
 msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:740
+#: apt.conf.5.xml:794
 msgid "<literal>Debug::Acquire::https</literal>"
 msgstr "<literal>Debug::Acquire::https</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:798
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:805
 msgid "<literal>Debug::Acquire::gpgv</literal>"
 msgstr "<literal>Debug::Acquire::gpgv</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:809
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -7717,46 +7956,46 @@ msgstr ""
 "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:762
+#: apt.conf.5.xml:816
 msgid "<literal>Debug::aptcdrom</literal>"
 msgstr "<literal>Debug::aptcdrom</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:766
+#: apt.conf.5.xml:820
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:827
 msgid "<literal>Debug::BuildDeps</literal>"
 msgstr "<literal>Debug::BuildDeps</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:830
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:783
+#: apt.conf.5.xml:837
 msgid "<literal>Debug::Hashes</literal>"
 msgstr "<literal>Debug::Hashes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:840
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:793
+#: apt.conf.5.xml:847
 msgid "<literal>Debug::IdentCDROM</literal>"
 msgstr "<literal>Debug::IdentCDROM</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:796
+#: apt.conf.5.xml:850
 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 "
@@ -7764,93 +8003,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:858
 msgid "<literal>Debug::NoLocking</literal>"
 msgstr "<literal>Debug::NoLocking</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:807
+#: apt.conf.5.xml:861
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:815
+#: apt.conf.5.xml:869
 msgid "<literal>Debug::pkgAcquire</literal>"
 msgstr "<literal>Debug::pkgAcquire</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:873
 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:826
+#: apt.conf.5.xml:880
 msgid "<literal>Debug::pkgAcquire::Auth</literal>"
 msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:883
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:836
+#: apt.conf.5.xml:890
 msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
 msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:893
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:847
+#: apt.conf.5.xml:901
 msgid "<literal>Debug::pkgAcquire::RRed</literal>"
 msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:905
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml:912
 msgid "<literal>Debug::pkgAcquire::Worker</literal>"
 msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:916
 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:869
+#: apt.conf.5.xml:923
 msgid "<literal>Debug::pkgAutoRemove</literal>"
 msgstr "<literal>Debug::pkgAutoRemove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:873
+#: apt.conf.5.xml:927
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:880
+#: apt.conf.5.xml:934
 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:883
+#: apt.conf.5.xml:937
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -7860,12 +8099,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:894
+#: apt.conf.5.xml:948
 msgid "<literal>Debug::pkgDepCache::Marker</literal>"
 msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:897
+#: apt.conf.5.xml:951
 msgid ""
 "Generate debug messages describing which package is marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -7882,91 +8121,91 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:916
+#: apt.conf.5.xml:970
 msgid "<literal>Debug::pkgInitConfig</literal>"
 msgstr "<literal>Debug::pkgInitConfig</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:973
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:926
+#: apt.conf.5.xml:980
 msgid "<literal>Debug::pkgDPkgPM</literal>"
 msgstr "<literal>Debug::pkgDPkgPM</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:983
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:937
+#: apt.conf.5.xml:991
 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
 msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:994
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:947
+#: apt.conf.5.xml:1001
 msgid "<literal>Debug::pkgOrderList</literal>"
 msgstr "<literal>Debug::pkgOrderList</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:1005
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:959
+#: apt.conf.5.xml:1013
 msgid "<literal>Debug::pkgPackageManager</literal>"
 msgstr "<literal>Debug::pkgPackageManager</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:1017
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:970
+#: apt.conf.5.xml:1024
 msgid "<literal>Debug::pkgPolicy</literal>"
 msgstr "<literal>Debug::pkgPolicy</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:1028
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:980
+#: apt.conf.5.xml:1034
 msgid "<literal>Debug::pkgProblemResolver</literal>"
 msgstr "<literal>Debug::pkgProblemResolver</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:984
+#: apt.conf.5.xml:1038
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:1046
 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1049
 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 "
@@ -7974,12 +8213,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1003
+#: apt.conf.5.xml:1057
 msgid "<literal>Debug::sourceList</literal>"
 msgstr "<literal>Debug::sourceList</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1007
+#: apt.conf.5.xml:1061
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -7987,7 +8226,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1030
+#: apt.conf.5.xml:1084
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -7997,7 +8236,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1037
+#: apt.conf.5.xml:1091
 #, fuzzy
 #| msgid "&apt-conf;"
 msgid "&file-aptconf;"
@@ -8006,7 +8245,7 @@ msgstr "&apt-conf;"
 # type: Content of: <refentry><refsect1><para>
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1042
+#: apt.conf.5.xml:1096
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
@@ -8159,24 +8398,40 @@ msgstr ""
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:101
+#, fuzzy
+#| msgid "priority 100"
+msgid "priority 1"
+msgstr "priority 100"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:102
+msgid ""
+"to the versions coming from archives which in their <filename>Release</"
+"filename> files are marked as \"NotAutomatic: yes\" like the debian "
+"experimental archive."
+msgstr ""
+
+# type: <tag></tag>
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:107
 msgid "priority 100"
 msgstr "priority 100"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:102
+#: apt_preferences.5.xml:108
 msgid "to the version that is already installed (if any)."
 msgstr "(あるならば) 既にインストールされているバージョン。"
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:112
 msgid "priority 500"
 msgstr "priority 500"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:107
+#: apt_preferences.5.xml:113
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -8184,13 +8439,13 @@ msgstr "インストールされておらず、ターゲットリリースに含
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:111
+#: apt_preferences.5.xml:117
 msgid "priority 990"
 msgstr "priority 990"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。"
@@ -8209,11 +8464,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:117
+#: apt_preferences.5.xml:123
+#, fuzzy
+#| msgid ""
+#| "If the target release has not been specified then APT simply assigns "
+#| "priority 100 to all installed package versions and priority 500 to all "
+#| "uninstalled package versions."
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
-"uninstalled package versions."
+"uninstalled package versions, expect versions coming from archives which in "
+"their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
+"- these versions get the priority 1."
 msgstr ""
 "ターゲットリリースが指定されていなければ、APT は単純にインストールしている"
 "パッケージのバージョンには 100 を、インストールしていないパッケージのバージョ"
@@ -8221,7 +8483,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:121
+#: apt_preferences.5.xml:129
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -8231,7 +8493,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:132
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -8247,13 +8509,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:130
+#: apt_preferences.5.xml:138
 msgid "Install the highest priority version."
 msgstr "最も高い優先度のバージョンをインストールします。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:131
+#: apt_preferences.5.xml:139
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -8263,7 +8525,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:142
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -8275,7 +8537,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:140
+#: apt_preferences.5.xml:148
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -8291,7 +8553,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:147
+#: apt_preferences.5.xml:155
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -8305,7 +8567,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:160
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -8325,13 +8587,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:169
 msgid "The Effect of APT Preferences"
 msgstr "APT 設定の効果"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:163
+#: apt_preferences.5.xml:171
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -8344,7 +8606,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:169
+#: apt_preferences.5.xml:177
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -8359,7 +8621,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:176
+#: apt_preferences.5.xml:184
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8372,7 +8634,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:190
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -8387,7 +8649,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:188
+#: apt_preferences.5.xml:196
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -8399,7 +8661,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:201
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8410,15 +8672,48 @@ msgstr ""
 "Pin: origin \"\"\n"
 "Pin-Priority: 999\n"
 
-# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:198
+#: apt_preferences.5.xml:206
 msgid ""
-"A note of caution: the keyword used here is \"<literal>origin</literal>\".  "
-"This should not be confused with the Origin of a distribution as specified "
-"in a <filename>Release</filename> file.  What follows the \"Origin:\" tag in "
-"a <filename>Release</filename> file is not an Internet address but an author "
-"or vendor name, such as \"Debian\" or \"Ximian\"."
+"A note of caution: the keyword used here is \"<literal>origin</literal>\" "
+"which can be used to match a hostname. The following record will assign a "
+"high priority to all versions available from the server identified by the "
+"hostname \"ftp.de.debian.org\""
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#: apt_preferences.5.xml:210
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: origin \"\"\n"
+#| "Pin-Priority: 999\n"
+msgid ""
+"Package: *\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
+"Pin-Priority: 999\n"
+msgstr ""
+"Package: *\n"
+"Pin: origin \"\"\n"
+"Pin-Priority: 999\n"
+
+# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
+#: apt_preferences.5.xml:214
+#, fuzzy
+#| msgid ""
+#| "A note of caution: the keyword used here is \"<literal>origin</literal>"
+#| "\".  This should not be confused with the Origin of a distribution as "
+#| "specified in a <filename>Release</filename> file.  What follows the "
+#| "\"Origin:\" tag in a <filename>Release</filename> file is not an Internet "
+#| "address but an author or vendor name, such as \"Debian\" or \"Ximian\"."
+msgid ""
+"This should <emphasis>not</emphasis> be confused with the Origin of a "
+"distribution as specified in a <filename>Release</filename> file.  What "
+"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
+"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
+"\"."
 msgstr ""
 "注意: ここで使用しているキーワードは \"<literal>origin</literal>\" です。"
 "<filename>Release</filename> ファイルに指定されたような、ディストリビューショ"
@@ -8428,7 +8723,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:219
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8439,7 +8734,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:223
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8452,22 +8747,31 @@ 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:213
+#: apt_preferences.5.xml:228
+#, fuzzy
+#| msgid ""
+#| "The following record assigns a high priority to all package versions "
+#| "belonging to any distribution whose Codename is \"<literal>squeeze</"
+#| "literal>\"."
 msgid ""
 "The following record assigns a high priority to all package versions "
-"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
-"\"."
+"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
+"</literal>\"."
 msgstr ""
 "以下のレコードは、コード名が \"<literal>squeeze</literal>\" となっているディ"
 "ストリビューションに属するパッケージを、すべて高い優先度に割り当てます。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:217
-#, no-wrap
+#: apt_preferences.5.xml:232
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Package: *\n"
+#| "Pin: release n=squeeze\n"
+#| "Pin-Priority: 900\n"
 msgid ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"
@@ -8476,7 +8780,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:237
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8488,7 +8792,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8501,18 +8805,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:253
 msgid "How APT Interprets Priorities"
 msgstr "APT が優先度に割り込む方法"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:261
 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:247
+#: apt_preferences.5.xml:262
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8520,13 +8824,13 @@ msgstr ""
 "パッケージがダウングレードしても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:266
 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:252
+#: apt_preferences.5.xml:267
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8535,13 +8839,13 @@ msgstr ""
 "含まれなくても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:272
 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:258
+#: apt_preferences.5.xml:273
 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"
@@ -8550,13 +8854,13 @@ msgstr ""
 "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:263
+#: apt_preferences.5.xml:278
 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:264
+#: apt_preferences.5.xml:279
 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"
@@ -8566,13 +8870,13 @@ msgstr ""
 "ル"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:284
 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:270
+#: apt_preferences.5.xml:285
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -8581,19 +8885,19 @@ msgstr ""
 "ンストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:274
+#: apt_preferences.5.xml:289
 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:275
+#: apt_preferences.5.xml:290
 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:241
+#: apt_preferences.5.xml:256
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -8605,7 +8909,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:280
+#: apt_preferences.5.xml:295
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8619,7 +8923,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:286
+#: apt_preferences.5.xml:301
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8629,7 +8933,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:305
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8658,13 +8962,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:318
 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:305
+#: apt_preferences.5.xml:320
 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 "
@@ -8679,7 +8983,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:325
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8691,7 +8995,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:329
 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</"
@@ -8705,13 +9009,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:324
+#: apt_preferences.5.xml:339
 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:326
+#: apt_preferences.5.xml:341
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8722,30 +9026,30 @@ msgstr ""
 "filename> ファイルを提供します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:353
 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:339
+#: apt_preferences.5.xml:354
 msgid "gives the package name"
 msgstr "パッケージ名"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342 apt_preferences.5.xml:392
+#: apt_preferences.5.xml:357 apt_preferences.5.xml:407
 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:343
+#: apt_preferences.5.xml:358
 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:330
+#: apt_preferences.5.xml:345
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8765,13 +9069,13 @@ msgstr ""
 "type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:374
 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:360
+#: apt_preferences.5.xml:375
 #, fuzzy
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
@@ -8781,51 +9085,53 @@ msgid ""
 "archive.  Specifying this value in the APT preferences file would require "
 "the line:"
 msgstr ""
-"このディレクトリツリーに属する全パッケージのアーカイブ名です。例えば、"
-"\"Archive: stable\" という行は、<filename>Release</filename> ファイルの親ディ"
-"レクトリツリー以下にある全パッケージが、<literal>stable</literal> アーカイブ"
-"だと指定します。APT 設定ファイルでこの値を指定するには、以下の行が必要になり"
-"ます。"
+"このディレクトリツリーに属する全パッケージのアーカイブ名です。例え"
+"ば、\"Archive: stable\" という行は、<filename>Release</filename> ファイルの親"
+"ディレクトリツリー以下にある全パッケージが、<literal>stable</literal> アーカ"
+"イブだと指定します。APT 設定ファイルでこの値を指定するには、以下の行が必要に"
+"なります。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:385
 #, 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:376
+#: apt_preferences.5.xml:391
 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:377
+#: apt_preferences.5.xml:392
 #, fuzzy
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
-"For example, the line \"Codename: squeeze\" specifies that all of the "
-"packages in the directory tree below the parent of the <filename>Release</"
-"filename> file belong to a version named <literal>squeeze</literal>.  "
-"Specifying this value in the APT preferences file would require the line:"
-msgstr ""
-"このディレクトリツリーに属する全パッケージのアーカイブ名です。例えば、"
-"\"Archive: stable\" という行は、<filename>Release</filename> ファイルの親ディ"
-"レクトリツリー以下にある全パッケージが、<literal>stable</literal> アーカイブ"
-"だと指定します。APT 設定ファイルでこの値を指定するには、以下の行が必要になり"
-"ます。"
+"For example, the line \"Codename: &testing-codename;\" specifies that all of "
+"the packages in the directory tree below the parent of the "
+"<filename>Release</filename> file belong to a version named "
+"<literal>&testing-codename;</literal>.  Specifying this value in the APT "
+"preferences file would require the line:"
+msgstr ""
+"このディレクトリツリーに属する全パッケージのアーカイブ名です。例え"
+"ば、\"Archive: stable\" という行は、<filename>Release</filename> ファイルの親"
+"ディレクトリツリー以下にある全パッケージが、<literal>stable</literal> アーカ"
+"イブだと指定します。APT 設定ファイルでこの値を指定するには、以下の行が必要に"
+"なります。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:386
-#, no-wrap
-msgid "Pin: release n=squeeze\n"
-msgstr "Pin: release n=squeeze\n"
+#: apt_preferences.5.xml:401
+#, fuzzy, no-wrap
+#| msgid "Pin: release a=stable\n"
+msgid "Pin: release n=&testing-codename;\n"
+msgstr "Pin: release a=stable\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:393
+#: apt_preferences.5.xml:408
 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 "
@@ -8841,7 +9147,7 @@ msgstr ""
 
 # 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:402
+#: apt_preferences.5.xml:417
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8853,13 +9159,13 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:426
 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:412
+#: apt_preferences.5.xml:427
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8877,19 +9183,19 @@ msgstr ""
 
 # 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:421
+#: apt_preferences.5.xml:436
 #, 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:427
+#: apt_preferences.5.xml:442
 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:428
+#: apt_preferences.5.xml:443
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8902,19 +9208,19 @@ msgstr ""
 
 # 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:434
+#: apt_preferences.5.xml:449
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:440
+#: apt_preferences.5.xml:455
 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:441
+#: apt_preferences.5.xml:456
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8927,24 +9233,25 @@ msgstr ""
 
 # 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:447
+#: apt_preferences.5.xml:462
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:363
 #, fuzzy
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
 "example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-"dists/woody/Release</filename>.  It consists of a single multi-line record "
-"which applies to <emphasis>all</emphasis> of the packages in the directory "
-"tree below its parent.  Unlike the <filename>Packages</filename> file, "
-"nearly all of the lines in a <filename>Release</filename> file are relevant "
-"for setting APT priorities: <placeholder type=\"variablelist\" id=\"0\"/>"
+"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> にあります。例えば、 "
@@ -8956,7 +9263,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:469
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -8982,13 +9289,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:482
 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:469
+#: apt_preferences.5.xml:484
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -8997,29 +9304,15 @@ msgstr ""
 "APT 設定ファイルのレコードごとに、任意で <literal>Explanation:</literal> で始"
 "まる行を持てます。これは、コメント用の場所を確保します。"
 
-# type: Content of: <refentry><refsect1><refsect2><para>
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
-#, fuzzy
-msgid ""
-"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
-"optional.  If omitted, APT assigns a priority of 1 less than the last value "
-"specified on a line beginning with <literal>Pin-Priority: release ...</"
-"literal>."
-msgstr ""
-"APT 設定レコードの <literal>Pin-Priority:</literal> 行は任意です。省略する"
-"と、<literal>Pin-Priority: release ...</literal> で始まる行で指示した最後の"
-"値 (少なくとも1つ) を優先度に割り当てます。"
-
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:493
 msgid "Tracking Stable"
 msgstr "安定版の追跡"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:490
+#: apt_preferences.5.xml:501
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -9044,7 +9337,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:495
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
@@ -9060,8 +9353,8 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:507 apt_preferences.5.xml:553
-#: apt_preferences.5.xml:611
+#: apt_preferences.5.xml:518 apt_preferences.5.xml:564
+#: apt_preferences.5.xml:622
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -9074,7 +9367,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:513
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -9087,14 +9380,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:530
 #, 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:513
+#: apt_preferences.5.xml:524
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -9108,13 +9401,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:536
 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:534
+#: apt_preferences.5.xml:545
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -9143,7 +9436,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:527
+#: apt_preferences.5.xml:538
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
@@ -9161,7 +9454,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:559
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -9174,14 +9467,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568
+#: apt_preferences.5.xml:579
 #, 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:559
+#: apt_preferences.5.xml:570
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -9200,24 +9493,39 @@ msgstr ""
 "の最新版にアップグレードします。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:575
+#: apt_preferences.5.xml:586
 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:589
-#, no-wrap
+#: apt_preferences.5.xml:600
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
+#| "Explanation: other than those in the distribution codenamed with squeeze or sid\n"
+#| "Package: *\n"
+#| "Pin: release n=squeeze\n"
+#| "Pin-Priority: 900\n"
+#| "\n"
+#| "Explanation: Debian unstable is always codenamed with sid\n"
+#| "Package: *\n"
+#| "Pin: release a=sid\n"
+#| "Pin-Priority: 800\n"
+#| "\n"
+#| "Package: *\n"
+#| "Pin: release o=Debian\n"
+#| "Pin-Priority: -10\n"
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
-"Explanation: other than those in the distribution codenamed with squeeze or sid\n"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
 "Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
 "Pin-Priority: 800\n"
 "\n"
 "Package: *\n"
@@ -9240,7 +9548,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:588
 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 "
@@ -9256,36 +9564,36 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:617
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
-"the release codenamed with <literal>squeeze</literal>.  <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"the release codenamed with <literal>&testing-codename;</literal>.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "適切な &sources-list; ファイルと上記の設定ファイルにより、以下のコマンドで最"
 "新の <literal>stable</literal> バージョンにアップグレードできます。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:637
 #, 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:617
+#: apt_preferences.5.xml:628
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
 "<command>apt-get upgrade</command> will upgrade the package to the most "
-"recent <literal>squeeze</literal> version if that is more recent than the "
-"installed version, otherwise, to the most recent <literal>sid</literal> "
-"version if that is more recent than the installed version.  <placeholder "
-"type=\"programlisting\" id=\"0\"/>"
+"recent <literal>&testing-codename;</literal> version if that is more recent "
+"than the installed version, otherwise, to the most recent <literal>sid</"
+"literal> version if that is more recent than the installed version.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "以下のコマンドで、指定したパッケージを <literal>unstable</literal> ディストリ"
 "ビューションの最新バージョンにアップグレードします。それ以降、<command>apt-"
@@ -9296,7 +9604,7 @@ msgstr ""
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:646
 #, fuzzy
 #| msgid "apt_preferences"
 msgid "&file-preferences;"
@@ -9304,7 +9612,7 @@ msgstr "apt_preferences"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:652
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -9553,10 +9861,14 @@ msgstr "例:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:114
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
+#| "deb http://http.us.debian.org/debian dists/stable-updates/\n"
+#| "   "
 msgid ""
-"deb http://http.us.debian.org/debian stable main contrib non-free\n"
-"deb http://http.us.debian.org/debian dists/stable-updates/\n"
+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
 "   "
 msgstr ""
 "deb http://http.us.debian.org/debian stable main contrib non-free\n"
@@ -9773,9 +10085,13 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main"
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:208
+#, fuzzy
+#| msgid ""
+#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
+#| "directory, and uses only the stable/contrib area."
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
-"directory, and uses only the stable/contrib area."
+"directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 "ftp.debian.org のアーカイブに FTP アクセスし、debian ディレクトリ以下の "
 "stable/contrib のみを使用します。"
@@ -9783,8 +10099,9 @@ msgstr ""
 # type: <example></example>
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:210
-#, no-wrap
-msgid "deb ftp://ftp.debian.org/debian stable contrib"
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian stable contrib"
+msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian stable contrib"
 
 # type: Content of: <refentry><refsect1><para>
@@ -10993,6 +11310,52 @@ msgstr ""
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 
+#~ msgid ""
+#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
+#~ "    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
+#~ "    <manvolnum>1</manvolnum>\n"
+#~ "  </citerefentry>\"\n"
+#~ ">\n"
+#~ msgstr ""
+#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
+#~ "    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
+#~ "    <manvolnum>1</manvolnum>\n"
+#~ "  </citerefentry>\"\n"
+#~ ">\n"
+
+# type: Content of: <refentry><refsect1><para>
+#, fuzzy
+#~| msgid "<filename>/etc/apt/preferences</filename>"
+#~ msgid "<filename>/var/lib/apt/extended_states</filename>"
+#~ msgstr "<filename>/etc/apt/preferences</filename>"
+
+#~ msgid "Cache-Limit"
+#~ msgstr "Cache-Limit"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "APT uses a fixed size memory mapped cache file to store the 'available' "
+#~ "information. This sets the size of that cache (in bytes)."
+#~ msgstr ""
+#~ "APT は「利用可能」情報を格納するために、固定サイズのメモリマップキャッシュ"
+#~ "ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。"
+
+# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
+#~ msgid "Pin: release n=squeeze\n"
+#~ msgstr "Pin: release n=squeeze\n"
+
+# type: Content of: <refentry><refsect1><refsect2><para>
+#, fuzzy
+#~ msgid ""
+#~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
+#~ "is optional.  If omitted, APT assigns a priority of 1 less than the last "
+#~ "value specified on a line beginning with <literal>Pin-Priority: "
+#~ "release ...</literal>."
+#~ msgstr ""
+#~ "APT 設定レコードの <literal>Pin-Priority:</literal> 行は任意です。省略する"
+#~ "と、<literal>Pin-Priority: release ...</literal> で始まる行で指示した最後"
+#~ "の値 (少なくとも1つ) を優先度に割り当てます。"
+
 # type: Content of: <refentry><refsect1><para>
 #~ msgid ""
 #~ "<filename>apt.conf</filename> is the main configuration file for the APT "
@@ -11397,10 +11760,6 @@ msgstr ""
 #~ msgid "Site"
 #~ msgstr "Site"
 
-# type: <tag></tag>
-#~ msgid "IndexType"
-#~ msgstr "IndexType"
-
 # type: <tag></tag>
 #~ msgid "Size"
 #~ msgstr "Size"