Release 1.3~rc3

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

diff --git a/doc/po/ja.po b/doc/po/ja.po
index f877f2935c72c8c979090c67eb73cc754b50a086..b992b66fcb2c833b6ded8607adf511ff4d790f84 100644 (file)
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -4,22 +4,25 @@
 #
 # Translators:
 # KURASAWA Nozomu, 2003-2006, 2009-2012.
 #
 # Translators:
 # KURASAWA Nozomu, 2003-2006, 2009-2012.

+# Takuma Yamada <tyamada@takumayamada.com>, 2016.
+#

 msgid ""
 msgstr ""
 msgid ""
 msgstr ""

-"Project-Id-Version: apt 0.7.25.3\n"
+"Project-Id-Version: apt-doc 1.0.6\n"

 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
-"PO-Revision-Date: 2012-08-08 07:58+0900\n"
-"Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
-"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2016-08-30 22:20+0200\n"
+"PO-Revision-Date: 2016-03-23 09:39+0900\n"
+"Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"Language: ja\n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

+"X-Generator: Gtranslator 2.91.6\n"

 
 #. type: Plain text
 
 #. type: Plain text

-#: apt.ent:7
+#: apt.ent

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


@@ -225,7 +228,7 @@ msgstr ""
 "\n"
 
 #. type: Plain text
 "\n"
 
 #. type: Plain text

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

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


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

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

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


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

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

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


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

-#: apt.ent:109
+#: apt.ent

 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

-#: apt.ent:150
+#: apt.ent

 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


@@ -475,11 +478,12 @@ msgstr ""
 "     specially related to your translation. -->\n"
 "<!ENTITY translation-holder \"\n"
 "     倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006,2009-2012),\n"
 "     specially related to your translation. -->\n"
 "<!ENTITY translation-holder \"\n"
 "     倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006,2009-2012),\n"

+"     Takuma Yamada <email>tyamada@takumayamada.com</email> (2016),\n"

 "     Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>\n"
 "\">\n"
 
 #. type: Plain text
 "     Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>\n"
 "\">\n"
 
 #. type: Plain text

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

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


@@ -499,13 +503,14 @@ msgstr ""
 "     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"
 "     is not a mistake by the translator - obviously the target is that at least for stable\n"
 "     releases this sentence is not needed. :) -->\n"
 "<!ENTITY translation-english \"\n"

-"     この翻訳文書には未訳部分が含まれていることに注意してください。\n"
+"     この翻訳文書には未訳部分が含まれている可能性があることに\n"
+"     注意してください。\n"

 "     翻訳がオリジナルに追従できていない場合、\n"
 "     内容を失わないようにこのようにしています。\n"
 "\">\n"
 
 #. type: Plain text
 "     翻訳がオリジナルに追従できていない場合、\n"
 "     内容を失わないようにこのようにしています。\n"
 "\">\n"
 
 #. type: Plain text

-#: apt.ent:198
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"


@@ -514,7 +519,7 @@ msgstr ""
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"設定文字列\">"
 
 #. type: Plain text
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"設定文字列\">"
 
 #. type: Plain text

-#: apt.ent:201
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"


@@ -523,7 +528,7 @@ msgstr ""
 "synopsis-config-file \"設定ファイル\">"
 
 #. type: Plain text
 "synopsis-config-file \"設定ファイル\">"
 
 #. type: Plain text

-#: apt.ent:204
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "


@@ -534,7 +539,7 @@ msgstr ""
 "ス\">"
 
 #. type: Plain text
 "ス\">"
 
 #. type: Plain text

-#: apt.ent:207
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"


@@ -543,7 +548,7 @@ msgstr ""
 "synopsis-architecture \"アーキテクチャ\">"
 
 #. type: Plain text
 "synopsis-architecture \"アーキテクチャ\">"
 
 #. type: Plain text

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

 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"


@@ -552,7 +557,7 @@ msgstr ""
 "--> <!ENTITY synopsis-pkg \"パッケージ\">"
 
 #. type: Plain text
 "--> <!ENTITY synopsis-pkg \"パッケージ\">"
 
 #. type: Plain text

-#: apt.ent:213
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"


@@ -561,7 +566,7 @@ msgstr ""
 "ENTITY synopsis-pkg-ver-number \"パッケージバージョン番号\">"
 
 #. type: Plain text
 "ENTITY synopsis-pkg-ver-number \"パッケージバージョン番号\">"
 
 #. type: Plain text

-#: apt.ent:216
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"


@@ -570,7 +575,7 @@ msgstr ""
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 
 #. type: Plain text
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 
 #. type: Plain text

-#: apt.ent:219
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"


@@ -579,7 +584,7 @@ msgstr ""
 "awesome --> <!ENTITY synopsis-regex \"正規表現\">"
 
 #. type: Plain text
 "awesome --> <!ENTITY synopsis-regex \"正規表現\">"
 
 #. type: Plain text

-#: apt.ent:222
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"


@@ -588,7 +593,7 @@ msgstr ""
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"CDROMマウントポイント\">"
 
 #. type: Plain text
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"CDROMマウントポイント\">"
 
 #. type: Plain text

-#: apt.ent:225
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "


@@ -599,7 +604,7 @@ msgstr ""
 "クトリ\">"
 
 #. type: Plain text
 "クトリ\">"
 
 #. type: Plain text

-#: apt.ent:228
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"


@@ -608,7 +613,7 @@ msgstr ""
 "synopsis-filename \"ファイル名\">"
 
 #. type: Plain text
 "synopsis-filename \"ファイル名\">"
 
 #. type: Plain text

-#: apt.ent:231
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"


@@ -617,7 +622,7 @@ msgstr ""
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"パス\">"
 
 #. type: Plain text
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"パス\">"
 
 #. type: Plain text

-#: apt.ent:234
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "


@@ -628,7 +633,7 @@ msgstr ""
 "\"override-file\">"
 
 #. type: Plain text
 "\"override-file\">"
 
 #. type: Plain text

-#: apt.ent:237
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "


@@ -639,7 +644,7 @@ msgstr ""
 "\"pathprefix\">"
 
 #. type: Plain text
 "\"pathprefix\">"
 
 #. type: Plain text

-#: apt.ent:240
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"


@@ -648,7 +653,7 @@ msgstr ""
 "generate section --> <!ENTITY synopsis-section \"セクション\">"
 
 #. type: Plain text
 "generate section --> <!ENTITY synopsis-section \"セクション\">"
 
 #. type: Plain text

-#: apt.ent:243
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"


@@ -657,48 +662,340 @@ msgstr ""
 "473041FA --> <!ENTITY synopsis-keyid \"キーID\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 "473041FA --> <!ENTITY synopsis-keyid \"キーID\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>

-#: apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27 apt-mark.8.xml:28
-#: apt-secure.8.xml:27 apt-cdrom.8.xml:27 apt-config.8.xml:28
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml

 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>

-#: apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28 apt-mark.8.xml:29
-#: apt-secure.8.xml:28 apt-cdrom.8.xml:28 apt-config.8.xml:29
-#: apt.conf.5.xml:34 apt_preferences.5.xml:28 sources.list.5.xml:29
-#: apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29 apt-ftparchive.1.xml:29
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml

 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-get.8.xml:35
-msgid "APT package handling utility -- command-line interface"
-msgstr "APT パッケージ操作ユーティリティ -- コマンドラインインターフェース"
+#: apt.8.xml
+msgid "command-line interface"
+msgstr "コマンドラインインターフェイス"

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

-#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39 apt-mark.8.xml:40
-#: apt-secure.8.xml:52 apt-cdrom.8.xml:39 apt-config.8.xml:40
-#: apt.conf.5.xml:43 apt_preferences.5.xml:38 sources.list.5.xml:38
-#: apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40 apt-ftparchive.1.xml:40
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml

 msgid "Description"
 msgstr "説明"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Description"
 msgstr "説明"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-get.8.xml:41
+#: apt.8.xml
+msgid ""
+"<command>apt</command> provides a high-level commandline interface for the "
+"package management system. It is intended as an end user interface and "
+"enables some options better suited for interactive usage by default compared "
+"to more specialized APT tools like &apt-get; and &apt-cache;."
+msgstr ""
+"<command>apt</command> は、パッケージ管理システム用の高レベルのコマンドライン"
+"インターフェースを提供します。エンドユーザインターフェースとして設計されてい"
+"ます。また &apt-get; や &apt-cache; のような専用の APT ツールと比べて、デフォ"
+"ルトでインタラクティブな使用に適したいくつかのオプションが有効になっていま"
+"す。"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml
+msgid ""
+"Much like <command>apt</command> itself, its manpage is intended as an end "
+"user interface and as such only mentions the most used commands and options "
+"partly to not duplicate information in multiple places and partly to avoid "
+"overwhelming readers with a cornucopia of options and details."
+msgstr ""
+"<command>apt</command> 自身と同じように、man ページはエンドユーザインター"
+"フェースとして意図されています。さらに、一部のオプションや詳細の豊富さで読者"
+"を圧倒することを避けるため、複数の場所で部分的に情報を複製しないよう、最も使"
+"用されるコマンドとオプションを言及するように意図されています。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(&apt-get;)"
+msgstr "(&apt-get;)"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+msgid ""
+"<option>update</option> is used to download package information from all "
+"configured sources. Other commands operate on this data to e.g. perform "
+"package upgrades or search in and display details about all packages "
+"available for installation."
+msgstr ""
+"<option>update</option> は、設定されたすべての取得元からパッケージ情報をダウ"
+"ンロードするために使用されます。ほかのコマンドは、このデータを操作します。例"
+"えば、パッケージのアップグレードを実行したり、中を検索したり、インストール可"
+"能なすべてのパッケージに関する詳細情報を表示します。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+msgid ""
+"<option>upgrade</option> is used to install available upgrades of all "
+"packages currently installed on the system from the sources configured via "
+"&sources-list;. New packages will be installed if required to statisfy "
+"dependencies, but existing packages will never be removed. If an upgrade for "
+"a package requires the remove of an installed package the upgrade for this "
+"package isn't performed."
+msgstr ""
+"<option>upgrade</option> は、&sources-list; で設定された取得元からシステムに"
+"現在インストール済みのすべてのパッケージで利用可能なアップグレードをインス"
+"トールするために使用されます。依存関係を満たすために必要な場合は新しいパッ"
+"ケージがインストールされますが、既存のパッケージが削除されることはありませ"
+"ん。パッケージのアップグレードにインストール済みパッケージの削除が必要な場"
+"合、そのパッケージのアップグレードは行われません。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+msgid ""
+"<literal>full-upgrade</literal> performs the function of upgrade but will "
+"remove currently installed packages if this is needed to upgrade the system "
+"as a whole."
+msgstr ""
+"<literal>full-upgrade</literal> はアップグレードの機能を実行しますが、システ"
+"ム全体をアップグレードするために必要とされる場合には、現在インストール済みの"
+"パッケージを削除することができます。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml apt-key.8.xml
+msgid ","
+msgstr ","
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+msgid ""
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overridden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."
+msgstr ""
+"&regex;、&glob; または 完全な一致で指定された 1 つ以上のパッケージに対して要"
+"求された処理を実行します。要求された処理は、特定のパッケージに対してパッケー"
+"ジ名にプラス (+) を追加してパッケージのインストールを、マイナス (-) を追加し"
+"てパッケージの削除を上書きすることができます。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+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 select. Alternatively the version from a specific release can be selected "
+"by following the package name with a forward slash (/) and codename (&debian-"
+"stable-codename;, &debian-testing-codename;, sid …) or suite name (stable, "
+"testing, unstable). This will also select versions from this release for "
+"dependencies of this package if needed to satisfy the request."
+msgstr ""
+"パッケージ名にイコール (=) とパッケージのバージョンを続けることで、選択した"
+"バージョンのパッケージをインストールすることができます。代わりに、パッケージ"
+"名にスラッシュ (/) およびコード名 (&debian-stable-codename;、&debian-testing-"
+"codename;、sid …) またはスイート名 (stable、testing、unstable) を続けること"
+"で、特定のリリースのバージョンをインストールすることができます。また、必要な"
+"場合には、パッケージの依存関係を満たすリリースからバージョンを選択します。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+msgid ""
+"Removing a package removes all packaged data, but leaves usually small "
+"(modified) user configuration files behind, in case the remove was an "
+"accident. Just issuing an installation request for the accidentally removed "
+"package will restore its function as before in that case. On the other hand "
+"you can get rid of these leftovers by calling <command>purge</command> even "
+"on already removed packages. Note that this does not affect any data or "
+"configuration stored in your home directory."
+msgstr ""
+"パッケージの削除はパッケージの全データを削除しますが、削除の事故に備えて、通"
+"常は隠れている小さな (修正された) ユーザ設定ファイルを残します。問題が発生し"
+"たときは、誤って削除したパッケージのインストール要求を発行すると、以前のよう"
+"にその機能を復元します。一方、<command>purge</command> を呼び出すことで、すで"
+"に削除したパッケージの残されたデータを削除することができます。これはあなたの"
+"ホームディレクトリに保存しているデータや設定には影響を与えないことに注意して"
+"ください。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."
+msgstr ""
+"<literal>autoremove</literal> は、ほかのパッケージの依存関係を満たすために自"
+"動的にインストールされた後に、依存関係の変更あるいは必要としていたパッケージ"
+"が削除されたことでもう必要なくなったパッケージの削除に使用することができま"
+"す。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+msgid ""
+"You should check that the list does not include applications you have grown "
+"to like even though they were once installed just as a dependency of another "
+"package. You can mark such a package as manually installed by using &apt-"
+"mark;. Packages which you have installed explicitly via <command>install</"
+"command> are also never proposed for automatic removal."
+msgstr ""
+"別のパッケージの依存関係のため一度インストールされたなどで増えたアプリケー"
+"ションがリストに含まれていないことを確認する必要があります。&apt-mark; を使っ"
+"て、手動でパッケージをインストール済にマークすることができます。"
+"<command>install</command> 経由で明示的にインストールしたパッケージは、自動削"
+"除のために提案されることはありません。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(&apt-cache;)"
+msgstr "(&apt-cache;)"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+msgid ""
+"<option>search</option> can be used to search for the given &regex; term(s) "
+"in the list of available packages and display matches.  This can e.g. be "
+"useful if you are looking for packages having a specific feature.  If you "
+"are looking for a package including a specific file try &apt-file;."
+msgstr ""
+"<option>search</option> は、利用可能なパッケージのリストを指定した &regex; 条"
+"件で検索してマッチした結果を表示するために使用することができます。これは、例"
+"えば特定の機能をもつパッケージを探している場合に有用です。特定のファイルを含"
+"むパッケージを探しているのなら、&apt-file; を試してください。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+msgid ""
+"Show information about the given package(s) including its dependencies, "
+"installation and download size, sources the package is available from, the "
+"description of the packages content and much more. It can e.g. be helpful to "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."
+msgstr ""
+"指定されたパッケージに関する情報を表示します。依存関係、インストールおよびダ"
+"ウンロードサイズ、パッケージが入手可能な取得元、パッケージの内容の説明などを"
+"含みます。例えば &apt; にパッケージの削除をさせる前や、インストールする新しい"
+"パッケージを検索するときに、この情報を見て参考にすることができます。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"
+msgstr "(作業中)"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+msgid ""
+"<option>list</option> is somewhat similar to <command>dpkg-query --list</"
+"command> in that it can display a list of packages satisfying certain "
+"criteria.  It supports &glob; patterns for matching package names as well as "
+"options to list installed (<option>--installed</option>), upgradeable "
+"(<option>--upgradeable</option>) or all available (<option>--all-versions</"
+"option>) versions."
+msgstr ""
+"<option>list</option> は、一定の基準を満たすパッケージのリストを表示すること"
+"ができるという点で、<command>dpkg-query --list</command> に似ています。インス"
+"トール済 (<option>--installed</option>)、アップグレード可能 (<option>--"
+"upgradeable</option>) または利用可能なすべてのバージョン (<option>--all-"
+"versions</option>) の一覧オプションでも、パッケージ名をマッチさせる &glob; パ"
+"ターンをサポートしています。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+msgid ""
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."
+msgstr ""
+"<literal>edit-sources</literal> は、お好みのテキストエディタで &sources-"
+"list; ファイルを編集することができます。また、基本的な健全性チェックを提供し"
+"ます。"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml
+msgid "Script Usage and Differences from Other APT Tools"
+msgstr "スクリプトの使い方およびほかの APT ツールとの違い"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml
+msgid ""
+"The &apt; commandline is designed as an end-user tool and it may change "
+"behavior between versions. While it tries not to break backward "
+"compatibility this is not guaranteed either if a change seems beneficial for "
+"interactive use."
+msgstr ""
+"&apt; コマンドラインはエンドユーザ向けツールとして設計されています。動作は"
+"バージョン間で変更される可能性があります。後方互換性を損なうことのないように"
+"は努めますが、変更がインタラクティブな使用に有益と思われる場合には、その保証"
+"はありません。"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml
+msgid ""
+"All features of &apt; are available in dedicated APT tools like &apt-get; "
+"and &apt-cache; as well.  &apt; just changes the default value of some "
+"options (see &apt-conf; and specifically the Binary scope). So you should "
+"prefer using these commands (potentially with some additional options "
+"enabled) in your scripts as they keep backward compatibility as much as "
+"possible."
+msgstr ""
+"&apt; のすべての機能は、&apt-get; や &apt-cache; など専用の APT ツールで利用"
+"可能です。&apt; は、単にいくつかのオプションのデフォルト値を変更します (&apt-"
+"conf; の特にバイナリ範囲を参照)。可能な限り下位互換性を保つように、スクリプト"
+"では (潜在的に有効になっているいくつかの追加オプションをつけて) コマンドを使"
+"うべきです。"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "See Also"
+msgstr "関連項目"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml
+msgid ""
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
+"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
+msgstr ""
+"&apt-get;、&apt-cache;、&sources-list;、&apt-conf;、&apt-config;、"
+"&guidesdir; にある APT ユーザガイド、&apt-preferences;、APT Howto."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-cdrom.8.xml
+#: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml
+#: apt-ftparchive.1.xml
+msgid "Diagnostics"
+msgstr "診断メッセージ"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml
+msgid ""
+"<command>apt</command> returns zero on normal operation, decimal 100 on "
+"error."
+msgstr ""
+"<command>apt</command> は正常終了時に 0 を返します。エラー時には十進の 100 を"
+"返します。"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-get.8.xml
+msgid "APT package handling utility -- command-line interface"
+msgstr "APT パッケージ操作ユーティリティ -- コマンドラインインターフェース"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-get.8.xml

 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "

-"library.  Several \"front-end\" interfaces exist, such as &dselect;, "
-"&aptitude;, &synaptic; and &wajig;."
+"library.  Several \"front-end\" interfaces exist, such as &aptitude;, "
+"&synaptic; and &wajig;."

 msgstr ""
 "<command>apt-get</command> は、パッケージを操作するコマンドラインツールで、"
 "APT ライブラリを用いる他のツールのユーザ側「バックエンド」といえるものです。"
 msgstr ""
 "<command>apt-get</command> は、パッケージを操作するコマンドラインツールで、"
 "APT ライブラリを用いる他のツールのユーザ側「バックエンド」といえるものです。"

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

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

-#: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml apt-cache.8.xml apt-cdrom.8.xml apt-config.8.xml
+#: apt-ftparchive.1.xml

 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."


@@ -707,7 +1004,7 @@ msgstr ""
 "下に挙げるコマンドが必要です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "下に挙げるコマンドが必要です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:51
+#: apt-get.8.xml

 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "


@@ -729,7 +1026,7 @@ msgstr ""
 "のサイズを知ることができないため、全体の進捗メータは正しく表示されません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "のサイズを知ることができないため、全体の進捗メータは正しく表示されません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:63
+#: apt-get.8.xml

 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "


@@ -753,7 +1050,7 @@ msgstr ""
 "ケージの新しいバージョンがあることを知らせる必要があります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ケージの新しいバージョンがあることを知らせる必要があります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:76
+#: apt-get.8.xml

 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "


@@ -777,7 +1074,7 @@ msgstr ""
 "さい。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "さい。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:89
+#: apt-get.8.xml

 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"


@@ -794,7 +1091,7 @@ msgstr ""
 "ど)"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ど)"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:100
+#: apt-get.8.xml

 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "


@@ -822,7 +1119,7 @@ msgstr ""
 "断を上書きするのに利用される可能性があります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "断を上書きするのに利用される可能性があります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:118
+#: apt-get.8.xml

 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "


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

-#: apt-get.8.xml:125
+#: apt-get.8.xml

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


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

-#: apt-get.8.xml:128
+#: apt-get.8.xml

 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "


@@ -867,7 +1164,7 @@ msgstr ""
 "あるパッケージ) をダウンロード・インストールします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "あるパッケージ) をダウンロード・インストールします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:139
+#: apt-get.8.xml

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


@@ -876,7 +1173,7 @@ msgstr ""
 "リシーを作成できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "リシーを作成できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:143
+#: apt-get.8.xml

 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "


@@ -893,7 +1190,7 @@ msgstr ""
 "ば、'^' や '$' を付けるか、もっと詳しい正規表現を指定してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ば、'^' や '$' を付けるか、もっと詳しい正規表現を指定してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:153
+#: apt-get.8.xml

 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "


@@ -908,7 +1205,7 @@ msgstr ""
 "トールします。"
 
 #. 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

 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "


@@ -918,7 +1215,7 @@ msgstr ""
 "<literal>purge</literal> は <literal>remove</literal> と同じです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>purge</literal> は <literal>remove</literal> と同じです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:166
+#: apt-get.8.xml

 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "


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

-#: apt-get.8.xml:174
+#: apt-get.8.xml

 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "


@@ -951,7 +1248,7 @@ msgstr ""
 "すぎ・新しすぎな) ソースバージョンを取得したり、何も取得できなくなります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "すぎ・新しすぎな) ソースバージョンを取得したり、何も取得できなくなります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:180
+#: apt-get.8.xml

 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "


@@ -966,7 +1263,7 @@ msgstr ""
 "ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:187
+#: apt-get.8.xml

 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "


@@ -980,7 +1277,7 @@ msgstr ""
 "バージョンに厳密に一致させています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "バージョンに厳密に一致させています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:193
+#: apt-get.8.xml

 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "


@@ -991,7 +1288,7 @@ msgstr ""
 "ソースの tarball のように、単にカレントディレクトリにダウンロードします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ソースの tarball のように、単にカレントディレクトリにダウンロードします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:199
+#: apt-get.8.xml

 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "


@@ -1006,7 +1303,7 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."


@@ -1015,7 +1312,7 @@ msgstr ""
 "チェックする診断ツールです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "チェックする診断ツールです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:211
+#: apt-get.8.xml

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


@@ -1024,25 +1321,29 @@ msgstr ""
 "トリにダウンロードします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "トリにダウンロードします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:217
+#: apt-get.8.xml

 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
 "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/archives/"
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
 "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/archives/"

-"partial/</filename>. When APT is used as a &dselect; method, <literal>clean</"
-"literal> is run automatically.  Those who do not use dselect will likely "
-"want to run <literal>apt-get clean</literal> from time to time to free up "
-"disk space."
+"partial/</filename>."

 msgstr ""
 "<literal>clean</literal> は、取得したパッケージのローカルリポジトリを掃除しま"
 "す。<filename>&cachedir;/archives/</filename> と <filename>&cachedir;/"
 msgstr ""
 "<literal>clean</literal> は、取得したパッケージのローカルリポジトリを掃除しま"
 "す。<filename>&cachedir;/archives/</filename> と <filename>&cachedir;/"

-"archives/partial/</filename> からロックファイル以外すべて削除します。APT が "
-"&dselect; から呼ばれるときには、自動的に <literal>clean</literal> が実行され"
-"ます。dselectを使用しない場合は、ディスクスペースを解放するため、時々 "
-"<literal>apt-get clean</literal> を実行したくなるでしょう。"
+"archives/partial/</filename> からロックファイル以外すべて削除します。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr "(および"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr "1.1 以降の別名)"

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

-#: apt-get.8.xml:227
+#: apt-get.8.xml

 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "


@@ -1052,16 +1353,16 @@ msgid ""
 "Installed</literal> will prevent installed packages from being erased if it "
 "is set to off."
 msgstr ""
 "Installed</literal> will prevent installed packages from being erased if it "
 "is set to off."
 msgstr ""

-"<literal>clean</literal> ã\81¨å\90\8cæ§\98に、<literal>autoclean</literal> は取得した"
+"<literal>clean</literal> ã\81®ã\82\88ã\81\86に、<literal>autoclean</literal> は取得した"

 "パッケージのローカルリポジトリを掃除します。違いは、もうダウンロードされるこ"
 "とがないパッケージファイルや、ほとんど不要なパッケージファイルのみを削除する"
 "パッケージのローカルリポジトリを掃除します。違いは、もうダウンロードされるこ"
 "とがないパッケージファイルや、ほとんど不要なパッケージファイルのみを削除する"

-"ことです。このため、長い期間、キャッシュが管理できずに肥大化することなく、維"
-"持することができます。設定オプション <literal>APT::Clean-Installed</literal> "
-"に off をセットしていれば、インストール済のパッケージファイルが削除されるのを"
-"防げます。"
+"ことです。このため、キャッシュは、制御不能になるほど成長することなく、長期に"
+"わたって維持することができます。設定オプション <literal>APT::Clean-"
+"Installed</literal> に off をセットしていれば、インストール済みのパッケージ"
+"ファイルが削除されるのを防ぐことができます。"

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

-#: apt-get.8.xml:237
+#: apt-get.8.xml

 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "


@@ -1071,36 +1372,62 @@ msgstr ""
 "的にインストールされ、もう必要なくなったパッケージを削除するのに使用します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "的にインストールされ、もう必要なくなったパッケージを削除するのに使用します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:242
+#: apt-get.8.xml

 msgid ""
 msgid ""

-"<literal>changelog</literal> downloads a package changelog and displays it "
-"through <command>sensible-pager</command>. The server name and base "
-"directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
-"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
-"ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu).  By default it displays the changelog for the version that is "
-"installed.  However, you can specify the same options as for the "
-"<option>install</option> command."
+"<literal>changelog</literal> tries to download the changelog of a package "
+"and displays it through <command>sensible-pager</command>.  By default it "
+"displays the changelog for the version that is installed.  However, you can "
+"specify the same options as for the <option>install</option> command."

 msgstr ""
 "<literal>changelog</literal> は、パッケージの changelog をダウンロードし、"
 msgstr ""
 "<literal>changelog</literal> は、パッケージの changelog をダウンロードし、"

-"<command>sensible-pager</command> で表示します。サーバ名とベースディレクトリ"
-"は <literal>APT::Changelogs::Server</literal> 変数で定義されます (例: Debian "
-"の <ulink url=\"http://packages.debian.org/changelogs\">packages.debian.org/"
-"changelogs</ulink> や Ubuntu の <ulink url=\"http://changelogs.ubuntu.com/"
-"changelogs\">changelogs.ubuntu.com/changelogs</ulink>)。デフォルトでは、イン"
-"ストールされるバージョンの changelog を表示しますが、<option>install</"
-"option> コマンドと同じオプションを使用できます。"
+"<command>sensible-pager</command> で表示します。デフォルトでは、インストール"
+"されているバージョンの changelog を表示します。しかし、<option>install</"
+"option> コマンドと同じオプションを指定することができます。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Displays by default a deb822 formatted listing of information about all "
+#| "data files (aka index targets) <command>apt-get update</command> would "
+#| "download. Supports a <option>--format</option> option to modify the "
+#| "output format as well as accepts lines of the default output to filter "
+#| "the records by. The command is mainly used as an interface for external "
+#| "tools working with APT to get information as well as filenames for "
+#| "downloaded files so they can use them as well instead of downloading them "
+#| "again on their own. Detailed documentation is omitted here and can "
+#| "instead be found in the source tree in <literal><filename>doc/acquire-"
+#| "additional-files.txt</filename></literal>."
+msgid ""
+"Displays by default a deb822 formatted listing of information about all data "
+"files (aka index targets) <command>apt-get update</command> would download. "
+"Supports a <option>--format</option> option to modify the output format as "
+"well as accepts lines of the default output to filter the records by. The "
+"command is mainly used as an interface for external tools working with APT "
+"to get information as well as filenames for downloaded files so they can use "
+"them as well instead of downloading them again on their own. Detailed "
+"documentation is omitted here and can instead be found in the file &apt-"
+"acquire-additional-files; shipped by the <package>apt-doc</package> package."
+msgstr ""
+"デフォルトでは <command>apt-get update</command> でダウンロードすることができ"
+"るすべてのデータファイル (別名インデックスターゲット) に関する情報の deb822 "
+"形式のリストを表示します。出力形式を変更する、またレコードをフィルタするデ"
+"フォルト出力の行を受け付けるための <option>--format</option> オプションをサ"
+"ポートします。コマンドは主に、ダウンロードしたファイルの情報やファイル名を取"
+"得するために、APT を扱う外部ツール用のインターフェースとして使用されます。そ"
+"して、外部ツールが自身で再度ダウンロードする代わりに使用することができます。"
+"詳細なドキュメントはここでは省略しますが、代わりに <literal><filename>doc/"
+"acquire-additional-files.txt</filename></literal> 中のソースツリーで見つける"
+"ことができます。"

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

-#: apt-get.8.xml:260 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml

 msgid "options"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "options"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:265
+#: apt-get.8.xml

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


@@ -1109,7 +1436,7 @@ msgstr ""
 "<literal>APT::Install-Recommends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::Install-Recommends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:270
+#: apt-get.8.xml

 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."


@@ -1118,7 +1445,7 @@ msgstr ""
 "<literal>APT::Install-Suggests</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::Install-Suggests</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:275
+#: apt-get.8.xml

 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."


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

-#: apt-get.8.xml:280
+#: apt-get.8.xml

 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "


@@ -1136,10 +1463,10 @@ msgid ""
 "running APT for the first time; APT itself does not allow broken package "
 "dependencies to exist on a system. It is possible that a system's dependency "
 "structure can be so corrupt as to require manual intervention (which usually "
 "running APT for the first time; APT itself does not allow broken package "
 "dependencies to exist on a system. It is possible that a system's dependency "
 "structure can be so corrupt as to require manual intervention (which usually "

-"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
-"of the offending packages). Use of this option together with <option>-m</"
-"option> may produce an error in some situations.  Configuration Item: "
-"<literal>APT::Get::Fix-Broken</literal>."
+"means using <command>dpkg --remove</command> to eliminate some of the "
+"offending packages). Use of this option together with <option>-m</option> "
+"may produce an error in some situations.  Configuration Item: <literal>APT::"
+"Get::Fix-Broken</literal>."

 msgstr ""
 "修復 - 依存関係が壊れたシステムの修正を試みます。このオプションを install や "
 "remove と一緒に使うときは、APT が解決法を推測するので、パッケージを指定しなく"
 msgstr ""
 "修復 - 依存関係が壊れたシステムの修正を試みます。このオプションを install や "
 "remove と一緒に使うときは、APT が解決法を推測するので、パッケージを指定しなく"


@@ -1147,13 +1474,13 @@ msgstr ""
 "体は、システムに存在する破損したパッケージ依存関係を許すことができないので、"
 "初めて APT を実行する場合、このオプションが必要になることがあります。システム"
 "の依存関係構造にかなり問題がある場合は、手動で修正するよう要求することもあり"
 "体は、システムに存在する破損したパッケージ依存関係を許すことができないので、"
 "初めて APT を実行する場合、このオプションが必要になることがあります。システム"
 "の依存関係構造にかなり問題がある場合は、手動で修正するよう要求することもあり"

-"ます。(通常は、問題のあるパッケージを取り除くのに &dselect; や <command>dpkg "
-"--remove</command> を使用します) このオプションを <option>-m</option> オプ"
-"ã\82·ã\83§ã\83³ã\81¨å\90\8cæ\99\82ã\81«ä½¿ç\94¨ã\81\99ã\82\8bã\81¨ã\80\81ã\82¨ã\83©ã\83¼ã\81«ã\81ªã\82\8bç\8a¶æ³\81ã\81\8cã\81\82ã\82\8bã\81\8bã\82\82ã\81\97ã\82\8cã\81¾ã\81\9bã\82\93ã\80\82設å®\9aé \85ç\9b®: "
-"<literal>APT::Get::Fix-Broken</literal>"
+"ます。(通常は、問題のあるパッケージを取り除くのに <command>dpkg --remove</"
+"command> を使用します) このオプションを <option>-m</option> オプションと同時"
+"ã\81«ä½¿ç\94¨ã\81\99ã\82\8bã\81¨ã\80\81ã\82¨ã\83©ã\83¼ã\81«ã\81ªã\82\8bç\8a¶æ³\81ã\81\8cã\81\82ã\82\8bã\81\8bã\82\82ã\81\97ã\82\8cã\81¾ã\81\9bã\82\93ã\80\82設å®\9aé \85ç\9b®: <literal>APT::"
+"Get::Fix-Broken</literal>"

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

-#: apt-get.8.xml:295
+#: apt-get.8.xml

 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "


@@ -1172,7 +1499,7 @@ msgstr ""
 "Get::Fix-Missing</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Get::Fix-Missing</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:306
+#: apt-get.8.xml

 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "


@@ -1183,7 +1510,7 @@ msgstr ""
 "がよいでしょう。設定項目: <literal>APT::Get::Download</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "がよいでしょう。設定項目: <literal>APT::Get::Download</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:313
+#: apt-get.8.xml

 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "


@@ -1202,35 +1529,29 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:328
-msgid ""
-"No action; perform a simulation of events that would occur but do not "
-"actually change the system.  Configuration Item: <literal>APT::Get::"
-"Simulate</literal>."
-msgstr ""
-"動作なし - なにが起こるのかのシミュレーションを行い、実際にはシステムの変更を"
-"行いません。設定項目: <literal>APT::Get::Simulate</literal>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:332
+#: apt-get.8.xml

 msgid ""
 msgid ""

-"Simulated runs performed as a user will automatically deactivate locking "
-"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
-"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
-"will also be displayed indicating that this is only a simulation. Runs "
-"performed as root do not trigger either NoLocking or the notice - superusers "
-"should know what they are doing without further warnings from <literal>apt-"
-"get</literal>."
+"No action; perform a simulation of events that would occur based on the "
+"current system state but do not actually change the system. Locking will be "
+"disabled (<option>Debug::NoLocking</option>)  so the system state could "
+"change while <command>apt-get</command> is running. Simulations can also be "
+"executed by non-root users which might not have read access to all apt "
+"configuration distorting the simulation.  A notice expressing this warning "
+"is also shown by default for non-root users (<option>APT::Get::Show-User-"
+"Simulation-Note</option>).  Configuration Item: <literal>APT::Get::Simulate</"
+"literal>."

 msgstr ""
 msgstr ""

-"ユーザとしてシミュレーションを実行すると、自動ではロックを行いません "
-"(<literal>Debug::NoLocking</literal>)。また、<literal>APT::Get::Show-User-"
-"Simulation-Note</literal> オプションが設定されている (デフォルト) と、これが"
-"シミュレーションであるという注意を表示します。root 権限で実行すると、"
-"NoLocking も 注意も行われません (スーパーユーザは <literal>apt-get</literal> "
-"による警告などなくても、何をしているのか知っていなければなりません)。"
+"何もしない - 現在のシステム状態に基づいて起こるイベントのシミュレーションを行"
+"い、実際にはシステムを変更しません。ロックは無効になる (<option>Debug::"
+"NoLocking</option>) ので、<command>apt-get</command> 実行中にシステムの状態が"
+"変化する可能性があります。シミュレーションは root 以外のユーザが実行できます"
+"が、シミュレーションを歪めるすべての apt 設定への読み取りアクセス権を持ってい"
+"ない可能性があります。この警告を表す通知は、root 以外のユーザではデフォルトで"
+"表示されます (<option>APT::Get::Show-User-Simulation-Note</option>)。設定項"
+"目: <literal>APT::Get::Simulate</literal>"

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

-#: apt-get.8.xml:340
+#: apt-get.8.xml

 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "


@@ -1244,7 +1565,7 @@ msgstr ""
 "れに) 空の角カッコは大した問題ではないことを表します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "れに) 空の角カッコは大した問題ではないことを表します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:348
+#: apt-get.8.xml

 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "


@@ -1258,7 +1579,7 @@ msgstr ""
 "定項目: <literal>APT::Get::Assume-Yes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "定項目: <literal>APT::Get::Assume-Yes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:356
+#: apt-get.8.xml

 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."


@@ -1267,16 +1588,20 @@ msgstr ""
 "Assume-No</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Assume-No</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:361
+#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Show upgraded packages; print out a list of all packages that are to be "
+#| "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."

 msgid ""
 msgid ""

-"Show upgraded packages; print out a list of all packages that are to be "
-"upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
+"Do not show a list of all packages that are to be upgraded.  Configuration "
+"Item: <literal>APT::Get::Show-Upgraded</literal>."

 msgstr ""
 "更新パッケージ表示 - 更新される全パッケージを一覧表示します。設定項目: "
 "<literal>APT::Get::Show-Upgraded</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 "更新パッケージ表示 - 更新される全パッケージを一覧表示します。設定項目: "
 "<literal>APT::Get::Show-Upgraded</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:367
+#: apt-get.8.xml

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


@@ -1285,23 +1610,38 @@ msgstr ""
 "<literal>APT::Get::Show-Versions</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::Get::Show-Versions</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:373
+#: apt-get.8.xml

 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
 "is the same as the build architecture (which is defined by <literal>APT::"
 "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 "satisfied. By default is it not set which means that the host architecture "
 "is the same as the build architecture (which is defined by <literal>APT::"
 "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"

-"Architecture</literal>"
+"Architecture</literal>."

 msgstr ""
 "このオプションは、<command>apt-get source --compile</command> で構築するパッ"
 "ケージのアーキテクチャや、どのようにクロス依存関係を解決するかを制御します。"
 "デフォルトでは未定義で、これはホストアーキテクチャは、(<literal>APT::"
 "Architecture</literal> で定義した) ビルドアーキテクチャと同じという意味になり"
 msgstr ""
 "このオプションは、<command>apt-get source --compile</command> で構築するパッ"
 "ケージのアーキテクチャや、どのようにクロス依存関係を解決するかを制御します。"
 "デフォルトでは未定義で、これはホストアーキテクチャは、(<literal>APT::"
 "Architecture</literal> で定義した) ビルドアーキテクチャと同じという意味になり"

-"ます。設定項目: <literal>APT::Get::Host-Architecture</literal>"
+"ます。設定項目: <literal>APT::Get::Host-Architecture</literal>。"

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

-#: apt-get.8.xml:383
+#: apt-get.8.xml
+msgid ""
+"This option controls the activated build profiles for which a source package "
+"is built by <command>apt-get source --compile</command> and how build "
+"dependencies are satisfied. By default no build profile is active.  More "
+"than one build profile can be activated at a time by concatenating them with "
+"a comma.  Configuration Item: <literal>APT::Build-Profiles</literal>."
+msgstr ""
+"このオプションは、<command>apt-get source --compile</command> でパッケージを"
+"ビルドする際に有効化するビルドプロファイルや、どのようにクロス依存関係を解決"
+"するかを制御します。デフォルトでは有効化するビルドプロファイルはありません。"
+"コンマで連結することで複数のビルドプロファイルを有効化できます。設定項目: "
+"<literal>APT::Get::Host-Architecture</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml

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


@@ -1310,7 +1650,7 @@ msgstr ""
 "Get::Compile</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Get::Compile</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:388
+#: apt-get.8.xml

 msgid ""
 "Ignore package holds; this causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
 msgid ""
 "Ignore package holds; this causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "


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

-#: apt-get.8.xml:395
+#: apt-get.8.xml

 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "


@@ -1333,9 +1673,16 @@ msgid ""
 "will never remove packages, only allow adding new ones.  Configuration Item: "
 "<literal>APT::Get::Upgrade-Allow-New</literal>."
 msgstr ""
 "will never remove packages, only allow adding new ones.  Configuration Item: "
 "<literal>APT::Get::Upgrade-Allow-New</literal>."
 msgstr ""

+"<literal>upgrade</literal> と併せて使った場合に新しいパッケージのインストール"
+"を許可します。これは新しい依存をインストールするために既にインストールされて"
+"いるパッケージを更新する必要がある場合に有用です。パッケージを保留する代わり"
+"に <literal>upgrade</literal> がパッケージをアップグレードして新しい依存をイ"
+"ンストールします。このオプションと併せて使った場合、<literal>upgrade</"
+"literal> がパッケージを削除することはなく、新規追加を許可するだけであることに"
+"注意してください。設定項目: <literal>APT::Get::Upgrade-Allow-New</literal>"

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

-#: apt-get.8.xml:407
+#: apt-get.8.xml

 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "


@@ -1348,7 +1695,7 @@ msgstr ""
 "Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:414
+#: apt-get.8.xml

 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "


@@ -1361,21 +1708,67 @@ msgstr ""
 "定項目: <literal>APT::Get::Only-Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "定項目: <literal>APT::Get::Only-Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:422
+#: apt-get.8.xml
+msgid ""
+"This is a dangerous option that will cause apt to continue without prompting "
+"if it is doing downgrades. It should not be used except in very special "
+"situations. Using it can potentially destroy your system! Configuration "
+"Item: <literal>APT::Get::allow-downgrades</literal>. Introduced in APT 1.1."
+msgstr ""
+"ダウングレードを行う場合でも、確認なしで実行してしまう危険なオプションです。"
+"よほどの状況でなければ、使うべきではありません。このオプションを使うと、シス"
+"テムを破壊しかねません! 設定項目: <literal>APT::Get::allow-downgrades</"
+"literal>。APT 1.1 で導入されました。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is removing essentials. It should not be used except "
+"in very special situations. Using it can potentially destroy your system! "
+"Configuration Item: <literal>APT::Get::allow-remove-essential</literal>. "
+"Introduced in APT 1.1."
+msgstr ""
+"強制承諾 - 必要不可欠なものを削除する場合でも、確認なしで実行してしまう危険な"
+"オプションです。よほどの状況でなければ、使うべきではありません。"
+"<literal>force-yes</literal> を使うと、システムを破壊しかねません! 設定項目: "
+"<literal>APT::Get::allow-remove-essential</literal>。APT 1.1 で導入されまし"
+"た。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is changing held packages. It should not be used "
+"except in very special situations. Using it can potentially destroy your "
+"system! Configuration Item: <literal>APT::Get::allow-change-held-packages</"
+"literal>. Introduced in APT 1.1."
+msgstr ""
+"強制承諾 - 保持されたパッケージを変更する場合でも、確認なしで実行してしまう危"
+"険なオプションです。よほどの状況でなければ、使うべきではありません。このオプ"
+"ションを使うと、システムを破壊しかねません! 設定項目: <literal>APT::Get::"
+"allow-change-held-packages</literal>。APT 1.1 で導入されました。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml

 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 "
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 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 "
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "

-"<literal>APT::Get::force-yes</literal>."
+"<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
+"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+"option>, <option>--allow-change-held-packages</option> in 1.1."

 msgstr ""
 "強制承諾 - 何か損傷を与えかねない動作をしようとした場合でも、確認なしで実行し"
 "てしまう危険なオプションです。よほどの状況でなければ、使うべきではありませ"
 msgstr ""
 "強制承諾 - 何か損傷を与えかねない動作をしようとした場合でも、確認なしで実行し"
 "てしまう危険なオプションです。よほどの状況でなければ、使うべきではありませ"

-"ん。<literal>force-yes</literal> を使うと、あなたのシステムを破壊しかねませ"
-"ん! 設定項目: <literal>APT::Get::force-yes</literal>"
+"ん。<literal>force-yes</literal> を使うと、システムを破壊しかねません! 設定項"
+"目: <literal>APT::Get::force-yes</literal>。これは非推奨で、1.1 で<option>--"
+"allow-downgrades</option>, <option>--allow-remove-essential</option>, "
+"<option>--allow-change-held-packages</option> に置き換えられました。"

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

-#: apt-get.8.xml:430
+#: apt-get.8.xml

 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected MD5 "
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected MD5 "


@@ -1396,7 +1789,7 @@ msgstr ""
 "Print-URIs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Print-URIs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:441
+#: apt-get.8.xml

 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "


@@ -1409,7 +1802,7 @@ msgstr ""
 "<literal>APT::Get::Purge</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::Get::Purge</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:449
+#: apt-get.8.xml

 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."


@@ -1418,7 +1811,7 @@ msgstr ""
 "定項目: <literal>APT::Get::ReInstall</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "定項目: <literal>APT::Get::ReInstall</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:454
+#: apt-get.8.xml

 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "


@@ -1434,7 +1827,7 @@ msgstr ""
 "する時ぐらいでしょう。設定項目: <literal>APT::Get::List-Cleanup</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "する時ぐらいでしょう。設定項目: <literal>APT::Get::List-Cleanup</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:464
+#: apt-get.8.xml

 msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
 msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "


@@ -1457,7 +1850,7 @@ msgstr ""
 "さい。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "さい。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:479
+#: apt-get.8.xml

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


@@ -1470,7 +1863,7 @@ msgstr ""
 "目: <literal>APT::Get::Trivial-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "目: <literal>APT::Get::Trivial-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:486
+#: apt-get.8.xml

 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."


@@ -1479,7 +1872,7 @@ msgstr ""
 "項目: <literal>APT::Get::Remove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "項目: <literal>APT::Get::Remove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:492
+#: apt-get.8.xml

 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"


@@ -1492,7 +1885,7 @@ msgstr ""
 "<literal>APT::Get::AutomaticRemove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::Get::AutomaticRemove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:499
+#: apt-get.8.xml

 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "


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

-#: apt-get.8.xml:510
+#: apt-get.8.xml

 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"


@@ -1521,7 +1914,7 @@ msgstr ""
 "<literal>APT::Get::Dsc-Only</literal>, <literal>APT::Get::Tar-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::Get::Dsc-Only</literal>, <literal>APT::Get::Tar-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:516
+#: apt-get.8.xml

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


@@ -1530,61 +1923,83 @@ msgstr ""
 "<literal>APT::Get::Arch-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::Get::Arch-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:521
+#: apt-get.8.xml

 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "

-"is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
-"AllowUnauthenticated</literal>."
+"can be useful while working with local repositories, but is a huge security "
+"risk if data authenticity isn't ensured in another way by the user itself.  "
+"The usage of the <option>Trusted</option> option for &sources-list; entries "
+"should usually be preferred over this global override.  Configuration Item: "
+"<literal>APT::Get::AllowUnauthenticated</literal>."

 msgstr ""
 msgstr ""

-"パッケージを確認できない場合に無視し、それについて質問しません。pbuilder のよ"
-"うなツールで便利です。設定項目: <literal>APT::Get::AllowUnauthenticated</"
-"literal>"
+"パッケージが認証できない場合は無視してください。プロンプトは表示されません。"
+"ローカルリポジトリでの作業中には有用ですが、ユーザ自身が別の方法でデータの信"
+"憑性を確保していない場合は、セキュリティ上の重大なリスクになります。&sources-"
+"list; エントリ用の <option>Trusted</option> オプションの使用は、通常グローバ"
+"ルオーバーライドよりも優先されるはずです。設定項目: <literal>APT::Get::"
+"AllowUnauthenticated</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Forbid the update command to acquire unverifiable data from configured "
+#| "sources. Apt will fail at the update command for repositories without "
+#| "valid cryptographically signatures.  Configuration Item: "
+#| "<literal>Acquire::AllowInsecureRepositories</literal>."
+msgid ""
+"Forbid the update command to acquire unverifiable data from configured "
+"sources. APT will fail at the update command for repositories without valid "
+"cryptographically signatures. See also &apt-secure; for details on the "
+"concept and the implications.  Configuration Item: <literal>Acquire::"
+"AllowInsecureRepositories</literal>."
+msgstr ""
+"設定された取得元から検証できないデータを取得する update コマンドを禁止しま"
+"す。apt は、有効な暗号で署名のないリポジトリ用の update コマンドで失敗しま"
+"す。設定項目: <literal>Acquire::AllowInsecureRepositories</literal>"

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

-#: apt-get.8.xml:527
+#: apt-get.8.xml

 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "

-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"

 "literal>."
 msgstr ""
 "literal>."
 msgstr ""

+"パッケージのインストール、アップグレード、削除時にユーザにとってわかりやすい"
+"形で進捗情報をターミナルウィンドウ内に表示します。このデータの機械的に解析で"
+"きるバージョンについては apt の doc ディレクトリにある README.progress-"
+"reporting を見てください。設定項目: <literal>Dpkg::Progress</literal>、 "
+"<literal>Dpkg::Progress-Fancy</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Adds the given file as a source for metadata. Can be repeated to add "
+"multiple files.  See <option>--with-source</option> description in &apt-"
+"cache; for further details."
+msgstr ""

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

-#: apt-get.8.xml:540 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1200 apt_preferences.5.xml:700
+#: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml

 msgid "Files"
 msgstr "ファイル"
 
 msgid "Files"
 msgstr "ファイル"
 

-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:550 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133
-#: apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111
-#: apt.conf.5.xml:1206 apt_preferences.5.xml:707 sources.list.5.xml:275
-#: apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
-msgid "See Also"
-msgstr "関連項目"
-

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

-#: apt-get.8.xml:551
+#: apt-get.8.xml

 msgid ""
 msgid ""

-"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-"preferences;, the APT Howto."
+"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
+"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
+"APT Howto."

 msgstr ""
 msgstr ""

-"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &apt-secure;, &guidesdir; にある APT ユーザガイド, &apt-"
-"preferences;, APT Howto"
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:556 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
-msgid "Diagnostics"
-msgstr "診断メッセージ"
+"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
+"&apt-secure;, &guidesdir; にある APT ユーザガイド, &apt-preferences;, APT "
+"Howto"

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

-#: apt-get.8.xml:557
+#: apt-get.8.xml

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


@@ -1593,25 +2008,32 @@ msgstr ""
 "100 を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 "100 を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-cache.8.xml:35
+#: apt-cache.8.xml

 msgid "query the APT cache"
 msgstr "APT キャッシュへの問い合わせ"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "query the APT cache"
 msgstr "APT キャッシュへの問い合わせ"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cache.8.xml:41
+#: apt-cache.8.xml

 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "

-"output from the package metadata."
+"output from the package metadata. The metadata is acquired and updated via "
+"the 'update' command of e.g. <command>apt-get</command>, so that it can be "
+"outdated if the last update is too long ago, but in exchange <command>apt-"
+"cache</command> works independently of the availability of the configured "
+"sources (e.g. offline)."

 msgstr ""
 "<command>apt-cache</command> は APT のパッケージキャッシュに対して、さまざま"
 "な操作を行います。<command>apt-cache</command> は、システム状態の操作は行いま"
 msgstr ""
 "<command>apt-cache</command> は APT のパッケージキャッシュに対して、さまざま"
 "な操作を行います。<command>apt-cache</command> は、システム状態の操作は行いま"

-"せんが、パッケージのメタデータより検索したり、興味深い出力を生成するといった"
-"操作を提供します。"
+"せんが、パッケージのメタデータを検索したり、興味深い出力を生成するといった操"
+"作を提供します。メタデータは、例えば <command>apt-get</command> の 'update' "
+"コマンドで取得して更新します。そのため、最後の更新が古すぎる場合は、時代遅れ"
+"です。ただし、引き換えに <command>apt-cache</command> は、設定された取得元の"
+"可用性とは独立して動作します (例えばオフライン)。"

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

-#: apt-cache.8.xml:51
+#: apt-cache.8.xml

 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."


@@ -1621,14 +2043,12 @@ msgstr ""
 "べてのコマンドによって、暗黙で実行されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 "べてのコマンドによって、暗黙で実行されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>

-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml

 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:56
+#: apt-cache.8.xml

 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "


@@ -1650,7 +2070,7 @@ msgstr ""
 "libreadline2</command> の出力を掲げます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 "libreadline2</command> の出力を掲げます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>

-#: apt-cache.8.xml:68
+#: apt-cache.8.xml

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


@@ -1676,7 +2096,7 @@ msgstr ""
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:80
+#: apt-cache.8.xml

 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "


@@ -1695,7 +2115,7 @@ msgstr ""
 "apt のソースコードを調べるのが最良でしょう。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "apt のソースコードを調べるのが最良でしょう。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:89
+#: apt-cache.8.xml

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


@@ -1704,7 +2124,7 @@ msgstr ""
 "上、引数は必要ありません。以下の統計情報を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 "上、引数は必要ありません。以下の統計情報を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>

-#: apt-cache.8.xml:92
+#: apt-cache.8.xml

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


@@ -1713,7 +2133,7 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 "ます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>

-#: apt-cache.8.xml:96
+#: apt-cache.8.xml

 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "


@@ -1725,7 +2145,7 @@ msgstr ""
 "ケージです。大多数のパッケージはこのカテゴリに入ります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 "ケージです。大多数のパッケージはこのカテゴリに入ります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>

-#: apt-cache.8.xml:102
+#: apt-cache.8.xml

 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "


@@ -1742,7 +2162,7 @@ msgstr ""
 "ケージはありません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 "ケージはありません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>

-#: apt-cache.8.xml:110
+#: apt-cache.8.xml

 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "


@@ -1755,7 +2175,7 @@ msgstr ""
 "ジは、xless パッケージのみということです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 "ジは、xless パッケージのみということです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>

-#: apt-cache.8.xml:116
+#: apt-cache.8.xml

 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "


@@ -1768,7 +2188,7 @@ msgstr ""
 "もありますが、debconf-tiny によって提供もされています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 "もありますが、debconf-tiny によって提供もされています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>

-#: apt-cache.8.xml:123
+#: apt-cache.8.xml

 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "


@@ -1783,21 +2203,20 @@ msgstr ""
 "のようになります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 "のようになります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>

-#: apt-cache.8.xml:130
+#: apt-cache.8.xml

 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "

-"found in the cache; this value is therefore at least equal to the number of "
-"total package names. If more than one distribution is being accessed (for "
+"found in the cache. If more than one distribution is being accessed (for "

 "instance, \"stable\" and \"unstable\"), this value can be considerably "
 "larger than the number of total package names."
 msgstr ""
 "<literal>個別バージョン総数</literal>は、キャッシュに存在するパッケージのバー"
 "instance, \"stable\" and \"unstable\"), this value can be considerably "
 "larger than the number of total package names."
 msgstr ""
 "<literal>個別バージョン総数</literal>は、キャッシュに存在するパッケージのバー"

-"ã\82¸ã\83§ã\83³ã\81®æ\95°ã\82\92表ã\81\97ã\81¾ã\81\99ã\80\82ã\81\9dã\81®ã\81\9fã\82\81ã\80\81ã\81\93ã\81®å\80¤ã\81¯æ\9c\80å°\8fã\81§ã\82\82ã\83\91ã\83\83ã\82±ã\83¼ã\82¸å\90\8dç·\8fæ\95°ã\81¨ä¸\80è\87´ã\81\97ã\81¾"
-"す。もし複数のディストリビューション (例 \"stable\" と \"unstable\") にアクセ"
-"スする場合、この値はパッケージ名総数よりもかなり大きい数になります。"
+"ã\82¸ã\83§ã\83³ã\81®æ\95°ã\82\92表ã\81\97ã\81¾ã\81\99ã\80\82ã\82\82ã\81\97è¤\87æ\95°ã\81®ã\83\87ã\82£ã\82¹ã\83\88ã\83ªã\83\93ã\83¥ã\83¼ã\82·ã\83§ã\83³ (ä¾\8bã\81\88ã\81° \"stable\" ã\81¨ "
+"\"unstable\") にアクセスする場合、この値はパッケージ名総数よりもかなり大きい"
+"数になります。"

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

-#: apt-cache.8.xml:137
+#: apt-cache.8.xml

 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."


@@ -1806,18 +2225,20 @@ msgstr ""
 "れた依存関係の数です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "れた依存関係の数です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:145
+#: apt-cache.8.xml

 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "

-"records that declare the name to be a binary package."
+"records that declare the name to be a binary package. Use <option>--only-"
+"source</option> to display only source package names."

 msgstr ""
 "<literal>showsrc</literal> は、指定したパッケージ名に一致するソースパッケージ"
 "を、すべて表示します。バイナリパッケージになるときの名称を宣言したレコードと"
 msgstr ""
 "<literal>showsrc</literal> は、指定したパッケージ名に一致するソースパッケージ"
 "を、すべて表示します。バイナリパッケージになるときの名称を宣言したレコードと"

-"ともに、すべてのバージョンについて表示します。"
+"ともに、すべてのバージョンについて表示します。ソースパッケージ名だけを表示す"
+"るには、<option>--only-source</option> を使用してください。"

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

-#: apt-cache.8.xml:151
+#: apt-cache.8.xml

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


@@ -1826,7 +2247,7 @@ msgstr ""
 "覧を表示します。主にデバッグ用です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "覧を表示します。主にデバッグ用です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:156
+#: apt-cache.8.xml

 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."


@@ -1835,7 +2256,7 @@ msgstr ""
 "す。 &dpkg; と共に使用すると便利ですし、&dselect; でも使用されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "す。 &dpkg; と共に使用すると便利ですし、&dselect; でも使用されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:161
+#: apt-cache.8.xml

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


@@ -1844,7 +2265,7 @@ msgstr ""
 "概要を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "概要を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:166
+#: apt-cache.8.xml

 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."


@@ -1853,12 +2274,12 @@ msgstr ""
 "能を実行します。これは、指定したパッケージのパッケージレコードの表示です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 "能を実行します。これは、指定したパッケージのパッケージレコードの表示です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>

-#: apt-cache.8.xml:171
+#: apt-cache.8.xml

 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:172
+#: apt-cache.8.xml

 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "


@@ -1867,7 +2288,7 @@ msgid ""
 "including virtual package names.  If <option>--full</option> is given then "
 "output identical to <literal>show</literal> is produced for each matched "
 "package, and if <option>--names-only</option> is given then the long "
 "including virtual package names.  If <option>--full</option> is given then "
 "output identical to <literal>show</literal> is produced for each matched "
 "package, and if <option>--names-only</option> is given then the long "

-"description is not searched, only the package name is."
+"description is not searched, only the package name and provided packages are."

 msgstr ""
 "<literal>search</literal> は、与えられた POSIX の正規表現 (&regex; を参照) に"
 "より、すべての利用可能なパッケージに対して全文検索を行います。パッケージ名と"
 msgstr ""
 "<literal>search</literal> は、与えられた POSIX の正規表現 (&regex; を参照) に"
 "より、すべての利用可能なパッケージに対して全文検索を行います。パッケージ名と"


@@ -1875,17 +2296,17 @@ msgstr ""
 "い説明文を表示します。<option>--full</option> が与えられた場合、マッチした"
 "パッケージに対し <literal>show</literal> と同じ情報を出力します。<option>--"
 "names-only</option> が与えられた場合は、長い説明文に対して検索を行わず、パッ"
 "い説明文を表示します。<option>--full</option> が与えられた場合、マッチした"
 "パッケージに対し <literal>show</literal> と同じ情報を出力します。<option>--"
 "names-only</option> が与えられた場合は、長い説明文に対して検索を行わず、パッ"

-"ã\82±ã\83¼ã\82¸å\90\8dã\81«å¯¾ã\81\97ã\81¦のみ対象とします。"
+"ã\82±ã\83¼ã\82¸å\90\8dã\81¨æ\8f\90ä¾\9bã\81\95ã\82\8cã\81\9fã\83\91ã\83\83ã\82±ã\83¼ã\82¸のみ対象とします。"

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

-#: apt-cache.8.xml:183
+#: apt-cache.8.xml

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

-#: apt-cache.8.xml:188
+#: apt-cache.8.xml

 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."


@@ -1894,7 +2315,7 @@ msgstr ""
 "を満たす他のパッケージの一覧を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "を満たす他のパッケージの一覧を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:193
+#: apt-cache.8.xml

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


@@ -1902,12 +2323,12 @@ msgstr ""
 "<literal>rdepends</literal> は、パッケージが持つ被依存関係を一覧表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 "<literal>rdepends</literal> は、パッケージが持つ被依存関係を一覧表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:197
+#: apt-cache.8.xml

 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:198
+#: apt-cache.8.xml

 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "


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

-#: apt-cache.8.xml:203
+#: apt-cache.8.xml

 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "


@@ -1932,7 +2353,7 @@ msgstr ""
 "た一覧にあります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "た一覧にあります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:209
+#: apt-cache.8.xml

 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."


@@ -1952,7 +2373,7 @@ msgstr ""
 "GivenOnly</literal> をセットしてください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "GivenOnly</literal> をセットしてください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:218
+#: apt-cache.8.xml

 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "


@@ -1965,12 +2386,12 @@ msgstr ""
 "表します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "表します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:223
+#: apt-cache.8.xml

 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr "注意) dotty は、パッケージのより大きなセットのグラフは描けません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr "注意) dotty は、パッケージのより大きなセットのグラフは描けません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:227
+#: apt-cache.8.xml

 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."


@@ -1979,12 +2400,12 @@ msgstr ""
 "users/sander/html/gsvcg1.html\">VCG tool</ulink> の xvcg 専用です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 "users/sander/html/gsvcg1.html\">VCG tool</ulink> の xvcg 専用です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:231
+#: apt-cache.8.xml

 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:232
+#: apt-cache.8.xml

 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "


@@ -1996,7 +2417,7 @@ msgstr ""
 "す。一方、パッケージ名を指定した場合、優先順の詳細情報を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "す。一方、パッケージ名を指定した場合、優先順の詳細情報を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:239
+#: apt-cache.8.xml

 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "


@@ -2014,7 +2435,7 @@ msgstr ""
 "表示するだけです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "表示するだけです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:255
+#: apt-cache.8.xml

 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"


@@ -2025,7 +2446,7 @@ msgstr ""
 "pkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "pkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:261
+#: apt-cache.8.xml

 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "


@@ -2040,7 +2461,7 @@ msgstr ""
 "<literal>Dir::Cache::srcpkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>Dir::Cache::srcpkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:269
+#: apt-cache.8.xml

 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "


@@ -2053,7 +2474,7 @@ msgstr ""
 "<literal>quiet</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>quiet</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:276
+#: apt-cache.8.xml

 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "


@@ -2064,21 +2485,38 @@ msgstr ""
 "目: <literal>APT::Cache::Important</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "目: <literal>APT::Cache::Important</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:290
+#: apt-cache.8.xml

 msgid ""
 msgid ""

-"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"Per default the <command>depends</command> and <command>rdepends</command> "

 "print all dependencies. This can be tweaked with these flags which will omit "
 "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
 "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
 "Cache::ShowRecommends</literal>."
 msgstr ""
 "print all dependencies. This can be tweaked with these flags which will omit "
 "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
 "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
 "Cache::ShowRecommends</literal>."
 msgstr ""

-"デフォルトでは <literal>depends</literal> や <literal>rdepends</literal> は全"
+"デフォルトでは <command>depends</command> や <command>rdepends</command> は全"

 "依存関係を出力します。この挙動を、ここに挙げたフラグで指定した依存関係を省略"
 "できます。設定項目: <literal>APT::Cache::Show<replaceable>依存関係タイプ</"
 "replaceable></literal> 例: <literal>APT::Cache::ShowRecommends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "依存関係を出力します。この挙動を、ここに挙げたフラグで指定した依存関係を省略"
 "できます。設定項目: <literal>APT::Cache::Show<replaceable>依存関係タイプ</"
 "replaceable></literal> 例: <literal>APT::Cache::ShowRecommends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:297
+#: apt-cache.8.xml
+msgid ""
+"Per default <command>depends</command> and <command>rdepends</command> print "
+"only dependencies explicitly expressed in the metadata. With this flag it "
+"will also show dependencies implicitly added based on the encountered data.  "
+"A <literal>Conflicts: foo</literal> e.g. expresses implicitly that this "
+"package also conflicts with the package foo from any other architecture.  "
+"Configuration Item: <literal>APT::Cache::ShowImplicit</literal>."
+msgstr ""
+"デフォルトでは <command>depends</command> や <command>rdepends</command> はメ"
+"タデータ中に明示的に表現された依存関係のみを出力します。このフラグを指定する"
+"と、遭遇したデータにもとづいて追加の依存関係を表示します。"
+"<literal>Conflicts: foo</literal> は、例えば、このパッケージがほかのアーキテ"
+"クチャからのパッケージ foo と競合していることを暗黙的に表現しています。設定項"
+"目: <literal>APT::Cache::ShowImplicit</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml

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


@@ -2087,7 +2525,7 @@ msgstr ""
 "ShowFull</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ShowFull</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:302
+#: apt-cache.8.xml

 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"


@@ -2104,7 +2542,7 @@ msgstr ""
 "AllVersions</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "AllVersions</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:311
+#: apt-cache.8.xml

 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"


@@ -2115,16 +2553,16 @@ msgstr ""
 "option> を使用してください。設定項目: <literal>APT::Cache::Generate</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "option> を使用してください。設定項目: <literal>APT::Cache::Generate</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 msgid ""

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

 msgstr ""
 msgstr ""

-"説明文ではなく、パッケージ名からのみ検索します。設定項目: <literal>APT::"
-"Cache::NamesOnly</literal>"
+"長い説明文ではなく、パッケージおよび提供されたパッケージ名のみ検索します。設"
+"定項目: <literal>APT::Cache::NamesOnly</literal>"

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

-#: apt-cache.8.xml:322
+#: apt-cache.8.xml

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


@@ -2134,7 +2572,7 @@ msgstr ""
 "表示します。設定項目: <literal>APT::Cache::AllNames</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "表示します。設定項目: <literal>APT::Cache::AllNames</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:328
+#: apt-cache.8.xml

 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "


@@ -2145,7 +2583,7 @@ msgstr ""
 "RecurseDepends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "RecurseDepends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:335
+#: apt-cache.8.xml

 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "


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

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml
+msgid ""
+"Adds the given file as a source for metadata. Can be repeated to add "
+"multiple files.  Supported are currently <literal>*.deb</literal>, "
+"<literal>*.dsc</literal>, <literal>*.changes</literal>, <literal>Sources</"
+"literal> and <literal>Packages</literal> files as well as source package "
+"directories.  Files are matched based on their name only, not their content!"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml
+msgid ""
+"<literal>Sources</literal> and <literal>Packages</literal> can be compressed "
+"in any format apt supports as long as they have the correct extension. If "
+"you need to store multiple of these files in one directory you can prefix a "
+"name of your choice with the last character being an underscore "
+"(\"<literal>_</literal>\"). Example: my.example_Packages.xz"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "Use source index field ordering.  Configuration Item: <literal>APT::"
+#| "SortPkgs::Source</literal>."
+msgid ""
+"Note that these sources are treated as trusted (see &apt-secure;).  "
+"Configuration Item: <literal>APT::Sources::With</literal>."
+msgstr ""
+"ソースインデックスフィールド順に並べ替えに使用します。設定項目: "
+"<literal>APT::SortPkgs::Source</literal>"
+

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

-#: apt-cache.8.xml:353
+#: apt-cache.8.xml

 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cache.8.xml:358
+#: apt-cache.8.xml

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


@@ -2170,12 +2641,12 @@ msgstr ""
 "100 を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 "100 を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-key.8.xml:34
+#: apt-key.8.xml

 msgid "APT key management utility"
 msgstr "APT キー管理ユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "APT key management utility"
 msgstr "APT キー管理ユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-key.8.xml:41
+#: apt-key.8.xml

 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "


@@ -2185,13 +2656,25 @@ msgstr ""
 "一覧を管理するのに使用します。このキーで認証されたパッケージは、信頼するに足"
 "ると見なせるでしょう。"
 
 "一覧を管理するのに使用します。このキーで認証されたパッケージは、信頼するに足"
 "ると見なせるでしょう。"
 

+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml
+msgid ""
+"Note that if usage of <command>apt-key</command> is desired the additional "
+"installation of the GNU Privacy Guard suite (packaged in <package>gnupg</"
+"package>) is required. For this reason alone the programmatic usage "
+"(especially in package maintainerscripts!) is strongly discouraged.  Further "
+"more the output format of all commands is undefined and can and does change "
+"whenever the underlying commands change. <command>apt-key</command> will try "
+"to detect such usage and generates warnings on stderr in these cases."
+msgstr ""
+

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

-#: apt-key.8.xml:47
+#: apt-key.8.xml

 msgid "Commands"
 msgstr "コマンド"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Commands"
 msgstr "コマンド"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:52
+#: apt-key.8.xml

 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "


@@ -2202,41 +2685,67 @@ msgstr ""
 "<literal>-</literal> とすると、標準入力から読み込みます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>-</literal> とすると、標準入力から読み込みます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:65
+#: apt-key.8.xml
+msgid ""
+"It is critical that keys added manually via <command>apt-key</command> are "
+"verified to belong to the owner of the repositories they claim to be for "
+"otherwise the &apt-secure; infrastructure is completely undermined."
+msgstr ""
+"<command>apt-key</command> を使用して手動で追加されたキーは、リポジトリの所有"
+"者に所属していることが確認されていることが重要です。そうでなければ、&apt-"
+"secure; インフラが完全に損なわれます。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
+msgid ""
+"Instead of using this command a keyring can be placed directly in the "
+"<filename>/etc/apt/trusted.gpg.d/</filename> directory with a descriptive "
+"name (same rules for filename apply as for &apt-conf; files) and "
+"\"<literal>gpg</literal>\" as file extension."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml

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

-#: apt-key.8.xml:76
+#: apt-key.8.xml

 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "キー &synopsis-param-keyid; を標準出力に出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "キー &synopsis-param-keyid; を標準出力に出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:87
+#: apt-key.8.xml

 msgid "Output all trusted keys to standard output."
 msgstr "信頼するキーをすべて標準出力に出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Output all trusted keys to standard output."
 msgstr "信頼するキーをすべて標準出力に出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:98
-msgid "List trusted keys."
+#: apt-key.8.xml
+#, fuzzy
+#| msgid "List trusted keys."
+msgid "List trusted keys with fingerprints."

 msgstr "信頼キーを一覧表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr "信頼キーを一覧表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:109
-msgid "List fingerprints of trusted keys."
-msgstr "信頼キーのフィンガープリントを一覧表示します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml

 msgid ""
 msgid ""

-"Pass advanced options to gpg. With adv --recv-key you can download the "
-"public key."
+"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
+"e.g. download key from keyservers directly into the the trusted set of keys. "
+"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
+"to completely undermine the &apt-secure; infrastructure if used without care."
+msgstr ""
+"gpg に高度なオプションを渡します。<command>adv --recv-key</command> を使用し"
+"て、例えば、キーサーバーから信頼されたキーに直接キーをダウンロードすることが"
+"できます。チェックが<emphasis>行われない</emphasis>ことに注意してください。注"
+"意せず使用するなら、容易に &apt-secure; インフラを完全に傷つけます。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml
+msgid "(deprecated)"

 msgstr ""
 msgstr ""

-"gpg に上級オプションを渡します。adv --recv-key とすると、公開鍵をダウンロード"
-"できます。"

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

-#: apt-key.8.xml:132
+#: apt-key.8.xml

 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "


@@ -2246,10 +2755,21 @@ msgstr ""
 "ローカルキーリングをアーカイブキーリングで更新し、もう有効でなくなったアーカ"
 "イブキーをローカルキーリングから削除します。アーカイブキーリングは、使用中の"
 "ディストリビューションにある <literal>archive-keyring</literal> パッケージ "
 "ローカルキーリングをアーカイブキーリングで更新し、もう有効でなくなったアーカ"
 "イブキーをローカルキーリングから削除します。アーカイブキーリングは、使用中の"
 "ディストリビューションにある <literal>archive-keyring</literal> パッケージ "

-"(例: &keyring-distro; では &keyring-package; パッケージ) で提供されています。"
+"(例えば &keyring-distro; では &keyring-package; パッケージ) で提供されていま"
+"す。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml
+msgid ""
+"Note that a distribution does not need to and in fact should not use this "
+"command any longer and instead ship keyring files in the <filename>/etc/apt/"
+"trusted.gpg</filename> directory directly as this avoids a dependency on "
+"<package>gnupg</package> and it is easier to manage keys by simply adding "
+"and removing files for maintainers and users alike."
+msgstr ""

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

-#: apt-key.8.xml:146
+#: apt-key.8.xml

 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "


@@ -2266,12 +2786,12 @@ msgstr ""
 "有効です。"
 
 #. type: Content of: <refentry><refsect1><title>
 "有効です。"
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml

 msgid "Options"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Options"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-key.8.xml:163
+#: apt-key.8.xml

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


@@ -2280,7 +2800,7 @@ msgstr ""
 "てください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "てください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:166
+#: apt-key.8.xml

 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "


@@ -2295,118 +2815,78 @@ msgstr ""
 "ます。とはいえ、<filename>trusted.gpg</filename> がプライマリキーリングになり"
 "ます。つまり新しいキーはこのファイルに追加されます。"
 
 "ます。とはいえ、<filename>trusted.gpg</filename> がプライマリキーリングになり"
 "ます。つまり新しいキーはこのファイルに追加されます。"
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
-msgid "<filename>/etc/apt/trustdb.gpg</filename>"
-msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
-msgid "Local trust database of archive keys."
-msgstr "アーカイブキーのローカル信頼データベースです。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
-msgid "&keyring-filename;"
-msgstr "&keyring-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
-msgid "Keyring of &keyring-distro; archive trusted keys."
-msgstr "&keyring-distro; アーカイブ信頼キーのキーリングです。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
-msgid "&keyring-removed-filename;"
-msgstr "&keyring-removed-filename;"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
-msgid "Keyring of &keyring-distro; archive removed trusted keys."
-msgstr "削除された &keyring-distro; アーカイブ信頼キーのキーリングです。"
-

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

-#: apt-key.8.xml:199
+#: apt-key.8.xml

 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-mark.8.xml:35
-msgid "mark/unmark a package as being automatically-installed"
-msgstr "ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81\8cè\87ªå\8b\95ç\9a\84ã\81«ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«ã\81\95ã\82\8cã\81\9fã\81\8bã\81©ã\81\86ã\81\8bã\81®ã\83\9eã\83¼ã\82¯ã\82\92å¤\89æ\9b´ã\81\97ã\81¾ã\81\99ã\80\82"
+#: apt-mark.8.xml
+msgid "show, set and unset various settings for a package"
+msgstr "ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81®å\90\84種設å®\9aã\81®è¡¨ç¤ºã\80\81設å®\9aã\80\81設å®\9a解é\99¤"

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

-#: apt-mark.8.xml:41
-msgid ""
-"<command>apt-mark</command> will change whether a package has been marked as "
-"being automatically installed."
-msgstr ""
-"<command>apt-mark</command> は、パッケージが自動的にインストールされたかどう"
-"かのマークを変更します。"
+#: apt-mark.8.xml
+msgid ""
+"<command>apt-mark</command> can be used as a unified front-end to set "
+"various settings for a package, such as marking a package as being "
+"automatically/manually installed or changing <command>dpkg</command> "
+"selections such as hold, install, deinstall and purge which are respected e."
+"g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
+"command>."
+msgstr ""
+"統合フロントエンドとして使用することができます。例えば、パッケージを自動/手動"
+"インストール済みとマークしたり、<command>dpkg</command> の選択を保留、インス"
+"トール、削除や完全削除に変更できます。例えば <command>apt-get dselect-"
+"upgrade</command> や <command>aptitude</command> によりリスペクトされていま"
+"す。"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Automatically and Manually Installed Packages"
+msgstr "自動および手動インストール済みパッケージ"

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

-#: apt-mark.8.xml:45
+#: apt-mark.8.xml

 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "

-"being automatically installed.  Once these automatically installed packages "
-"are no longer depended on by any manually installed packages, they will be "
-"removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
+"being automatically installed, while the package you installed explicitly is "
+"marked as manually installed.  Once an automatically installed package is no "
+"longer depended on by any manually installed package it is considered no "
+"longer needed and e.g. <command>apt-get</command> or <command>aptitude</"
+"command> will at least suggest removing them."

 msgstr ""
 "パッケージをインストールすると要求し、その結果、別のパッケージが依存関係を満"
 msgstr ""
 "パッケージをインストールすると要求し、その結果、別のパッケージが依存関係を満"

-"たすためにインストールされた場合、依存関係に自動的にインストールしたと印を付"
-"ã\81\91ã\81¾ã\81\99ã\80\82ã\81\84ã\81£ã\81\9fã\82\93è\87ªå\8b\95ç\9a\84ã\81«ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«ã\81\95ã\82\8cã\81\9fã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81¯ã\80\81æ\89\8bå\8b\95ã\81§ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«ã\81\97"
-"ã\81\9fã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81«ä¾\9då­\98ã\81\95ã\82\8cã\81ªã\81\8fã\81ªã\82\8bã\81¨ã\80\81ã\81\9dã\81®ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81¯ã\80\81ä¾\8bã\81\88ã\81° <command>apt-get</"
-"command> や <command>aptitude</command> により削除されます。"
+"たすためにインストールされた場合、依存関係に自動インストール済みとマークされ"
+"ã\81¾ã\81\99ã\80\82ã\81\84ã\81£ã\81\9fã\82\93è\87ªå\8b\95ç\9a\84ã\81«ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«ã\81\95ã\82\8cã\81\9fã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81¯ã\80\81æ\89\8bå\8b\95ã\81§ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«ã\81\97ã\81\9f"
+"パッケージに依存されなくなると、そのパッケージは、例えば <command>apt-get</"
+"command> ã\82\84 <command>aptitude</command> ã\81«ã\82\88ã\82\8aå\89\8aé\99¤ã\81\8cæ\8f\90æ¡\88ã\81\95ã\82\8cã\81¾ã\81\99ã\80\82"

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

-#: apt-mark.8.xml:54
+#: apt-mark.8.xml

 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
 "installed packages depend on this package."
 msgstr ""
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
 "installed packages depend on this package."
 msgstr ""

-"<literal>auto</literal> は、パッケージを自動的にインストールしたとしてマーク"
-"ã\81\97ã\81¾ã\81\99ã\80\82ã\81\93ã\81®ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81«ä¾\9då­\98ã\81\99ã\82\8bã\80\81æ\89\8bå\8b\95ã\81§ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«ã\81\95ã\82\8cã\81\9fã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81\8cã\81ªã\81\8fã\81ª"
-"ã\82\8bã\81¨ã\80\81ã\81\93ã\81®ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\82\92å\89\8aé\99¤ã\81\97ã\81¾ã\81\99ã\80\82"
+"<literal>auto</literal> は、パッケージを自動インストール済みとマークします。"
+"ã\81\93ã\81®ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81«ä¾\9då­\98ã\81\99ã\82\8bæ\89\8bå\8b\95ã\81§ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«ã\81\95ã\82\8cã\81\9fã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81\8cã\81ªã\81\8fã\81ªã\82\8bã\81¨ã\80\81ã\81\93ã\81®"
+"パッケージを削除します。"

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

-#: apt-mark.8.xml:62
+#: apt-mark.8.xml

 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
 "if no other packages depend on it."
 msgstr ""
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
 "if no other packages depend on it."
 msgstr ""

-"<literal>manual</literal> は、パッケージを手動でインストールしたとしてマーク"
-"します。このパッケージに依存する他のパッケージがなくなっても、このパッケージ"
-"を自動的に削除するのを防ぎます。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
-msgid ""
-"<literal>hold</literal> is used to mark a package as held back, which will "
-"prevent the package from being automatically installed, upgraded or "
-"removed.  The command is only a wrapper around <command>dpkg --set-"
-"selections</command> and the state is therefore maintained by &dpkg; and not "
-"affected by the <option>--file</option> option."
-msgstr ""
-"<literal>hold</literal> は、パッケージが自動的にインストール・アップグレー"
-"ド・削除が行われないよう、パッケージに保留マークをつけるのに使用します。この"
-"コマンドは <command>dpkg --set-selections</command> のラッパーに過ぎず、その"
-"ため状態は  &dpkg; により管理され、<option>--file</option> オプションは効果が"
-"ありません。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> は、以前保留したパッケージを、また操作できるよう"
-"キャンセルするのに使用します。"
+"<literal>manual</literal> は、パッケージを手動インストール済みとマークしま"
+"す。このパッケージに依存するほかのパッケージがなくなっても、このパッケージを"
+"自動的に削除するのを防ぎます。"

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

-#: apt-mark.8.xml:86
+#: apt-mark.8.xml

 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "


@@ -2419,26 +2899,17 @@ msgstr ""
 "ケージが自動的にインストールされている場合にのみ、表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ケージが自動的にインストールされている場合にのみ、表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-mark.8.xml:94
+#: apt-mark.8.xml

 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
 "installed packages instead."
 msgstr ""
 "<literal>showmanual</literal> は <literal>showauto</literal> と同様に使用でき"
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
 "installed packages instead."
 msgstr ""
 "<literal>showmanual</literal> は <literal>showauto</literal> と同様に使用でき"

-"ますが、手動でインストールしたパッケージの一覧を表示します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
-msgid ""
-"<literal>showhold</literal> is used to print a list of packages on hold in "
-"the same way as for the other show commands."
-msgstr ""
-"<literal>showhold</literal> は、他の show コマンドと同様に、保留されている"
-"パッケージを出力します。"
+"ますが、手動でインストールされたパッケージの一覧を表示します。"

 
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml

 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "


@@ -2449,66 +2920,179 @@ msgstr ""
 "トリの <filename>extended_status</filename>) ではなく、パラメータ &synopsis-"
 "param-filename; からパッケージの状態を読み書きします。"
 
 "トリの <filename>extended_status</filename>) ではなく、パラメータ &synopsis-"
 "param-filename; からパッケージの状態を読み書きします。"
 

-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
-msgid ""
-"<command>apt-mark</command> returns zero on normal operation, non-zero on "
-"error."
-msgstr ""
-"<command>apt-mark</command> は正常終了時に 0 を返します。エラー時には 0 以外"
-"を返します。"
-
-#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
-msgid "Archive authentication support for APT"
-msgstr "APT アーカイブ認証サポート"
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent Changes for a Package"
+msgstr "パッケージの変更を防ぐ"

 
 

-#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml

 msgid ""
 msgid ""

-"Starting with version 0.6, <command>apt</command> contains code that does "
-"signature checking of the Release file for all archives. This ensures that "
-"packages in the archive can't be modified by people who have no access to "
-"the Release file signing key."
+"<literal>hold</literal> is used to mark a package as held back, which will "
+"prevent the package from being automatically installed, upgraded or removed."

 msgstr ""
 msgstr ""

-"バージョン 0.6 より、<command>apt</command> 全アーカイブに対する Release ファ"
-"イルの署名チェックコードが含まれています。これにより、アーカイブのパッケージ"
-"が、Release ファイル署名キーにアクセスできない人によって変更されていないこと"
-"を保証します。"
+"<literal>hold</literal> は、パッケージを保留としてマークします。パッケージを"
+"自動的なインストール、アップグレード、削除から防ぎます。"

 
 

-#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml

 msgid ""
 msgid ""

-"If a package comes from a archive without a signature, or with a signature "
-"that apt does not have a key for, that package is considered untrusted, and "
-"installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives; future releases might force all "
-"sources to be verified before downloading packages from them."
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."

 msgstr ""
 msgstr ""

-"アーカイブ由来のパッケージが、署名されなかったり、apt が持っていないキーで署"
-"名されていた場合、信頼されていないと見なし、インストールの際に重要な警告を表"
-"示します。<command>apt-get</command> は、現在未署名のパッケージに対して警告す"
-"るだけですが、将来のリリースでは、アーカイブからパッケージをダウンロードする"
-"前に、すべてのソースに対して、強制的に検証される可能性があります。"
+"<literal>unhold</literal> は、以前保留したパッケージを、また操作できるよう"
+"キャンセルするのに使用します。"

 
 

-#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showhold</literal> は、他の show コマンドと同様に、保留されている"
+"パッケージを出力します。"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Schedule Packages for Install, Remove and Purge"
+msgstr "パッケージのインストール、削除、完全削除をスケジュールする"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-mark.8.xml
+msgid ""
+"Some front-ends like <command>apt-get dselect-upgrade</command> can be used "
+"to apply previously scheduled changes to the install state of packages. Such "
+"changes can be scheduled with the <option>install</option>, <option>remove</"
+"option> (also known as <option>deinstall</option>) and <option>purge</"
+"option> commands.  Packages with a specific selection can be displayed with "
+"<option>showinstall</option>, <option>showremove</option> and "
+"<option>showpurge</option> respectively.  More information about these so "
+"called dpkg selections can be found in &dpkg;."
+msgstr ""
+"<command>apt-get dselect-upgrade</command> のようないくつかのフロントエンド"
+"は、パッケージのインストール状態の事前のスケジュール変更を適用するために使用"
+"することができます。このような変更は、<option>install</option>、"
+"<option>remove</option> (<option>deinstall</option> としても知られています) "
+"および <option>purge</option> オプションでスケジュールすることができます。特"
+"定のパッケージの選択は、それぞれ <option>showinstall</option>、"
+"<option>showremove</option> および <option>showpurge</option> で表示すること"
+"ができます。dpkg 選択とも呼ぶこれらの詳細については、dpkg で見つけることがで"
+"きます。"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-mark.8.xml
+msgid ""
+"<command>apt-mark</command> returns zero on normal operation, non-zero on "
+"error."
+msgstr ""
+"<command>apt-mark</command> は正常終了時に 0 を返します。エラー時には 0 以外"
+"を返します。"
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-secure.8.xml
+msgid "Archive authentication support for APT"
+msgstr "APT アーカイブ認証サポート"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "Starting with version 0.6, <command>APT</command> contains code that does "
+#| "signature checking of the Release file for all repositories. This ensures "
+#| "that data like packages in the archive can't be modified by people who "
+#| "have no access to the Release file signing key."
+msgid ""
+"Starting with version 0.6, <command>APT</command> contains code that does "
+"signature checking of the Release file for all repositories. This ensures "
+"that data like packages in the archive can't be modified by people who have "
+"no access to the Release file signing key. Starting with version 1.1 "
+"<command>APT</command> requires repositories to provide recent "
+"authentication information for unimpeded usage of the repository."
+msgstr ""
+"バージョン 0.6 より、<command>apt</command> 全リポジトリに対する Release ファ"
+"イルの署名チェックコードが含まれています。これにより、アーカイブのパッケージ"
+"のようなデータが、Release ファイル署名キーにアクセスできない人によって変更さ"
+"れていないことを保証します。"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "If an archive has an unsigned Release file or no Release file at all "
+#| "current APT versions will raise a warning in <command>update</command> "
+#| "operations and front-ends like <command>apt-get</command> will require "
+#| "explicit confirmation if an installation request includes a package from "
+#| "such an unauthenticated archive."
+msgid ""
+"If an archive has an unsigned Release file or no Release file at all current "
+"APT versions will refuse to download data from them by default in "
+"<command>update</command> operations and even if forced to download front-"
+"ends like &apt-get; will require explicit confirmation if an installation "
+"request includes a package from such an unauthenticated archive."
+msgstr ""
+"アーカイブに署名されていない Release ファイルがあるか、または Release ファイ"
+"ルがまったくない場合は、現在の APT バージョンは <command>update</command> 操"
+"作中に警告を発生させます。また、インストール要求に認証されていないアーカイブ"
+"からのパッケージが含まれる場合は、<command>apt-get</command> のようなフロント"
+"エンドは明示的な確認を要求します。"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
+"As a temporary exception &apt-get; (not &apt;!) raises warnings only if it "
+"encounters unauthenticated archives to give a slightly longer grace period "
+"on this backward compatibility effecting change. This exception will be "
+"removed in future releases and you can opt-out of this grace period by "
+"setting the configuration option <option>Binary::apt-get::Acquire::"
+"AllowInsecureRepositories</option> to <literal>false</literal> or <option>--"
+"no-allow-insecure-repositories</option> on the command line."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
+"You can force all APT clients to raise only warnings by setting the "
+"configuration option <option>Acquire::AllowInsecureRepositories</option> to "
+"<literal>true</literal>. Individual repositories can also be allowed to be "
+"insecure via the &sources-list; option <literal>allow-insecure=yes</"
+"literal>.  Note that insecure repositories are strongly discouraged and all "
+"options to force apt to continue supporting them will eventually be "
+"removed.  Users also have the <option>Trusted</option> option available to "
+"disable even the warnings, but be sure to understand the implications as "
+"detailed in &sources-list;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
+"A repository which previously was authentication but would loose this state "
+"in an <command>update</command> operation raises an error in all APT clients "
+"irrespective of the option to allow or forbid usage of insecure "
+"repositories.  The error can be overcome by additionally setting "
+"<option>Acquire::AllowDowngradeToInsecureRepositories</option> to "
+"<literal>true</literal> or for Individual repositories with the &sources-"
+"list; option <literal>allow-downgrade-to-insecure=yes</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml

 msgid ""
 msgid ""

-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"Note: All APT-based package management front-ends like &apt-get;, &aptitude; "
+"and &synaptic; support this authentication feature, so this manpage uses "
+"<literal>APT</literal> to refer to them all for simplicity only."

 msgstr ""
 "&apt-get;, &aptitude;, &synaptic; といったパッケージフロントエンドは、この新"
 "認証機能をサポートしています。"
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 "&apt-get;, &aptitude;, &synaptic; といったパッケージフロントエンドは、この新"
 "認証機能をサポートしています。"
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-secure.8.xml:76
-msgid "Trusted archives"
-msgstr "ä¿¡é ¼æ¸\88ã\82¢ã\83¼ã\82«ã\82¤ã\83\96"
+#: apt-secure.8.xml
+msgid "Trusted Repositories"
+msgstr "ä¿¡é ¼æ¸\88ã\83ªã\83\9dã\82¸ã\83\88ã\83ª"

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

-#: apt-secure.8.xml:79
+#: apt-secure.8.xml

 msgid ""
 msgid ""

-"The chain of trust from an apt archive to the end user is made up of several "
+"The chain of trust from an APT archive to the end user is made up of several "

 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "


@@ -2523,7 +3107,7 @@ msgstr ""
 "イブメンテナの責任だということです。"
 
 #. type: Content of: <refentry><refsect1><para>
 "イブメンテナの責任だということです。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:87
+#: apt-secure.8.xml

 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "


@@ -2536,24 +3120,26 @@ msgstr ""
 "を確認してください。"
 
 #. type: Content of: <refentry><refsect1><para>
 "を確認してください。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:94
-msgid ""
-"The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. In order to become "
-"effective, this upload needs to be signed by a key contained in the Debian "
-"Maintainers keyring (available in the debian-keyring package). Maintainers' "
-"keys are signed by other maintainers following pre-established procedures to "
-"ensure the identity of the key holder."
-msgstr ""
-"Debian における信頼の輪は、新しいパッケージやパッケージの新バージョンを、メン"
-"テナが Debian アーカイブにアップロードすることから始まります。これが有効にな"
-"るには、アップロードの際に、Debian メンテナキーリング (debian-keyring パッ"
-"ケージに収録) にあるメンテナのキーで署名する必要があります。メンテナのキー"
-"は、キーの所有者の ID を確保するため、事前に確立した手続きの後で、他のメンテ"
-"ナに署名されています。"
+#: apt-secure.8.xml
+msgid ""
+"The chain of trust in Debian starts (e.g.) when a maintainer uploads a new "
+"package or a new version of a package to the Debian archive. In order to "
+"become effective, this upload needs to be signed by a key contained in one "
+"of the Debian package maintainer keyrings (available in the debian-keyring "
+"package). Maintainers' keys are signed by other maintainers following pre-"
+"established procedures to ensure the identity of the key holder. Similar "
+"procedures exist in all Debian-based distributions."
+msgstr ""
+"Debian における信頼の輪は、(例えば) 新しいパッケージやパッケージの新バージョ"
+"ンを、メンテナが Debian アーカイブにアップロードすることから始まります。これ"
+"が有効になるには、アップロードの際に、Debian メンテナキーリング (debian-"
+"keyring パッケージに収録) にあるメンテナのキーで署名する必要があります。メン"
+"テナのキーは、キーの所有者の ID を確保するため、事前に確立した手続きの後で、"
+"他のメンテナに署名されています。同様の手順は、すべての Debian ベースのディス"
+"トリビューションに存在します。"

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

-#: apt-secure.8.xml:104
+#: apt-secure.8.xml

 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "


@@ -2566,14 +3152,15 @@ msgid ""
 msgstr ""
 "アップロードされたパッケージが検証されてアーカイブに格納されると、メンテナの"
 "署名を取り外し、パッケージのチェックサムを計算して、Packages ファイルに格納し"
 msgstr ""
 "アップロードされたパッケージが検証されてアーカイブに格納されると、メンテナの"
 "署名を取り外し、パッケージのチェックサムを計算して、Packages ファイルに格納し"

-"ます。その後、全パッケージファイルのチェックサムを計算して、Release ファイル"
+"ます。その後、全 Packages ファイルのチェックサムを計算して、Release ファイル"

 "に格納します。Release ファイルは、その &keyring-distro; リリースのアーカイブ"
 "キーで署名され、&keyring-distro; ミラーサイトでパッケージや Packages ファイル"
 "に格納します。Release ファイルは、その &keyring-distro; リリースのアーカイブ"
 "キーで署名され、&keyring-distro; ミラーサイトでパッケージや Packages ファイル"

-"とともに配布されます。このキーは、&keyring-package; パッケージに収録されてい"
-"る、&keyring-distro; アーカイブキーリングに含まれます。"
+"とともに配布されます。このキーは、<package>debian-archive-keyring</package> "
+"パッケージに収録されている、&keyring-distro; アーカイブキーリングに含まれま"
+"す。"

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

-#: apt-secure.8.xml:115
+#: apt-secure.8.xml

 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "


@@ -2584,7 +3171,7 @@ msgstr ""
 "す。また、APT が自動的に行うのに任せることもできます。"
 
 #. type: Content of: <refentry><refsect1><para>
 "す。また、APT が自動的に行うのに任せることもできます。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:120
+#: apt-secure.8.xml

 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"


@@ -2593,7 +3180,7 @@ msgstr ""
 "うに考えられる 2 種類の攻撃を防ぐよう設計されています。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 "うに考えられる 2 種類の攻撃を防ぐよう設計されています。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:125
+#: apt-secure.8.xml

 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "


@@ -2608,7 +3195,7 @@ msgstr ""
 "あるソフトウェアを掴まされたりします。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 "あるソフトウェアを掴まされたりします。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:133
+#: apt-secure.8.xml

 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "


@@ -2620,37 +3207,50 @@ msgstr ""
 "てに、悪意あるソフトウェアが伝播するようにファイルを変更できます。"
 
 #. type: Content of: <refentry><refsect1><para>
 "てに、悪意あるソフトウェアが伝播するようにファイルを変更できます。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:140
+#: apt-secure.8.xml

 msgid ""
 msgid ""

-"However, it does not defend against a compromise of the Debian master server "
-"itself (which signs the packages) or against a compromise of the key used to "
-"sign the Release files. In any case, this mechanism can complement a per-"
-"package signature."
+"However, it does not defend against a compromise of the master server itself "
+"(which signs the packages) or against a compromise of the key used to sign "
+"the Release files. In any case, this mechanism can complement a per-package "
+"signature."

 msgstr ""
 msgstr ""

-"しかしこれは、(パッケージに署名する) Debian マスターサーバ自体の侵害や、"
-"Release ファイルに署名するのに使用したキーの漏洩を防げません。いずれにせよ、"
-"ã\81\93ã\81®æ©\9fæ§\8bã\81¯ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81\94ã\81¨ã\81®ç½²å\90\8dã\82\92è£\9cå®\8cã\81\99ã\82\8bã\81\93ã\81¨ã\81\8cã\81§ã\81\8dã\81¾ã\81\99ã\80\82"
+"しかしこれは、(パッケージに署名する) マスターサーバ自体の侵害や、Release ファ"
+"イルに署名するのに使用したキーの漏洩を防げません。いずれにせよ、この機構は"
+"パッケージごとの署名を補完することができます。"

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

-#: apt-secure.8.xml:146
-msgid "User configuration"
-msgstr "ユーザの設定"
+#: apt-secure.8.xml
+msgid "User Configuration"
+msgstr "ユーザ設定"

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

-#: apt-secure.8.xml:148
+#: apt-secure.8.xml

 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "

-"by apt. It can be used to add or remove keys, although an installation of "
-"this release will automatically contain the default Debian archive signing "
-"keys used in the Debian package repositories."
+"by APT to trust repositories. It can be used to add or remove keys as well "
+"as list the trusted keys. Limiting which key(s) are able to sign which "
+"archive is possible via the <option>Signed-By</option> in &sources-list;."
+msgstr ""
+"<command>apt-key</command> は、リポジトリを信頼するために APT が使用するキー"
+"リストを管理するプログラムです。信頼されたキーのリストにキーを追加または削除"
+"するために使用することができます。キーが署名することができるアーカイブは、"
+"&sources-list; 中の <option>Signed-By</option> を介して制限可能です。"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml
+msgid ""
+"Note that a default installation already contains all keys to securely "
+"acquire packages from the default repositories, so fiddling with "
+"<command>apt-key</command> is only needed if third-party repositories are "
+"added."

 msgstr ""
 msgstr ""

-"<command>apt-key</command> は、apt が使用するキーリストを管理するプログラムで"
-"ã\81\99ã\80\82ã\81\93ã\81®ã\83ªã\83ªã\83¼ã\82¹ã\81®ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«ã\81§ã\81¯ã\80\81Debian ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\83ªã\83\9dã\82¸ã\83\88ã\83ªã\81§ä½¿ç\94¨ã\81\99ã\82\8bã\80\81ã\83\87"
-"ã\83\95ã\82©ã\83«ã\83\88ã\81® Debian ã\82¢ã\83¼ã\82«ã\82¤ã\83\96ç½²å\90\8dã\82­ã\83¼ã\81\8cè\87ªå\8b\95ç\9a\84ã\81«å\90«ã\81¾ã\82\8cã\81¾ã\81\99ã\81\8cã\80\81<command>apt-"
-"key</command> でキーの追加・削除が行えます。"
+"デフォルトのインストールでは、すでにデフォルトのリポジトリからセキュアにパッ"
+"ã\82±ã\83¼ã\82¸ã\82\92å\8f\96å¾\97ã\81\99ã\82\8bã\81\9fã\82\81ã\81«ã\81\99ã\81¹ã\81¦ã\81®ã\82­ã\83¼ã\81\8cå\90«ã\81¾ã\82\8cã\81¦ã\81\84ã\82\8bã\81\93ã\81¨ã\81«æ³¨æ\84\8fã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84ã\80\82ã\81\9dã\81®"
+"ã\81\9fã\82\81ã\80\81ã\82µã\83¼ã\83\89ã\83\91ã\83¼ã\83\86ã\82£ã\81®ã\83ªã\83\9dã\82¸ã\83\88ã\83ªã\82\92追å\8a ã\81\97ã\81¦ã\81\84ã\82\8bå ´å\90\88ã\81¯ <command>apt-key</"
+"command> で操作する必要があります。"

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

-#: apt-secure.8.xml:155
+#: apt-secure.8.xml

 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "


@@ -2667,12 +3267,12 @@ msgstr ""
 "ファイルをダウンロード・検証できるようになります。"
 
 #. type: Content of: <refentry><refsect1><title>
 "ファイルをダウンロード・検証できるようになります。"
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-secure.8.xml:164
-msgid "Archive configuration"
-msgstr "アーカイブの設定"
+#: apt-secure.8.xml
+msgid "Archive Configuration"
+msgstr "アーカイブ設定"

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

-#: apt-secure.8.xml:166
+#: apt-secure.8.xml

 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"


@@ -2681,7 +3281,7 @@ msgstr ""
 "下のようにしてください。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 "下のようにしてください。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:171
+#: apt-secure.8.xml

 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"


@@ -2692,7 +3292,7 @@ msgstr ""
 "供) を実行すると、作成できます。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 "供) を実行すると、作成できます。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:176
+#: apt-secure.8.xml

 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."


@@ -2703,18 +3303,39 @@ msgstr ""
 "行して、署名してください。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 "行して、署名してください。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:180
+#: apt-secure.8.xml

 msgid ""
 msgid ""

-"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
+"<emphasis>Publish the key fingerprint</emphasis>, so that your users will "

 "know what key they need to import in order to authenticate the files in the "
 "know what key they need to import in order to authenticate the files in the "

-"archive."
+"archive. It is best to ship your key in its own keyring package like "
+"&keyring-distro; does with &keyring-package; to be able to distribute "
+"updates and key transitions automatically later."

 msgstr ""
 msgstr ""

-"<emphasis>キーの指紋を配布</emphasis>します。これにより、アーカイブ内のファイ"
-"ル認証に、どのキーをインポートする必要があるかを、ユーザに知らせることになり"
-"ます。"
+"<emphasis>キーのフィンガープリントを公開</emphasis>します。これにより、ユーザ"
+"は、アーカイブ内のファイルを認証するためにインポートする必要があるキーを知る"
+"でしょう。これは、ディストリビューションのアップデートとキーの更新を後で自動"
+"的に行うことができる &keyring-package; を実行する &keyring-distro; のような独"
+"自のキーリングパッケージで鍵を公開するのが最善です。"
+
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+msgid ""
+"<emphasis>Provide instructions on how to add your archive and key</"
+"emphasis>.  If your users can't acquire your key securely the chain of trust "
+"described above is broken.  How you can help users add your key depends on "
+"your archive and target audience ranging from having your keyring package "
+"included in another archive users already have configured (like the default "
+"repositories of their distribution) to leveraging the web of trust."
+msgstr ""
+"<emphasis>アーカイブとキーを追加する方法について説明します</emphasis>。ユーザ"
+"がセキュアにキーを取得できない場合は、上述の信頼の輪が壊れています。ユーザの"
+"キー追加を助けることができる方法は、アーカイブとすでに信頼のウェブを活用する"
+"ように (ディストリビューションのデフォルトのリポジトリのように) 設定している"
+"別のアーカイブユーザに含まれたあなたのキーリングパッケージを持つまでは、アー"
+"カイブと対象者に依存します。"

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

-#: apt-secure.8.xml:187
+#: apt-secure.8.xml

 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "


@@ -2724,21 +3345,21 @@ msgstr ""
 "ンテナは前述の最初の 2 ステップに従わなければなりません。"
 
 #. type: Content of: <refentry><refsect1><para>
 "ンテナは前述の最初の 2 ステップに従わなければなりません。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:195
+#: apt-secure.8.xml

 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "

-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"

 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "

-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"

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

-#: apt-secure.8.xml:199
+#: apt-secure.8.xml

 msgid ""
 "For more background information you might want to review the <ulink url="
 msgid ""
 "For more background information you might want to review the <ulink url="

-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
-"Security Infrastructure</ulink> chapter of the Securing Debian Manual "
-"(available also in the harden-doc package) and the <ulink url=\"http://www."
+"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
+"available in the harden-doc package) and the <ulink url=\"http://www."

 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
 "ulink> by V. Alex Brennen."
 msgstr ""
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
 "ulink> by V. Alex Brennen."
 msgstr ""


@@ -2749,12 +3370,12 @@ msgstr ""
 ">Strong Distribution HOWTO</ulink> をご覧ください。"
 
 #. type: Content of: <refentry><refsect1><title>
 ">Strong Distribution HOWTO</ulink> をご覧ください。"
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-secure.8.xml:212
+#: apt-secure.8.xml

 msgid "Manpage Authors"
 msgstr "マニュアルページ作者"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Manpage Authors"
 msgstr "マニュアルページ作者"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:214
+#: apt-secure.8.xml

 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."


@@ -2763,12 +3384,12 @@ msgstr ""
 "Walters, Florian Weimer, Michael Vogt の作業を元にしています。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 "Walters, Florian Weimer, Michael Vogt の作業を元にしています。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml

 msgid "APT CD-ROM management utility"
 msgstr "APT CD-ROM 管理ユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "APT CD-ROM management utility"
 msgstr "APT CD-ROM 管理ユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml

 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "


@@ -2781,7 +3402,7 @@ msgstr ""
 "認を行います。"
 
 #. type: Content of: <refentry><refsect1><para>
 "認を行います。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml

 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system; it cannot be done by hand. Furthermore each disc in a multi-CD set "


@@ -2792,7 +3413,7 @@ msgstr ""
 "を補正できるか評価しなければなりません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "を補正できるか評価しなければなりません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "


@@ -2807,7 +3428,7 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml

 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"


@@ -2818,7 +3439,7 @@ msgstr ""
 "ベースで管理します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ベースで管理します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml

 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"


@@ -2827,23 +3448,18 @@ msgstr ""
 "グツールです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "グツールです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:87
-#, fuzzy
-#| msgid ""
-#| "Mount point; specify the location to mount the CD-ROM. This mount point "
-#| "must be listed in <filename>/etc/fstab</filename> and properly "
-#| "configured.  Configuration Item: <literal>Acquire::cdrom::mount</literal>."
+#: apt-cdrom.8.xml

 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
 "cdrom::AutoDetect</literal>."
 msgstr ""
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
 "cdrom::AutoDetect</literal>."
 msgstr ""

-"マウントポイント - CD-ROM をマウントする場所を指定します。このマウントポイン"
-"ã\83\88ã\81¯ã\80\81<filename>/etc/fstab</filename> ã\81«æ­£ã\81\97ã\81\8f設å®\9aã\81\95ã\82\8cã\81¦ã\81\84ã\82\8bå¿\85è¦\81ã\81\8cã\81\82ã\82\8aã\81¾ã\81\99ã\80\82"
-"設定項目: <literal>Acquire::cdrom::mount</literal>"
+"CD-ROM パスの自動検出を試行しません。通常、<option>--cdrom</option> オプショ"
+"ã\83³ã\81¨çµ\84ã\81¿å\90\88ã\82\8fã\81\9bã\81¦ä½¿ã\81\84ã\81¾ã\81\99ã\80\82設å®\9aé \85ç\9b®: <literal>Acquire::cdrom::AutoDetect</"
+"literal>"

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

-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml

 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "


@@ -2854,7 +3470,7 @@ msgstr ""
 "設定項目: <literal>Acquire::cdrom::mount</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "設定項目: <literal>Acquire::cdrom::mount</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml

 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "


@@ -2865,7 +3481,7 @@ msgstr ""
 "を入力するよう促します。設定項目: <literal>APT::CDROM::Rename</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "を入力するよう促します。設定項目: <literal>APT::CDROM::Rename</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml

 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"


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

-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml

 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "


@@ -2889,7 +3505,7 @@ msgstr ""
 "<literal>APT::CDROM::Fast</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::CDROM::Fast</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml

 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "


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

-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml

 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "


@@ -2912,12 +3528,12 @@ msgstr ""
 "CDROM::NoAct</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
 "CDROM::NoAct</literal>"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml

 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml

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


@@ -2926,12 +3542,12 @@ msgstr ""
 "100 を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 "100 を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-config.8.xml:35
+#: apt-config.8.xml

 msgid "APT Configuration Query program"
 msgstr "APT 設定取得プログラム"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "APT Configuration Query program"
 msgstr "APT 設定取得プログラム"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-config.8.xml:41
+#: apt-config.8.xml

 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "


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

-#: apt-config.8.xml:53
+#: apt-config.8.xml

 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "


@@ -2958,7 +3574,7 @@ msgstr ""
 "してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 "してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>

-#: apt-config.8.xml:61
+#: apt-config.8.xml

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


@@ -2970,7 +3586,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-config.8.xml:66
+#: apt-config.8.xml

 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."


@@ -2979,7 +3595,7 @@ msgstr ""
 "値は <option>-f</option> となります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "値は <option>-f</option> となります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-config.8.xml:70
+#: apt-config.8.xml

 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "


@@ -2990,12 +3606,12 @@ msgstr ""
 "を行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "を行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-config.8.xml:79
+#: apt-config.8.xml

 msgid "Just show the contents of the configuration space."
 msgstr "設定箇所の内容を表示するだけです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Just show the contents of the configuration space."
 msgstr "設定箇所の内容を表示するだけです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-config.8.xml:92
+#: apt-config.8.xml

 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."


@@ -3004,12 +3620,12 @@ msgstr ""
 "--no-empty としてください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 "--no-empty としてください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>

-#: apt-config.8.xml:97
+#: apt-config.8.xml

 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-config.8.xml:98
+#: apt-config.8.xml

 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "


@@ -3026,13 +3642,13 @@ msgstr ""
 "さい。"
 
 #. type: Content of: <refentry><refsect1><para>
 "さい。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml
+#: apt-ftparchive.1.xml

 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-config.8.xml:117
+#: apt-config.8.xml

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


@@ -3041,27 +3657,27 @@ msgstr ""
 "の 100 を返します。"
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
 "の 100 を返します。"
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>

-#: apt.conf.5.xml:22
+#: apt.conf.5.xml

 msgid "Initial documentation of Debug::*."
 msgstr "Debug::* に関する最初のドキュメント"
 
 #. type: Content of: <refentry><refentryinfo><author><email>
 msgid "Initial documentation of Debug::*."
 msgstr "Debug::* に関する最初のドキュメント"
 
 #. type: Content of: <refentry><refentryinfo><author><email>

-#: apt.conf.5.xml:23
+#: apt.conf.5.xml

 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>

-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml

 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt.conf.5.xml:40
+#: apt.conf.5.xml

 msgid "Configuration file for APT"
 msgstr "APT の設定ファイル"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Configuration file for APT"
 msgstr "APT の設定ファイル"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:44
+#: apt.conf.5.xml

 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "


@@ -3074,21 +3690,21 @@ msgstr ""
 "ンドラインパーサを共有しています。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
 "ンドラインパーサを共有しています。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>

-#: apt.conf.5.xml:50
+#: apt.conf.5.xml

 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
 msgstr "APT ツールの起動時に、設定ファイルを以下の順番で読み込みます。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
 msgstr "APT ツールの起動時に、設定ファイルを以下の順番で読み込みます。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>

-#: apt.conf.5.xml:52
+#: apt.conf.5.xml

 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
 msgstr "<envar>APT_CONFIG</envar> 環境変数で指定したファイル (存在する場合)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
 msgstr "<envar>APT_CONFIG</envar> 環境変数で指定したファイル (存在する場合)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>

-#: apt.conf.5.xml:54
+#: apt.conf.5.xml

 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "


@@ -3106,13 +3722,22 @@ msgstr ""
 "力します。一致する場合は黙って無視します。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 "力します。一致する場合は黙って無視します。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>

-#: apt.conf.5.xml:61
+#: apt.conf.5.xml

 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr "<literal>Dir::Etc::Main</literal> で指定される、メイン設定ファイル"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr "<literal>Dir::Etc::Main</literal> で指定される、メイン設定ファイル"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>

-#: apt.conf.5.xml:63
+#: apt.conf.5.xml
+msgid ""
+"all options set in the binary specific configuration subtree are moved into "
+"the root of the tree."
+msgstr ""
+"バイナリ固有の設定サブツリーに設定されたすべてのオプションは、ツリーのルート"
+"に移動されます。"
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml

 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."


@@ -3121,12 +3746,12 @@ msgstr ""
 "加読み込みができます。"
 
 #. type: Content of: <refentry><refsect1><title>
 "加読み込みができます。"
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:67
+#: apt.conf.5.xml

 msgid "Syntax"
 msgstr "構文"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Syntax"
 msgstr "構文"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:68
+#: apt.conf.5.xml

 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "


@@ -3140,7 +3765,7 @@ msgstr ""
 "プションは、親グループからは継承しません。"
 
 #. type: Content of: <refentry><refsect1><para>
 "プションは、親グループからは継承しません。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:74
+#: apt.conf.5.xml

 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "


@@ -3163,7 +3788,7 @@ msgstr ""
 "のように波カッコを使うと、新しいスコープを開くことができます。"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
 "のように波カッコを使うと、新しいスコープを開くことができます。"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>

-#: apt.conf.5.xml:87
+#: apt.conf.5.xml

 #, no-wrap
 msgid ""
 "APT {\n"
 #, no-wrap
 msgid ""
 "APT {\n"


@@ -3181,7 +3806,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:95
+#: apt.conf.5.xml

 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "


@@ -3192,13 +3817,13 @@ msgstr ""
 "ロンで区切って、複数のエントリを表せます。"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
 "ロンで区切って、複数のエントリを表せます。"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>

-#: apt.conf.5.xml:100
+#: apt.conf.5.xml

 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:103
+#: apt.conf.5.xml

 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."


@@ -3207,7 +3832,7 @@ msgstr ""
 "考になるでしょう。"
 
 #. type: Content of: <refentry><refsect1><para>
 "考になるでしょう。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:106
+#: apt.conf.5.xml

 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."


@@ -3216,7 +3841,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal> とすることもできます。"
 
 #. type: Content of: <refentry><refsect1><para>
 "<literal>dpkg::pre-install-pkgs</literal> とすることもできます。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:109
+#: apt.conf.5.xml

 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "


@@ -3231,7 +3856,7 @@ msgstr ""
 "できます。"
 
 #. type: Content of: <refentry><refsect1><para>
 "できます。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:114
+#: apt.conf.5.xml

 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "


@@ -3250,7 +3875,7 @@ msgstr ""
 "があることに注意してください)。"
 
 #. type: Content of: <refentry><refsect1><para>
 "があることに注意してください)。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:124
+#: apt.conf.5.xml

 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "


@@ -3265,7 +3890,7 @@ msgstr ""
 "せん。クリアされるだけです。"
 
 #. type: Content of: <refentry><refsect1><para>
 "せん。クリアされるだけです。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:132
+#: apt.conf.5.xml

 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "


@@ -3283,7 +3908,7 @@ msgstr ""
 "ん)。"
 
 #. type: Content of: <refentry><refsect1><para>
 "ん)。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:140
+#: apt.conf.5.xml

 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "


@@ -3311,12 +3936,12 @@ msgstr ""
 "かない限りは、自分でそのような構文を修正してください。"
 
 #. type: Content of: <refentry><refsect1><title>
 "かない限りは、自分でそのような構文を修正してください。"
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:155
+#: apt.conf.5.xml

 msgid "The APT Group"
 msgstr "APT グループ"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "The APT Group"
 msgstr "APT グループ"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:156
+#: apt.conf.5.xml

 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."


@@ -3325,7 +3950,7 @@ msgstr ""
 "御します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "御します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:161
+#: apt.conf.5.xml

 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "


@@ -3336,7 +3961,7 @@ msgstr ""
 "ルしたアーキテクチャです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ルしたアーキテクチャです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:168
+#: apt.conf.5.xml

 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "


@@ -3357,20 +3982,61 @@ msgstr ""
 "加します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "加します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:181
+#: apt.conf.5.xml
+msgid ""
+"This scope defines which compression formats are supported, how compression "
+"and decompression can be performed if support for this format isn't built "
+"into apt directly and a cost-value indicating how costly it is to compress "
+"something in this format. As an example the following configuration stanza "
+"would allow apt to download and uncompress as well as create and store files "
+"with the low-cost <literal>.reversed</literal> file extension which it will "
+"pass to the command <command>rev</command> without additional commandline "
+"parameters for compression and uncompression:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting>
+#: apt.conf.5.xml
+#, no-wrap
+msgid ""
+"APT::Compressor::rev {\n"
+"\tName \"rev\";\n"
+"\tExtension \".reversed\";\n"
+"\tBinary \"rev\";\n"
+"\tCompressArg {};\n"
+"\tUncompressArg {};\n"
+"\tCost \"10\";\n"
+"};\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"List of all build profiles enabled for build-dependency resolution, without "
+"the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
+"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-"
+"buildpackage; overrides the list notation."
+msgstr ""
+"構築依存の解決にあたって有効になっているビルドプロファイルを名前空間の"
+"「<literal>profile.</literal>」接頭辞を取り除いたもの全ての一覧です。デフォル"
+"トではこの一覧は空です。&dpkg-buildpackage; で利用される "
+"<envar>DEB_BUILD_PROFILES</envar> はこの一覧よりも優先されます。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml

 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "

-"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
-"'4.0', '5.0*'. See also &apt-preferences;."
+"'stable', 'testing', 'unstable', '&debian-stable-codename;', '&debian-"
+"testing-codename;', '4.0', '5.0*'. See also &apt-preferences;."

 msgstr ""
 "ひとつ以上のバージョンがある場合に、パッケージをインストールを行うデフォルト"
 "リリースです。リリース名や、コード名、リリースバージョンがあります。例えば "
 msgstr ""
 "ひとつ以上のバージョンがある場合に、パッケージをインストールを行うデフォルト"
 "リリースです。リリース名や、コード名、リリースバージョンがあります。例えば "

-"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
-"'4.0', '5.0*'  となります。&apt-preferences; も参照してください。"
+"'stable', 'testing', 'unstable', '&debian-stable-codename;', '&debian-"
+"testing-codename;', '4.0', '5.0*'  となります。&apt-preferences; も参照してく"
+"ださい。"

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

-#: apt.conf.5.xml:187
+#: apt.conf.5.xml

 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."


@@ -3379,7 +4045,7 @@ msgstr ""
 "パッケージを無視します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "パッケージを無視します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:192
+#: apt.conf.5.xml

 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "


@@ -3393,7 +4059,7 @@ msgstr ""
 "注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:200
+#: apt.conf.5.xml

 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "


@@ -3417,7 +4083,7 @@ msgstr ""
 "なり、A への依存関係は、もう満たせません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "なり、A への依存関係は、もう満たせません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:212
+#: apt.conf.5.xml

 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "


@@ -3442,7 +4108,7 @@ msgstr ""
 "述のシナリオを解決する方法の、1つにしかすぎないのです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "述のシナリオを解決する方法の、1つにしかすぎないのです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:225
+#: apt.conf.5.xml

 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "


@@ -3458,7 +4124,7 @@ msgstr ""
 "も報告していただきたいです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "も報告していただきたいです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:236
+#: apt.conf.5.xml

 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "


@@ -3479,7 +4145,7 @@ msgstr ""
 "それらが依存しているパッケージ以外の不可欠パッケージで動作します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "それらが依存しているパッケージ以外の不可欠パッケージで動作します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:248
+#: apt.conf.5.xml

 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "


@@ -3513,12 +4179,12 @@ msgstr ""
 "の自動増加を無効にします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "の自動増加を無効にします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:264
+#: apt.conf.5.xml

 msgid "Defines which packages are considered essential build dependencies."
 msgstr "構築依存関係で不可欠なパッケージを定義します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Defines which packages are considered essential build dependencies."
 msgstr "構築依存関係で不可欠なパッケージを定義します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:268
+#: apt.conf.5.xml

 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."


@@ -3527,7 +4193,7 @@ msgstr ""
 "&apt-get; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "&apt-get; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:273
+#: apt.conf.5.xml

 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."


@@ -3536,7 +4202,7 @@ msgstr ""
 "は &apt-cache; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "は &apt-cache; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:278
+#: apt.conf.5.xml

 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."


@@ -3545,12 +4211,12 @@ msgstr ""
 "は &apt-cdrom; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><title>
 "は &apt-cdrom; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:284
+#: apt.conf.5.xml

 msgid "The Acquire Group"
 msgstr "Acquire グループ"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "The Acquire Group"
 msgstr "Acquire グループ"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:285
+#: apt.conf.5.xml

 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "


@@ -3561,7 +4227,7 @@ msgstr ""
 "(&sources-list; も参照)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "(&sources-list; も参照)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:292
+#: apt.conf.5.xml

 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "


@@ -3570,7 +4236,9 @@ msgid ""
 "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 desired the <literal>Max-ValidTime</literal> option below can be "
 "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 desired the <literal>Max-ValidTime</literal> option below can be "

-"used."
+"used.  The <option>Check-Valid-Until</option> option of &sources-list; "
+"entries should be preferred to disable the check selectively instead of "
+"using this global override."

 msgstr ""
 "セキュリティ関連のオプションで、デフォルトは true です。Release ファイルの有"
 "効期限検証により、長期間のリプレイ攻撃を防ぎます。さらに、例えばユーザが、も"
 msgstr ""
 "セキュリティ関連のオプションで、デフォルトは true です。Release ファイルの有"
 "効期限検証により、長期間のリプレイ攻撃を防ぎます。さらに、例えばユーザが、も"


@@ -3578,10 +4246,12 @@ msgstr ""
 "のシステム時計が正確であることに依存しています。アーカイブメンテナは、"
 "<literal>Valid-Until</literal> ヘッダがある Release ファイルを作成するよう推"
 "奨されていますが、このヘッダを付与しない、またはより厳密な値が必要な場合、以"
 "のシステム時計が正確であることに依存しています。アーカイブメンテナは、"
 "<literal>Valid-Until</literal> ヘッダがある Release ファイルを作成するよう推"
 "奨されていますが、このヘッダを付与しない、またはより厳密な値が必要な場合、以"

-"下の <literal>Max-ValidTime</literal> オプションを使用できます。"
+"下の <literal>Max-ValidTime</literal> オプションを使用できます。&sources-"
+"list; エントリの <option>Check-Valid-Until</option> オプションは、グローバル"
+"オーバーライドを使う代わりに選択的にチェックを無効にすることが好ましいです。"

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

-#: apt.conf.5.xml:305
+#: apt.conf.5.xml

 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "


@@ -3589,17 +4259,20 @@ msgid ""
 "<literal>Valid-Until</literal> header the earlier date of the two is used as "
 "the expiration date.  The default value is <literal>0</literal> which stands "
 "for \"valid forever\".  Archive specific settings can be made by appending "
 "<literal>Valid-Until</literal> header the earlier date of the two is used as "
 "the expiration date.  The default value is <literal>0</literal> which stands "
 "for \"valid forever\".  Archive specific settings can be made by appending "

-"the label of the archive to the option name."
+"the label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Max</option> option there."

 msgstr ""
 "<filename>Release</filename> ファイルを作成してから (<literal>Date</literal> "
 "ヘッダ)、有効であるとみなせる最大時間 (秒数) です。Release ファイル自体に "
 "<literal>Valid-Until</literal> ヘッダがある場合、その 2 つのうち、より早い日"
 "付が有効期間として使用されます。デフォルト値は <literal>0</literal> で「無期"
 "限」を表します。オプション名にアーカイブのラベルを付与することで、アーカイブ"
 msgstr ""
 "<filename>Release</filename> ファイルを作成してから (<literal>Date</literal> "
 "ヘッダ)、有効であるとみなせる最大時間 (秒数) です。Release ファイル自体に "
 "<literal>Valid-Until</literal> ヘッダがある場合、その 2 つのうち、より早い日"
 "付が有効期間として使用されます。デフォルト値は <literal>0</literal> で「無期"
 "限」を表します。オプション名にアーカイブのラベルを付与することで、アーカイブ"

-"固有の設定を作成できます。"
+"固有の設定を作成できます。または、<option>Valid-Until-Max</option> オプション"
+"を使用して特定の &sources-list; エントリで同じことを達成できます。"

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

-#: apt.conf.5.xml:317
+#: apt.conf.5.xml

 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "


@@ -3607,28 +4280,34 @@ msgid ""
 "(local) mirror of a more frequently updated archive with a <literal>Valid-"
 "Until</literal> header instead of completely disabling the expiration date "
 "checking.  Archive specific settings can and should be used by appending the "
 "(local) mirror of a more frequently updated archive with a <literal>Valid-"
 "Until</literal> header instead of completely disabling the expiration date "
 "checking.  Archive specific settings can and should be used by appending the "

-"label of the archive to the option name."
+"label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Min</option> option there."

 msgstr ""
 "<filename>Release</filename> ファイルを作成してから (<literal>Date</literal> "
 "ヘッダ)、有効であるとみなせる最小時間 (秒数) です。<literal>Valid-Until</"
 "literal> がある頻繁に更新されるアーカイブの、ほとんど更新されない (ローカル) "
 "ミラーを使用する場合に、完全に有効期限チェックを無効にする代わりに使用してく"
 "ださい。オプション名にアーカイブのラベルを付与することで、アーカイブ固有の設"
 msgstr ""
 "<filename>Release</filename> ファイルを作成してから (<literal>Date</literal> "
 "ヘッダ)、有効であるとみなせる最小時間 (秒数) です。<literal>Valid-Until</"
 "literal> がある頻繁に更新されるアーカイブの、ほとんど更新されない (ローカル) "
 "ミラーを使用する場合に、完全に有効期限チェックを無効にする代わりに使用してく"
 "ださい。オプション名にアーカイブのラベルを付与することで、アーカイブ固有の設"

-"定を作成できます。"
+"定を作成できます。または、<option>Valid-Until-Min</option> オプションを使用し"
+"て特定の &sources-list; エントリで同じことを達成できます。"

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

-#: apt.conf.5.xml:329
+#: apt.conf.5.xml

 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "

-"by default."
+"by default. Preferably, this can be set for specific &sources-list; entries "
+"or index files by using the <option>PDiffs</option> option there."

 msgstr ""
 "(<filename>Packages</filename> のような) インデックス全体をダウンロードするの"
 "ではなく、<literal>PDiffs</literal> と呼ばれる差分をダウンロードしようとしま"
 msgstr ""
 "(<filename>Packages</filename> のような) インデックス全体をダウンロードするの"
 "ではなく、<literal>PDiffs</literal> と呼ばれる差分をダウンロードしようとしま"

-"す。デフォルトでは True です。"
+"す。デフォルトでは True です。または、<option>PDiffs</option> オプションを使"
+"用して特定の &sources-list; エントリまたはインデックスファイルでこれを設定で"
+"きます。"

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

-#: apt.conf.5.xml:332
+#: apt.conf.5.xml

 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "


@@ -3644,7 +4323,23 @@ msgstr ""
 "も、パッチをダウンロードする代わりに、完全なファイルをダウンロードします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "も、パッチをダウンロードする代わりに、完全なファイルをダウンロードします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:342
+#: apt.conf.5.xml
+msgid ""
+"Try to download indexes via an URI constructed from a hashsum of the "
+"expected file rather than downloaded via a well-known stable filename. True "
+"by default, but automatically disabled if the source indicates no support "
+"for it. Usage can be forced with the special value \"force\". Preferably, "
+"this can be set for specific &sources-list; entries or index files by using "
+"the <option>By-Hash</option> option there."
+msgstr ""
+"(<filename>Packages</filename> のような) インデックス全体をダウンロードするの"
+"ではなく、<literal>PDiffs</literal> と呼ばれる差分をダウンロードしようとしま"
+"す。デフォルトでは True です。または、<option>By-Hash</option> オプションを使"
+"用して特定の &sources-list; エントリまたはインデックスファイルでこれを設定で"
+"きます。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml

 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "


@@ -3658,7 +4353,7 @@ msgstr ""
 "<literal>access</literal> は、URI タイプごとに 1 接続を開きます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>access</literal> は、URI タイプごとに 1 接続を開きます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:350
+#: apt.conf.5.xml

 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."


@@ -3667,7 +4362,7 @@ msgstr ""
 "えられた回数だけリトライを行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "えられた回数だけリトライを行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:355
+#: apt.conf.5.xml

 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."


@@ -3677,7 +4372,7 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:360
+#: apt.conf.5.xml

 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"


@@ -3695,7 +4390,7 @@ msgstr ""
 "ないと、環境変数 <envar>http_proxy</envar> を使用します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ないと、環境変数 <envar>http_proxy</envar> を使用します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:368
+#: apt.conf.5.xml

 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "


@@ -3714,7 +4409,7 @@ msgstr ""
 "が汚れるのを防げます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "が汚れるのを防げます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:378 apt.conf.5.xml:466
+#: apt.conf.5.xml

 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."


@@ -3724,25 +4419,25 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:381
+#: apt.conf.5.xml

 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
 "g. on high-latency connections. It specifies how many requests are sent in a "
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
 "g. on high-latency connections. It specifies how many requests are sent in a "

-"pipeline.  Previous APT versions had a default of 10 for this setting, but "
-"the default value is now 0 (= disabled) to avoid problems with the ever-"
-"growing amount of webservers and proxies which choose to not conform to the "
-"HTTP/1.1 specification."
+"pipeline.  APT tries to detect and workaround misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the "
+"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
+"It is enabled by default with the value 10."

 msgstr ""
 "<literal>Acquire::http::Pipeline-Depth</literal> の設定は、例えばレイテンシの"
 msgstr ""
 "<literal>Acquire::http::Pipeline-Depth</literal> の設定は、例えばレイテンシの"

-"高い接続で有益な、HTTP パイプライン (RFC 2616 8.1.2.2 節) を有効にするのに使"
-"用できます。これにより、パイプラインを用いて送信する、リクエスト数を指定でき"
-"ます。旧バージョンの APT は、デフォルトで 10 でしたが、HTTP/1.1 仕様に対応し"
-"ないウェブサーバやプロキシの数が、増え続けることによる問題を回避するため、デ"
-"ã\83\95ã\82©ã\83«ã\83\88å\80¤ã\81¯ 0 (= ç\84¡å\8a¹) ã\81§す。"
+"高い接続で有益な HTTP パイプライン (RFC 2616 8.1.2.2 節) を有効にするのに使用"
+"できます。APT は、実行時の Web サーバやプロキシの不作法な振る舞いの検出と回避"
+"策を試します。しかし、HTTP/1.1 仕様に準拠していないことがわかっている場合は、"
+"値を 0 に設定することでパイプラインを無効にすることができます。これは、デフォ"
+"ã\83«ã\83\88ã\81§å\80¤ 10 ã\81§æ\9c\89å\8a¹ã\81«ã\81ªã\81£ã\81¦ã\81\84ã\81¾す。"

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

-#: apt.conf.5.xml:388
+#: apt.conf.5.xml

 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."


@@ -3751,14 +4446,7 @@ msgstr ""
 "かどうかを制御します。デフォルトでは有効です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "かどうかを制御します。デフォルトでは有効です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:391
-#, fuzzy
-#| msgid ""
-#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-#| "literal> which accepts integer values in kilobytes. The default value is "
-#| "0 which deactivates the limit and tries to use all available bandwidth "
-#| "(note that this option implicitly disables downloading from multiple "
-#| "servers at the same time.)"
+#: apt.conf.5.xml

 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "


@@ -3766,13 +4454,13 @@ msgid ""
 "bandwidth.  Note that this option implicitly disables downloading from "
 "multiple servers at the same time."
 msgstr ""
 "bandwidth.  Note that this option implicitly disables downloading from "
 "multiple servers at the same time."
 msgstr ""

-"使用する帯域を制限するには、<literal>Acquire::http::Dl-Limit</literal> にキロ"
-"ã\83\90ã\82¤ã\83\88ã\81§æ\95´æ\95°å\80¤ã\82\92ä¸\8eã\81\88ã\81¾ã\81\99ã\80\82ã\83\87ã\83\95ã\82©ã\83«ã\83\88å\80¤ã\81¯ 0 ã\81§ã\80\81å\88¶é\99\90ã\82\92解é\99¤ã\81\97ã\80\81使ç\94¨ã\81§ã\81\8dã\82\8b帯å\9f\9fã\82\92"
-"ã\81\99ã\81¹ã\81¦ä½¿ã\81\8aã\81\86ã\81¨ã\81\97ã\81¾ã\81\99 (ã\81\93ã\81®ã\82ªã\83\97ã\82·ã\83§ã\83³ã\81¯æ\9a\97é»\99ç\9a\84ã\81«ã\80\81å\90\8cæ\99\82ã\81«è¤\87æ\95°ã\81®ã\82µã\83¼ã\83\90ã\81\8bã\82\89ã\83\80ã\82¦ã\83³"
-"ã\83­ã\83¼ã\83\89ã\81\97ã\81ªã\81\8fã\81ªã\82\8bã\81\93ã\81¨ã\81«æ³¨æ\84\8fã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84)。"
+"使用する帯域を制限するには、<literal>Acquire::http::Dl-Limit</literal> に秒あ"
+"ã\81\9fã\82\8aã\81®ã\82­ã\83­ã\83\90ã\82¤ã\83\88ã\81§æ\95´æ\95°å\80¤ã\82\92ä¸\8eã\81\88ã\81¾ã\81\99ã\80\82ã\83\87ã\83\95ã\82©ã\83«ã\83\88å\80¤ã\81¯ 0 ã\81§ã\80\81å\88¶é\99\90ã\82\92解é\99¤ã\81\97ã\80\81使ç\94¨ã\81§"
+"ã\81\8dã\82\8b帯å\9f\9fã\82\92ã\81\99ã\81¹ã\81¦ä½¿ã\81\8aã\81\86ã\81¨ã\81\97ã\81¾ã\81\99ã\80\82ã\81\93ã\81®ã\82ªã\83\97ã\82·ã\83§ã\83³ã\81¯æ\9a\97é»\99ç\9a\84ã\81«ã\80\81å\90\8cæ\99\82ã\81«è¤\87æ\95°ã\81®ã\82µã\83¼ã\83\90"
+"ã\81\8bã\82\89ã\83\80ã\82¦ã\83³ã\83­ã\83¼ã\83\89ã\81\97ã\81ªã\81\8fã\81ªã\82\8bã\81\93ã\81¨ã\81«æ³¨æ\84\8fã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84。"

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

-#: apt.conf.5.xml:398
+#: apt.conf.5.xml

 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "


@@ -3783,21 +4471,43 @@ msgstr ""
 "ロードするための、異なる User-Agent を設定できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ロードするための、異なる User-Agent を設定できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:402
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to "
+#| "specify an external command to discover the http proxy to use. Apt "
+#| "expects the command to output the proxy on stdout in the style "
+#| "<literal>http://proxy:port/</literal>. This will override the generic "
+#| "<literal>Acquire::http::Proxy</literal> but not any specific host proxy "
+#| "configuration set via <literal>Acquire::http::Proxy::$HOST</literal>.  "
+#| "See the &squid-deb-proxy-client; package for an example implementation "
+#| "that uses avahi. This option takes precedence over the legacy option name "
+#| "<literal>ProxyAutoDetect</literal>."

 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "

-"an external command to discover the http proxy to use. Apt expects the "
-"command to output the proxy on stdout in the style <literal>http://proxy:"
-"port/</literal>. This will override the generic <literal>Acquire::http::"
-"Proxy</literal> but not any specific host proxy configuration set via "
-"<literal>Acquire::http::Proxy::$HOST</literal>.  See the &squid-deb-proxy-"
-"client; package for an example implementation that uses avahi. This option "
-"takes precedence over the legacy option name <literal>ProxyAutoDetect</"
-"literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:420
+"an external command to discover the http proxy to use. The first and only "
+"parameter is an URI denoting the host to be contacted to allow for host-"
+"specific configuration. APT expects the command to output the proxy on "
+"stdout as a single line in the style <literal>http://proxy:port/</literal> "
+"or the word <literal>DIRECT</literal> if no proxy should be used. No output "
+"indicates that the generic proxy settings should be used.  Note that auto-"
+"detection will not be used for a host if a host-specific proxy configuration "
+"is already set via <literal>Acquire::http::Proxy::<replaceable>HOST</"
+"replaceable></literal>.  See the &squid-deb-proxy-client; package for an "
+"example implementation that uses avahi.  This option takes precedence over "
+"the legacy option name <literal>ProxyAutoDetect</literal>."
+msgstr ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> を使って利用する http プ"
+"ロキシを検出するための外部コマンドを指定できます。APT はコマンドが標準出力に "
+"<literal>http://proxy:port/</literal> 形式でプロキシを出力することを期待して"
+"います。これは全体を指定する <literal>Acquire::http::Proxy</literal> よりも優"
+"先されますが <literal>Acquire::http::Proxy::$HOST</literal> 経由でセットした"
+"特定のホストのプロキシ設定はこれよりも優先されます。avahi を利用する実装例に"
+"ついては &squid-deb-proxy-client; パッケージを見てください。このオプションは"
+"古い <literal>ProxyAutoDetect</literal> よりも優先されます。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml

 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "


@@ -3814,7 +4524,7 @@ msgstr ""
 "していません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "していません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:428
+#: apt.conf.5.xml

 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "


@@ -3852,7 +4562,7 @@ msgstr ""
 "ごとのオプションです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ごとのオプションです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:449
+#: apt.conf.5.xml

 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"


@@ -3884,7 +4594,7 @@ msgstr ""
 "literal>, <literal>$(SITE_PORT)</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "literal>, <literal>$(SITE_PORT)</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:469
+#: apt.conf.5.xml

 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "


@@ -3899,7 +4609,7 @@ msgstr ""
 "定例はサンプル設定ファイルを参照してください)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "定例はサンプル設定ファイルを参照してください)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:476
+#: apt.conf.5.xml

 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "


@@ -3912,7 +4622,7 @@ msgstr ""
 "FTP over HTTP を使用するのは推奨しません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "FTP over HTTP を使用するのは推奨しません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:481
+#: apt.conf.5.xml

 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "


@@ -3928,13 +4638,13 @@ msgstr ""
 "いことに注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 "いことに注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>

-#: apt.conf.5.xml:495
+#: apt.conf.5.xml

 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:490
+#: apt.conf.5.xml

 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "


@@ -3955,7 +4665,7 @@ msgstr ""
 "マンドは UMount で指定することができます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "マンドは UMount で指定することができます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:503
+#: apt.conf.5.xml

 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."


@@ -3964,21 +4674,30 @@ msgstr ""
 "る、<literal>gpgv::Options</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 "る、<literal>gpgv::Options</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>

-#: apt.conf.5.xml:514
+#: apt.conf.5.xml

 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:509
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "List of compression types which are understood by the acquire methods.  "
+#| "Files like <filename>Packages</filename> can be available in various "
+#| "compression formats.  By default the acquire methods can decompress "
+#| "<command>bzip2</command>, <command>lzma</command> and <command>gzip</"
+#| "command> compressed files; with this setting more formats can be added on "
+#| "the fly or the used method can be changed. The syntax for this is: "
+#| "<placeholder type=\"synopsis\" id=\"0\"/>"

 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "

-"compression formats.  By default the acquire methods can decompress "
-"<command>bzip2</command>, <command>lzma</command> and <command>gzip</"
-"command> compressed files; with this setting more formats can be added on "
-"the fly or the used method can be changed. The syntax for this is: "
-"<placeholder type=\"synopsis\" id=\"0\"/>"
+"compression formats.  By default the acquire methods can decompress and "
+"recompress many common formats like <command>xz</command> and <command>gzip</"
+"command>; with this scope the supported formats can be queried, modified as "
+"well as support for more formats added (see also <option>APT::Compressor</"
+"option>). The syntax for this is: <placeholder type=\"synopsis\" id=\"0\"/>"

 msgstr ""
 "acquire メソッドが理解できる、圧縮法のリストです。<filename>Packages</"
 "filename> のようなファイルは、さまざまな圧縮形式が利用できます。デフォルトで"
 msgstr ""
 "acquire メソッドが理解できる、圧縮法のリストです。<filename>Packages</"
 "filename> のようなファイルは、さまざまな圧縮形式が利用できます。デフォルトで"


@@ -3988,33 +4707,48 @@ msgstr ""
 "す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 "す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>

-#: apt.conf.5.xml:519
+#: apt.conf.5.xml

 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>

-#: apt.conf.5.xml:522
-#, no-wrap
-msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
+#: apt.conf.5.xml
+#, fuzzy, no-wrap
+#| msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
+msgid "Acquire::CompressionTypes::Order { \"xz\"; \"gz\"; };"

 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:515
+#: apt.conf.5.xml
+#, fuzzy
+#| 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 acquire system will try the first and proceed with the next "
+#| "compression type in this list on error, so to prefer one over the other "
+#| "type simply add the preferred type first - default types not already "
+#| "added will be implicitly appended to the end of the list, so e.g. "
+#| "<placeholder type=\"synopsis\" id=\"0\"/> can be used to prefer "
+#| "<command>gzip</command> compressed files over <command>bzip2</command> "
+#| "and <command>lzma</command>.  If <command>lzma</command> should be "
+#| "preferred over <command>gzip</command> and <command>bzip2</command> the "
+#| "configure setting should look like this: <placeholder type=\"synopsis\" "
+#| "id=\"1\"/> It is not needed to add <literal>bz2</literal> to the list "
+#| "explicitly as it will be added automatically."

 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 "
 "acquire system will try the first and proceed with the next compression type "
 "in this list on error, so to prefer one over the other type simply add the "
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
 "acquire system will try the first and proceed with the next compression type "
 "in this list on error, so to prefer one over the other type simply add the "

-"preferred type first - default types not already added will be implicitly "
-"appended to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
-"\"0\"/> can be used to prefer <command>gzip</command> compressed files over "
-"<command>bzip2</command> and <command>lzma</command>.  If <command>lzma</"
-"command> should be preferred over <command>gzip</command> and "
-"<command>bzip2</command> the configure setting should look like this: "
-"<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
-"<literal>bz2</literal> to the list explicitly as it will be added "
-"automatically."
+"preferred type first - types not already added will be implicitly appended "
+"to the end of the list, so e.g. <placeholder type=\"synopsis\" id=\"0\"/> "
+"can be used to prefer <command>gzip</command> compressed files over all "
+"other compression formats.  If <command>xz</command> should be preferred "
+"over <command>gzip</command> and <command>bzip2</command> the configure "
+"setting should look like this: <placeholder type=\"synopsis\" id=\"1\"/> It "
+"is not needed to add <literal>bz2</literal> to the list explicitly as it "
+"will be added automatically."

 msgstr ""
 "また、<literal>Order</literal> サブグループを使用して、取得システムが、圧縮"
 "ファイルのダウンロードを試みる順番を定義できます。取得システムは先頭のものを"
 msgstr ""
 "また、<literal>Order</literal> サブグループを使用して、取得システムが、圧縮"
 "ファイルのダウンロードを試みる順番を定義できます。取得システムは先頭のものを"


@@ -4029,24 +4763,37 @@ msgstr ""
 "<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 "<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>

-#: apt.conf.5.xml:529
+#: apt.conf.5.xml

 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:524
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
+#| "literal> will be checked at run time. If this option has been set, the "
+#| "method will only be used if this file exists; e.g. for the "
+#| "<literal>bzip2</literal> method (the inbuilt) setting is: <placeholder "
+#| "type=\"literallayout\" id=\"0\"/> Note also that list entries specified "
+#| "on the command line will be added at the end of the list specified in the "
+#| "configuration files, but before the default entries. To prefer a type in "
+#| "this case over the ones specified in the configuration files you can set "
+#| "the option direct - not in list style.  This will not override the "
+#| "defined list; it will only prefix the list with this type."

 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"

-"literal> will be checked at run time. If this option has been set, the "
-"method will only be used if this file exists; e.g. for the <literal>bzip2</"
-"literal> method (the inbuilt) setting is: <placeholder type=\"literallayout"
-"\" id=\"0\"/> Note also that list entries specified on the command line will "
-"be added at the end of the list specified in the configuration files, but "
-"before the default entries. To prefer a type in this case over the ones "
-"specified in the configuration files you can set the option direct - not in "
-"list style.  This will not override the defined list; it will only prefix "
-"the list with this type."
+"literal> will be checked at run time. If this option has been set and "
+"support for this format isn't directly built into apt, the method will only "
+"be used if this file exists; e.g. for the <literal>bzip2</literal> method "
+"(the inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> "
+"Note also that list entries specified on the command line will be added at "
+"the end of the list specified in the configuration files, but before the "
+"default entries. To prefer a type in this case over the ones specified in "
+"the configuration files you can set the option direct - not in list style.  "
+"This will not override the defined list; it will only prefix the list with "
+"this type."

 msgstr ""
 "実行時に <literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> "
 "をチェックすることに注意してください。このオプションが設定されていると、ファ"
 msgstr ""
 "実行時に <literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> "
 "をチェックすることに注意してください。このオプションが設定されていると、ファ"


@@ -4059,7 +4806,7 @@ msgstr ""
 "のみ定義されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "のみ定義されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:534
+#: apt.conf.5.xml

 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "


@@ -4070,7 +4817,7 @@ msgstr ""
 "んどローカルミラーでのみ有効になることに注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "んどローカルミラーでのみ有効になることに注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:541
+#: apt.conf.5.xml

 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "


@@ -4083,7 +4830,7 @@ msgstr ""
 "する際に、CPU の能力を余計に消費します。デフォルトでは false です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "する際に、CPU の能力を余計に消費します。デフォルトでは false です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:549
+#: apt.conf.5.xml

 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"


@@ -4101,13 +4848,13 @@ msgstr ""
 "意してください。長い言語コードは特に見かけません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
 "意してください。長い言語コードは特に見かけません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>

-#: apt.conf.5.xml:566
+#: apt.conf.5.xml

 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:554
+#: apt.conf.5.xml

 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "


@@ -4144,7 +4891,7 @@ msgstr ""
 "ことに注意してください。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ことに注意してください。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:567
+#: apt.conf.5.xml

 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "


@@ -4157,22 +4904,187 @@ msgstr ""
 "後) に追加します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "後) に追加します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:576
+#: apt.conf.5.xml

 msgid "When downloading, force to use only the IPv4 protocol."
 msgid "When downloading, force to use only the IPv4 protocol."

-msgstr ""
+msgstr "ダウンロード時に IPv4 プロトコルだけを使うように強制します。"

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

-#: apt.conf.5.xml:582
+#: apt.conf.5.xml

 msgid "When downloading, force to use only the IPv6 protocol."
 msgid "When downloading, force to use only the IPv6 protocol."

+msgstr "ダウンロード時に IPv6 プロトコルだけを使うように強制します。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"The maximum file size of Release/Release.gpg/InRelease files.  The default "
+"is 10MB."
+msgstr ""
+"Release/Release.gpg/InRelease ファイルの最大ファイルサイズです。デフォルトは "
+"10MB です。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"This option controls if apt will use the DNS SRV server record as specified "
+"in RFC 2782 to select an alternative server to connect to.  The default is "
+"\"true\"."
+msgstr ""
+"apt が 接続するための代替サーバを選択するために RFC 2782 で指定された DRS "
+"SRV サーバレコードを使う場合は、このオプションを制御します。デフォルトは "
+"\"true\" です。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Allow update operations to load data files from repositories without "
+"sufficient security information.  The default value is \"<literal>false</"
+"literal>\".  Concept, implications as well as alternatives are detailed in "
+"&apt-secure;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Allow update operations to load data files from repositories which provide "
+"security information, but these are deemed no longer cryptographically "
+"strong enough.  The default value is \"<literal>false</literal>\".  Concept, "
+"implications as well as alternatives are detailed in &apt-secure;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Allow that a repository that was previously gpg signed to become unsigned "
+#| "durign a update operation. When there is no valid signature of a "
+#| "previously trusted repository apt will refuse the update. This option can "
+#| "be used to override this protection. You almost certainly never want to "
+#| "enable this. The default is false.  Note that apt will still consider "
+#| "packages from this source untrusted and warn about them if you try to "
+#| "install them."
+msgid ""
+"Allow that a repository that was previously gpg signed to become unsigned "
+"during an update operation. When there is no valid signature for a "
+"previously trusted repository apt will refuse the update. This option can be "
+"used to override this protection. You almost certainly never want to enable "
+"this. The default is <literal>false</literal>.  Concept, implications as "
+"well as alternatives are detailed in &apt-secure;."
+msgstr ""
+"以前に GPG 署名されたリポジトリが、更新操作中に署名なしにすることを許可しま"
+"す。以前に信頼されたリポジトリの有効な署名が存在しない場合、更新を拒否しま"
+"す。このオプションは、この保護を無効にするために使用することができます。ほぼ"
+"確実に、これを有効にすることはありません。デフォルトは無効です。apt は、まだ"
+"信頼されていないこの取得元からのパッケージを考慮するので、それをインストール"
+"しようとすると警告が表示されますので注意してください。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml
+msgid "scope"
+msgstr "スコープ"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Acquiring changelogs can only be done if an URI is known from where to get "
+"them.  Preferable the Release file indicates this in a 'Changelogs' field. "
+"If this isn't available the Label/Origin field of the Release file is used "
+"to check if a <literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Origin::"
+"<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
+"value is taken. The value in the Release file can be overridden with "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
+"normal URI to a text file, except that package specific data is replaced "
+"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: "
+"1. if the package is from a component (e.g. <literal>main</literal>)  this "
+"is the first part otherwise it is omitted, 2. the first letter of source "
+"package name, except if the source package name starts with '<literal>lib</"
+"literal>' in which case it will be the first four letters. 3. The complete "
+"source package name. 4. the complete name again and 5. the source version.  "
+"The first (if present), second, third and fourth part are separated by a "
+"slash ('<literal>/</literal>')  and between the fourth and fifth part is an "
+"underscore ('<literal>_</literal>').  The special value '<literal>no</"
+"literal>' is available for this option indicating that this source can't be "
+"used to acquire changelog files from. Another source will be tried if "
+"available in this case."
+msgstr ""
+"URI は、それらを取得する場所から知られている場合は、変更履歴の取得のみ行うこ"
+"とができます。好ましいリリースファイルは、「変更履歴」フィールドでこのことを"
+"示します。これが利用できない場合、<literal>Acquire::Changelogs::URI::Label::"
+"<replaceable>LABEL</replaceable></literal> または <literal>Acquire::"
+"Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> オプショ"
+"ンが存在し、そしてこの値が取られてる場合は、リリースファイルの Label/Origin "
+"フィールドが確認するために使用されます。リリースファイル内の値は、"
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> または <literal>Acquire::Changelogs::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal> で上書きできます。その"
+"パッケージ固有のデータが <literal>@CHANGEPATH@</literal> プレースホルダに置き"
+"換えられている場合以外は、値はテキストファイルへの正常な URI にする必要があり"
+"ます。値は次の通りです: 1. パッケージがコンポーネント (例えば、"
+"<literal>main</literal>) からのものである場合、それ以外の場合は省略されている"
+"最初の部分です、2. ソースパッケージ名の最初の文字。ただし、ソースパッケージ名"
+"が '<literal>lib</literal>' で始まる場合を除きます (その場合は 最初の 4 文字"
+"になります)。3. 完全なソースパッケージ名。4. 再び完全な名前および 5. ソースの"
+"バージョン。(存在する場合は) 最初、第二、第三、第四の部分はスラッシュ "
+"('<literal>/</literal>') で区切られ、第四と第五の部分の間はアンダースコア "
+"('<literal>_</literal>') です。このソースから変更履歴を取得することができない"
+"ことを示す特別な値 '<literal>no</literal>' がこのオプションで利用可能です。こ"
+"の場合、可能であれば別のソースが試行されます。"
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml
+msgid "Binary specific configuration"
+msgstr "バイナリユーザ設定"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Especially with the introduction of the <command>apt</command> binary it can "
+"be useful to set certain options only for a specific binary as even options "
+"which look like they would effect only a certain binary like <option>APT::"
+"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
+"<command>apt</command>."
+msgstr ""
+"特に、<command>apt</command> のバイナリの導入では、<option>APT::Get::Show-"
+"Versions</option> が <command>apt</command> と同様に <command>apt-get</"
+"command> に効果を与えるように、特定のバイナリのみに影響を与えるように見えるオ"
+"プションであっても、特定のバイナリのために特定のオプションを設定することは有"
+"用であり得ます。"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Setting an option for a specific binary only can be achieved by setting the "
+"option inside the <option>Binary::<replaceable>specific-binary</"
+"replaceable></option> scope. Setting the option <option>APT::Get::Show-"
+"Versions</option> for the <command>apt</command> only can e.g. by done by "
+"setting <option>Binary::apt::APT::Get::Show-Versions</option> instead."
+msgstr ""
+"特定のバイナリ用のオプション設定は、<option>Binary::<replaceable>specific-"
+"binary</replaceable></option> スコープ内でオプションを設定して達成することが"
+"できます。 <command>apt</command> 用の<option>APT::Get::Show-Versions</"
+"option> オプションの設定は、例えば、<option>Binary::apt::APT::Get::Show-"
+"Versions</option> 設定の代わりに実行されることができます。"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Note that as seen in the DESCRIPTION section further above you can't set "
+"binary-specific options on the commandline itself nor in configuration files "
+"loaded via the commandline."

 msgstr ""
 msgstr ""

+"さらに上記の説明の節に見られるように、コマンドライン上のオプション自体または"
+"コマンドラインからロードされた設定ファイル中でバイナリ固有のオプションを設定"
+"することはできません。"

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

-#: apt.conf.5.xml:589
+#: apt.conf.5.xml

 msgid "Directories"
 msgstr "ディレクトリ"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Directories"
 msgstr "ディレクトリ"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:591
+#: apt.conf.5.xml

 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "


@@ -4191,28 +5103,31 @@ msgstr ""
 "サブアイテムすべてに、前に付加するデフォルトディレクトリを含んでいます。"
 
 #. type: Content of: <refentry><refsect1><para>
 "サブアイテムすべてに、前に付加するデフォルトディレクトリを含んでいます。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:598
+#: apt.conf.5.xml

 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "

-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "

 "down startup but save disk space. It is probably preferable to turn off the "
 "down startup but save disk space. It is probably preferable to turn off the "

-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"

 msgstr ""
 "<literal>Dir::Cache</literal> は、ローカルキャッシュ情報に関する場所を格納し"
 "ています。これは、ダウンロード済アーカイブの場所を示す <literal>Dir::Cache::"
 "archives</literal> と同様に、<literal>srcpkgcache</literal> と "
 msgstr ""
 "<literal>Dir::Cache</literal> は、ローカルキャッシュ情報に関する場所を格納し"
 "ています。これは、ダウンロード済アーカイブの場所を示す <literal>Dir::Cache::"
 "archives</literal> と同様に、<literal>srcpkgcache</literal> と "

-"<literal>pkgcache</literal> のパッケージキャッシュの場所になります。それぞれ"
-"に空文字をセットすることで、キャッシュの生成を無効にできます。これにより起動"
-"時に遅くなりますが、ディスク容量を節約できます。おそらく、srcpkgcache よりも "
-"pkgcache を無効にすることが多いと思います。<literal>Dir::State</literal> と同"
-"様、<literal>Dir::Cache</literal> はデフォルトディレクトリを含んでいます。"
+"<literal>pkgcache</literal> のパッケージキャッシュの場所になります。"
+"<literal>pkgcache</literal> や <literal>srcpkgcache</literal> に <literal>"
+"\"\"</literal> をセットすることで、キャッシュの生成を無効にできます。これによ"
+"り起動時に遅くなりますが、ディスク容量を節約できます。おそらく、srcpkgcache "
+"よりも pkgcache を無効にすることが多いと思います。<literal>Dir::State</"
+"literal> と同様、<literal>Dir::Cache</literal> はデフォルトディレクトリを含ん"
+"でいます。"

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

-#: apt.conf.5.xml:607
+#: apt.conf.5.xml

 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "


@@ -4226,7 +5141,7 @@ msgstr ""
 "ファイルを指定された場合のみ、この設定の効果があります)"
 
 #. type: Content of: <refentry><refsect1><para>
 "ファイルを指定された場合のみ、この設定の効果があります)"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:613
+#: apt.conf.5.xml

 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "


@@ -4237,7 +5152,7 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><para>
 "します。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:617
+#: apt.conf.5.xml

 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "


@@ -4254,27 +5169,28 @@ msgstr ""
 "プログラムの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><para>
 "プログラムの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:625
+#: apt.conf.5.xml

 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "

-"set, all paths in <literal>Dir::</literal> will be relative to "
-"<literal>RootDir</literal>, <emphasis>even paths that are specified "
-"absolutely</emphasis>.  So, for instance, if <literal>RootDir</literal> is "
-"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</"
-"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the "
-"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</"
-"filename>."
+"set, all paths will be relative to <literal>RootDir</literal>, "
+"<emphasis>even paths that are specified absolutely</emphasis>.  So, for "
+"instance, if <literal>RootDir</literal> is set to <filename>/tmp/staging</"
+"filename> and <literal>Dir::State::status</literal> is set to <filename>/var/"
+"lib/dpkg/status</filename>, then the status file will be looked up in "
+"<filename>/tmp/staging/var/lib/dpkg/status</filename>.  If you want to "
+"prefix only relative paths, set <literal>Dir</literal> instead."

 msgstr ""
 "設定項目 <literal>RootDir</literal> は特別な意味を持ちます。設定されている"
 msgstr ""
 "設定項目 <literal>RootDir</literal> は特別な意味を持ちます。設定されている"

-"と、<literal>Dir::</literal> のすべてのパスは、<emphasis>絶対パスとして指定し"
-"ても</emphasis><literal>RootDir</literal> からの相対パスとなります。そのため"
-"例えば、<literal>RootDir</literal> が <filename>/tmp/staging</filename> に"
-"セットされており、<literal>Dir::State::status</literal> が <filename>/var/"
-"lib/dpkg/status</filename> にセットされている場合、status ファイルを "
-"<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。"
+"と、すべてのパスは <emphasis>絶対パスとして指定しても</"
+"emphasis><literal>RootDir</literal> からの相対パスとなります。そのため例え"
+"ば、<literal>RootDir</literal> が <filename>/tmp/staging</filename> にセット"
+"されており、<literal>Dir::State::status</literal> が <filename>/var/lib/dpkg/"
+"status</filename> にセットされている場合、status ファイルを <filename>/tmp/"
+"staging/var/lib/dpkg/status</filename> から探します。相対バスのみをプレフィッ"
+"クスにしたい場合は、代わりに <literal>Dir</literal> を設定します。"

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

-#: apt.conf.5.xml:638
+#: apt.conf.5.xml

 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "


@@ -4290,12 +5206,12 @@ msgstr ""
 "フォルト値を見ればわかる通り、このパターンには正規表現を使用できます。"
 
 #. type: Content of: <refentry><refsect1><title>
 "フォルト値を見ればわかる通り、このパターンには正規表現を使用できます。"
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:647
+#: apt.conf.5.xml

 msgid "APT in DSelect"
 msgstr "DSelect での APT"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "APT in DSelect"
 msgstr "DSelect での APT"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:649
+#: apt.conf.5.xml

 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "


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

-#: apt.conf.5.xml:654
+#: apt.conf.5.xml

 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"


@@ -4327,7 +5243,7 @@ msgstr ""
 "パッケージをダウンロードする直前に行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "パッケージをダウンロードする直前に行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:668
+#: apt.conf.5.xml

 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."


@@ -4336,7 +5252,7 @@ msgstr ""
 "されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:673
+#: apt.conf.5.xml

 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."


@@ -4345,7 +5261,7 @@ msgstr ""
 "されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:678
+#: apt.conf.5.xml

 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."


@@ -4354,12 +5270,12 @@ msgstr ""
 "します。デフォルトはエラーが発生した場合のみです。"
 
 #. type: Content of: <refentry><refsect1><title>
 "します。デフォルトはエラーが発生した場合のみです。"
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:684
+#: apt.conf.5.xml

 msgid "How APT calls &dpkg;"
 msgstr "APT が &dpkg; を呼ぶ方法"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "How APT calls &dpkg;"
 msgstr "APT が &dpkg; を呼ぶ方法"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:685
+#: apt.conf.5.xml

 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."


@@ -4368,7 +5284,7 @@ msgstr ""
 "<literal>DPkg</literal> セクションにあります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>DPkg</literal> セクションにあります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:690
+#: apt.conf.5.xml

 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "


@@ -4378,7 +5294,7 @@ msgstr ""
 "なければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "なければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:696
+#: apt.conf.5.xml

 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "


@@ -4390,14 +5306,7 @@ msgstr ""
 "bin/sh</filename> を通して呼び出され、何か問題があれば APT が異常終了します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "bin/sh</filename> を通して呼び出され、何か問題があれば APT が異常終了します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:703
-#, fuzzy
-#| 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 "
-#| "commands are invoked in order using <filename>/bin/sh</filename>; should "
-#| "any fail APT will abort. APT will pass the filenames of all .deb files it "
-#| "is going to install to the commands, one per line on standard input."
+#: apt.conf.5.xml

 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "


@@ -4409,32 +5318,80 @@ msgstr ""
 "&dpkg; を呼び出す前に実行するシェルコマンドのリストです。<literal>options</"
 "literal> のようにリスト記法で指定しなければなりません。コマンドは <filename>/"
 "bin/sh</filename> を通して呼び出され、何か問題があれば、APT は異常終了しま"
 "&dpkg; を呼び出す前に実行するシェルコマンドのリストです。<literal>options</"
 "literal> のようにリスト記法で指定しなければなりません。コマンドは <filename>/"
 "bin/sh</filename> を通して呼び出され、何か問題があれば、APT は異常終了しま"

-"す。APT はインストールしようとする全 .deb ファイルのファイル名を、1 行ずつコ"
-"マンドの標準入力に送ります。"
+"す。APT はインストールしようとする全 .deb ファイルのファイル名を、要求した"
+"ファイルディスクリプタについて1 行ずつ、デフォルトではコマンドの標準入力に送"
+"ります。"

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

-#: apt.conf.5.xml:710
-#, fuzzy
-#| msgid ""
-#| "Version 2 of this protocol dumps more information, including the protocol "
-#| "version, the APT configuration space and the packages, files and versions "
-#| "being changed. Version 2 is enabled by setting <literal>DPkg::Tools::"
-#| "options::cmd::Version</literal> to 2. <literal>cmd</literal> is a command "
-#| "given to <literal>Pre-Install-Pkgs</literal>."
+#: apt.conf.5.xml
+msgid ""
+"Version 2 of this protocol sends more information through the requested file "
+"descriptor: a line with the text <literal>VERSION 2</literal>, the APT "
+"configuration space, and a list of package actions with filename and version "
+"information."
+msgstr ""
+"このプロトコルのバージョン 2 は、要求されたファイルディスクリプタを介してより"
+"多くの情報を送信します: テキスト <literal>VERSION 2</literal> の行、APT 設定"
+"空間、ファイル名とバージョン情報を持つパッケージ処理のリスト。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Each configuration directive line has the form <literal>key=value</"
+"literal>.  Special characters (equal signs, newlines, nonprintable "
+"characters, quotation marks, and percent signs in <literal>key</literal> and "
+"newlines, nonprintable characters, and percent signs in <literal>value</"
+"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
+"=value</literal> lines with the same key. The configuration section ends "
+"with a blank line."
+msgstr ""
+"各設定ディレクティブ行は、<literal>key=value</literal> 形式です。特殊文字 "
+"(<literal>key</literal> 中のイコール記号、改行、非印字可能文字、引用符、およ"
+"びパーセント記号、および <literal>value</literal> 中の改行、非印字可能文字、"
+"およびパーセント記号) は、% エンコードされます。リストは、同じキーを持つ複数"
+"の<literal>key::=value</literal> 行で表されます。設定セクションは、空白行で終"
+"わります。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Package action lines consist of five fields in Version 2: package name "
+"(without architecture qualification even if foreign), old version, direction "
+"of version change (&lt; for upgrades, &gt; for downgrades, = for no change), "
+"new version, action. The version fields are \"-\" for no version at all (for "
+"example when installing a package for the first time; no version is treated "
+"as earlier than any real version, so that is an upgrade, indicated as "
+"<literal>- &lt; 1.23.4</literal>). The action field is \"**CONFIGURE**\" if "
+"the package is being configured, \"**REMOVE**\" if it is being removed, or "
+"the filename of a .deb file if it is being unpacked."
+msgstr ""
+"バージョン 2 ではパッケージアクション行は 5 つのフィールドで構成されていま"
+"す: パッケージ名 (例え外国だとしてもアーキテクチャ資格なしで)、旧バージョン、"
+"バージョン変更の方向 (&lt; アップグレード、&gt; ダウングレード、= 変化なし)、"
+"新バージョン、処理。バージョンなしの場合は、バージョンフィールドはすべて \"-"
+"\" です (例えば、初めてパッケージをインストール時、バージョンなしは、任意の実"
+"際のバージョンよりも前として扱われます。そのため、<literal>- &lt; 1.23.4</"
+"literal>はアップグレードとなります)。パッケージが設定されている場合のアクショ"
+"ンフィールドは \"**CONFIGURE**\" で、削除されている場合は \"**REMOVE**\" 、解"
+"凍されている場合は .deb ファイルのファイル名です。"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml

 msgid ""
 msgid ""

-"Version 2 of this protocol dumps more information, including the protocol "
-"version, the APT configuration space and the packages, files and versions "
-"being changed. Version 3 adds the architecture and <literal>MultiArch</"
-"literal> flag to each version being dumped."
+"In Version 3 after each version field follows the architecture of this "
+"version, which is \"-\" if there is no version, and a field showing the "
+"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that "
+"\"none\" is an incorrect typename which is just kept to remain compatible, "
+"it should be read as \"no\" and users are encouraged to support both."

 msgstr ""
 msgstr ""

-"ã\81\93ã\81®ã\83\97ã\83­ã\83\88ã\82³ã\83«ã\81®ã\83\90ã\83¼ã\82¸ã\83§ã\83³ 2 ã\81§ã\81¯ã\80\81(ã\83\97ã\83­ã\83\88ã\82³ã\83«ã\81®ã\83\90ã\83¼ã\82¸ã\83§ã\83³ã\82\84 APT 設å®\9aã\82¹ã\83\9aã\83¼"
-"ã\82¹ã\80\81ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\82\92å\90«ã\82\80) 詳細æ\83\85å ±ã\82\84ã\83\95ã\82¡ã\82¤ã\83«ã\80\81å¤\89æ\9b´ã\81\95ã\82\8cã\81¦ã\81\84ã\82\8bã\83\90ã\83¼ã\82¸ã\83§ã\83³ã\82\92å\87ºå\8a\9bã\81\97ã\81¾"
-"す。<literal>DPkg::Tools::options::cmd::Version</literal> に 2 を設定すると、"
-"ã\83\90ã\83¼ã\82¸ã\83§ã\83³ 2 ã\82\92æ\9c\89å\8a¹ã\81«ã\81§ã\81\8dã\81¾ã\81\99ã\80\82<literal>cmd</literal> ã\81¯ <literal>Pre-"
-"Install-Pkgs</literal> で与えられるコマンドです。"
+"ã\83\90ã\83¼ã\82¸ã\83§ã\83³ 3 ã\81§ã\81¯ã\80\81å\90\84ã\83\90ã\83¼ã\82¸ã\83§ã\83³ã\83\95ã\82£ã\83¼ã\83«ã\83\89ã\81®å¾\8cã\81«ã\80\81ã\81\93ã\81®ã\83\90ã\83¼ã\82¸ã\83§ã\83³ã\81®ã\82¢ã\83¼ã\82­ã\83\86ã\82¯"
+"ã\83\81ã\83£ã\81\8cç¶\9aã\81\8dã\81¾ã\81\99ã\80\82ã\83\90ã\83¼ã\82¸ã\83§ã\83³ã\81ªã\81\97ã\81®å ´å\90\88ã\81¯ \"-\" ã\80\81ã\81\9dã\81\97ã\81¦ MultiArch å\9e\8b \"same"
+"\"、\"foreign\"、\"allowed\" または \"none\" を示すフィールド。\"none\" は単"
+"ã\81«äº\92æ\8f\9bæ\80§ã\82\92維æ\8c\81ã\81\99ã\82\8bã\81\9fã\82\81ã\81«æ®\8bã\81\95ã\82\8cã\81\9fã\80\81誤ã\81£ã\81\9få\9e\8bå\90\8dã\81§ã\81\82ã\82\8bã\81\93ã\81¨ã\81«æ³¨æ\84\8fã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84ã\80\82ã\81\9d"
+"れは\"no\" と読まれるべきで、ユーザは両方をサポートすることをお勧めします。"

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

-#: apt.conf.5.xml:715
+#: apt.conf.5.xml

 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "


@@ -4443,9 +5400,14 @@ msgid ""
 "the requested version it will send the information in the highest version it "
 "has support for instead."
 msgstr ""
 "the requested version it will send the information in the highest version it "
 "has support for instead."
 msgstr ""

+"コマンド <literal><replaceable>cmd</replaceable></literal> で利用するプロトコ"
+"ルのバージョンは <literal>DPkg::Tools::options::<replaceable>cmd</"
+"replaceable>::Version</literal> の設定により選択でき、デフォルトはバージョン "
+"1 となっています。リクエストしたバージョンを APT がサポートしていない場合はサ"
+"ポートしている最大のバージョンの情報を代わりに送ります。"

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

-#: apt.conf.5.xml:722
+#: apt.conf.5.xml

 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"


@@ -4454,9 +5416,15 @@ msgid ""
 "looking for the environment variable <envar>APT_HOOK_INFO_FD</envar> which "
 "contains the number of the used file descriptor as a confirmation."
 msgstr ""
 "looking for the environment variable <envar>APT_HOOK_INFO_FD</envar> which "
 "contains the number of the used file descriptor as a confirmation."
 msgstr ""

+"情報の送信に利用するファイルディスクリプタは <literal>DPkg::Tools::options::"
+"<replaceable>cmd</replaceable>::InfoFD</literal> によりリクエストでき、デフォ"
+"ルトは <literal>0</literal> で標準入力を指定します。バージョン 0.9.11 から利"
+"用可能となりました。環境変数 <envar>APT_HOOK_INFO_FD</envar> を見ることでこの"
+"オプションに対応していることを検出でき、それには確認として利用しているファイ"
+"ルディスクリプタの番号が収録されています。"

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

-#: apt.conf.5.xml:732
+#: apt.conf.5.xml

 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."


@@ -4465,7 +5433,7 @@ msgstr ""
 "<filename>/</filename> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<filename>/</filename> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:737
+#: apt.conf.5.xml

 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."


@@ -4473,128 +5441,22 @@ msgstr ""
 "これらのオプションは、パッケージのコンパイル時に &dpkg-buildpackage; に渡され"
 "ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
 
 "これらのオプションは、パッケージのコンパイル時に &dpkg-buildpackage; に渡され"
 "ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
 

-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:742
-msgid "dpkg trigger usage (and related options)"
-msgstr "dpkg トリガの使い方 (および関連オプション)"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:743
-msgid ""
-"APT can call &dpkg; in such a way as to let it make aggressive use of "
-"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
-"use triggers once each time it runs.  Activating these options can therefore "
-"decrease the time needed to perform the install or upgrade. Note that it is "
-"intended to activate these options per default in the future, but as it "
-"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
-"<emphasis>These options are therefore currently experimental and should not "
-"be used in production environments.</emphasis> It also breaks progress "
-"reporting such that all front-ends will currently stay around half (or more) "
-"of the time in the 100% state while it actually configures all packages."
-msgstr ""
-"APT は、複数の &dpkg; 呼び出しトリガを、積極的に行わせる方法で &dpkg; を呼び"
-"出せます。オプションがなければ、実行のたびに &dpkg; は一度トリガを引くだけで"
-"す。そのため、このオプションを有効にすると、インストールやアップグレードにか"
-"かる時間を、短くできます。将来、このオプションを、デフォルトで有効にする方向"
-"であることに注意してください。しかし、APT が &dpkg; を呼ぶ方法といった大幅な"
-"変更を行うには、もっとたくさんのテストが必要です。<emphasis>したがって、この"
-"オプションは現在実験中で、本番環境では使用するべきではありません。</emphasis>"
-"さらに、すべてのフロントエンドが、実際には全パッケージを設定中なのに、半分 "
-"(もしくはそれ以上) の時間 100% のままとなり、進捗レポートを壊してしまいます。"
-
-#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:758
-#, no-wrap
-msgid ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-msgstr ""
-"DPkg::NoTriggers \"true\";\n"
-"PackageManager::Configure \"smart\";\n"
-"DPkg::ConfigurePending \"true\";\n"
-"DPkg::TriggersPending \"true\";"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
-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 "
-"understand the current risks and problems with these options, but are brave "
-"enough to help testing them, create a new configuration file and test a "
-"combination of options. Please report any bugs, problems and improvements "
-"you encounter and make sure to note which options you have used in your "
-"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
-"see e.g. <command>dpkg --audit</command>. A defensive option combination "
-"would be <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"APT がこのオプションをサポートすることや、将来このオプションが (大きな) トラ"
-"ブルの原因にならないことは、保証されないことに注意してください。このオプショ"
-"ンの現在のリスクと問題を理解し、テストを手伝う十分な勇気があるなら、新しい設"
-"定ファイルを作成し、オプションの組み合わせのテストをお願いしたいです。遭遇し"
-"たどんなバグ、問題、改善点を、どのようなオプションを使用したかと添えて報告し"
-"てください。デバッグに役立つ可能性のある情報を &dpkg; に問い合わせることを提"
-"案します (例: <command>dpkg --audit</command> を参照)。防御的なオプションの組"
-"み合わせは、以下のようになります。<placeholder type=\"literallayout\" id="
-"\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:765
-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 "
-"short: &dpkg; will not run the triggers when this flag is present unless it "
-"is explicitly called to do so in an extra call.  Note that this option "
-"exists (undocumented) also in older APT versions with a slightly different "
-"meaning: Previously these option only append --no-triggers to the configure "
-"calls to &dpkg; - now APT will also add this flag to the unpack and remove "
-"calls."
-msgstr ""
-"&dpkg; を呼び出すすべてのフラグ (ConfigurePending 呼び出し以外) を付与しませ"
-"ん。実際にこれが何を意味するのか興味があるなら、&dpkg; を参照してください。要"
-"するに、追加呼び出しで明示的に呼び出されない限り、このフラグがあると、&dpkg; "
-"はトリガを実行しません。また、古いバージョンの APT に、意味がわずかに異なる、"
-"このオプションが存在することに注意してください (ドキュメントなし)。以前のこの"
-"オプションは、&dpkg; の呼び出し設定に、--no-triggers を追加するだけでした。現"
-"在 APT は、このフラグを、展開呼び出しや削除呼び出しにも追加します。"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
-msgid ""
-"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
-"\", which causes APT to configure all packages. The \"<literal>smart</"
-"literal>\" way is to configure only packages which need to be configured "
-"before another package can be unpacked (Pre-Depends), and let the rest be "
-"configured by &dpkg; with a call generated by the ConfigurePending option "
-"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
-"anything, and totally relies on &dpkg; for configuration (which at the "
-"moment will fail if a Pre-Depends is encountered). Setting this option to "
-"any value other than <literal>all</literal> will implicitly also activate "
-"the next option by default, as otherwise the system could end in an "
-"unconfigured and potentially unbootable state."
-msgstr ""
-"有効な値は \"<literal>all</literal>\", \"<literal>smart</literal>\", "
-"\"<literal>no</literal>\" です。デフォルト値は \"<literal>all</literal>\" "
-"で、APT にすべてのパッケージを設定させます。\"<literal>smart</literal>\" で"
-"は、他のパッケージを展開する前に、設定が終わっていなければならないパッケージ "
-"(事前依存) のみを設定し、残りを ConfigurePending オプション (後述) で生成し"
-"た &dpkg; 呼び出しで設定します。他方では、\"<literal>no</literal>\" は何も設"
-"定しません。設定については &dpkg; にすべて依存します (事前依存があると失敗し"
-"ます)。このオプションを <literal>all</literal> 以外の値に設定すると、次のオプ"
-"ションを暗黙的に有効にします。そうしないと、設定が完了せず、起動しなくなる可"
-"能性があるからです。"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:788
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "If this option is set APT will call <command>dpkg --configure --pending</"
+#| "command> to let &dpkg; handle all required configurations and triggers. "
+#| "This option is activated automatically per default if the previous option "
+#| "is not set to <literal>all</literal>, but deactivating it could be useful "
+#| "if you want to run APT multiple times in a row - e.g. in an installer. In "
+#| "these sceneries you could deactivate this option in all but the last run."

 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "

-"option is activated automatically per default if the previous option is not "
-"set to <literal>all</literal>, but deactivating it could be useful if you "
-"want to run APT multiple times in a row - e.g. in an installer. In these "
-"sceneries you could deactivate this option in all but the last run."
+"option is activated by default, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer.  In this "
+"scenario you could deactivate this option in all but the last run."

 msgstr ""
 "このオプションがセットされると、&dpkg; にすべての必要な設定とトリガを扱わせる"
 "ように、APT は <command>dpkg --configure --pending</command> を呼び出します。"
 msgstr ""
 "このオプションがセットされると、&dpkg; にすべての必要な設定とトリガを扱わせる"
 "ように、APT は <command>dpkg --configure --pending</command> を呼び出します。"


@@ -4603,87 +5465,31 @@ msgstr ""
 "合 (インストーラなど) には、無効にしたほうが便利かもしれません。このシナリオ"
 "では、最後以外のすべての実行で、無効にできます。"
 
 "合 (インストーラなど) には、無効にしたほうが便利かもしれません。このシナリオ"
 "では、最後以外のすべての実行で、無効にできます。"
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:795
-msgid ""
-"Useful for the <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal>, and "
-"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
-"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
-"process all triggers, not only the triggers needed to configure this package."
-msgstr ""
-"<literal>installed</literal> として認識されない保留トリガがあるパッケージを、"
-"<literal>smart</literal> 設定するのに便利です。&dpkg; は現在、先行依存関係に"
-"は無力な <literal>unpacked</literal> として扱います (debbugs #526774 参照)。"
-"このパッケージを設定するのに必要なトリガのみでなく、すべてのトリガを処理する"
-"ことに注意してください。"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:808
-#, no-wrap
-msgid ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-msgstr ""
-"OrderList::Score {\n"
-"\tDelete 500;\n"
-"\tEssential 200;\n"
-"\tImmediate 10;\n"
-"\tPreDepends 50;\n"
-"};"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
-msgid ""
-"Essential packages (and their dependencies) should be configured immediately "
-"after unpacking. It is a good idea to do this quite early in the upgrade "
-"process as these configure calls also currently require <literal>DPkg::"
-"TriggersPending</literal> which will run quite a few triggers (which may not "
-"be needed). Essentials get per default a high score but the immediate flag "
-"is relatively low (a package which has a Pre-Depends is rated higher).  "
-"These option and the others in the same group can be used to change the "
-"scoring. The following example shows the settings with their default "
-"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
-msgstr ""
-"不可欠パッケージ (と、その依存しているパッケージ) は展開を終えると、すぐに設"
-"定するべきです。アップグレードプロセスの初期に、設定してしまうのが良いのです"
-"が、現在 <literal>DPkg::TriggersPending</literal> を要求しているパッケージも"
-"同時に行うため、かなり多くのトリガ (すべてが必要とは限らない) を処理すること"
-"になります。不可欠パッケージは、デフォルトではスコアを高く設定されています"
-"が、即時フラグは相対的に低くなっています (先行依存パッケージのほうが高い)。こ"
-"のオプションと、これと同じグループに属するものは、このスコア付けを変更するの"
-"に使用します。以下の例では、デフォルト値を変更しています。<placeholder type="
-"\"literallayout\" id=\"0\"/>"
-

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

-#: apt.conf.5.xml:821
+#: apt.conf.5.xml

 msgid "Periodic and Archives options"
 msgstr "Periodic オプションと Archives オプション"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Periodic and Archives options"
 msgstr "Periodic オプションと Archives オプション"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:822
+#: apt.conf.5.xml

 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "

-"<literal>/etc/cron.daily/apt</literal> script. See the top of this script "
-"for the brief documentation of these options."
+"<literal>/usr/lib/apt/apt.systemd.daily</literal> script. See the top of "
+"this script for the brief documentation of these options."

 msgstr ""
 "オプションの <literal>APT::Periodic</literal> グループと <literal>APT::"
 msgstr ""
 "オプションの <literal>APT::Periodic</literal> グループと <literal>APT::"

-"Archives</literal> グループは、<literal>/etc/cron.daily/apt</literal> スクリ"
-"プトを使用して、apt の定期更新の挙動を設定します。このオプションのドキュメン"
-"トは、このスクリプトの先頭を参照してください。"
+"Archives</literal> グループは、<literal>/usr/lib/apt/apt.systemd.daily</"
+"literal> スクリプトを使用して、apt の定期更新の挙動を設定します。このオプショ"
+"ã\83³ã\81®ã\83\89ã\82­ã\83¥ã\83¡ã\83³ã\83\88ã\81¯ã\80\81ã\81\93ã\81®ã\82¹ã\82¯ã\83ªã\83\97ã\83\88ã\81®å\85\88é ­ã\82\92å\8f\82ç\85§ã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84ã\80\82"

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

-#: apt.conf.5.xml:830
+#: apt.conf.5.xml

 msgid "Debug options"
 msgstr "デバッグオプション"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Debug options"
 msgstr "デバッグオプション"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:832
+#: apt.conf.5.xml

 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "


@@ -4699,7 +5505,7 @@ msgstr ""
 "のオプションは興味がないでしょうが、以下のものは興味を引くかもしれません。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 "のオプションは興味がないでしょうが、以下のものは興味を引くかもしれません。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>

-#: apt.conf.5.xml:843
+#: apt.conf.5.xml

 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"


@@ -4710,7 +5516,7 @@ msgstr ""
 "にします。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 "にします。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>

-#: apt.conf.5.xml:851
+#: apt.conf.5.xml

 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"


@@ -4721,7 +5527,7 @@ msgstr ""
 "literal>) を行う場合に使用します。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 "literal>) を行う場合に使用します。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>

-#: apt.conf.5.xml:860
+#: apt.conf.5.xml

 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."


@@ -4733,7 +5539,7 @@ msgstr ""
 #.        motivating example, except I haven't a clue why you'd want
 #.        to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #.        motivating example, except I haven't a clue why you'd want
 #.        to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>

-#: apt.conf.5.xml:868
+#: apt.conf.5.xml

 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."


@@ -4742,34 +5548,34 @@ msgstr ""
 "ないようにします。"
 
 #. type: Content of: <refentry><refsect1><para>
 "ないようにします。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:878
+#: apt.conf.5.xml

 msgid "A full list of debugging options to apt follows."
 msgstr "以下は apt に対するデバッグオプションのすべてです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "A full list of debugging options to apt follows."
 msgstr "以下は apt に対するデバッグオプションのすべてです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:887
+#: apt.conf.5.xml

 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:898
+#: apt.conf.5.xml

 msgid "Print information related to downloading packages using FTP."
 msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Print information related to downloading packages using FTP."
 msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:909
+#: apt.conf.5.xml

 msgid "Print information related to downloading packages using HTTP."
 msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Print information related to downloading packages using HTTP."
 msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:920
+#: apt.conf.5.xml

 msgid "Print information related to downloading packages using HTTPS."
 msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:931
+#: apt.conf.5.xml

 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."


@@ -4777,7 +5583,7 @@ msgstr ""
 "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:942
+#: apt.conf.5.xml

 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."


@@ -4786,12 +5592,12 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:952
+#: apt.conf.5.xml

 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:962
+#: apt.conf.5.xml

 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."


@@ -4799,7 +5605,7 @@ msgstr ""
 "<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:972
+#: apt.conf.5.xml

 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "


@@ -4809,7 +5615,7 @@ msgstr ""
 "システムにある使用済・未使用ブロックの数からの情報を含めないようにします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "システムにある使用済・未使用ブロックの数からの情報を含めないようにします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:983
+#: apt.conf.5.xml

 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."


@@ -4818,13 +5624,13 @@ msgstr ""
 "<quote><literal>apt-get update</literal></quote> を実行できるようになります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<quote><literal>apt-get update</literal></quote> を実行できるようになります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:995
+#: apt.conf.5.xml

 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1005
+#: apt.conf.5.xml

 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."


@@ -4833,7 +5639,7 @@ msgstr ""
 "ジやエラーを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ジやエラーを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml

 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."


@@ -4842,7 +5648,7 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml

 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."


@@ -4851,14 +5657,14 @@ msgstr ""
 "リストへのパッチ適用に関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "リストへのパッチ適用に関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml

 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 "実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 "実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1049
+#: apt.conf.5.xml

 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."


@@ -4867,7 +5673,7 @@ msgstr ""
 "に出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "に出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1059
+#: apt.conf.5.xml

 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"


@@ -4882,7 +5688,7 @@ msgstr ""
 "路に対応しています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "路に対応しています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml

 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "


@@ -4911,7 +5717,7 @@ msgstr ""
 "ます。<literal>section</literal> はパッケージが現れるセクション名です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ます。<literal>section</literal> はパッケージが現れるセクション名です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1094
+#: apt.conf.5.xml

 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."


@@ -4920,7 +5726,7 @@ msgstr ""
 "切られます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "切られます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml

 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."


@@ -4929,7 +5735,7 @@ msgstr ""
 "を解析中に発生したエラーを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "を解析中に発生したエラーを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1116
+#: apt.conf.5.xml

 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."


@@ -4938,18 +5744,18 @@ msgstr ""
 "のトレースを生成します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "のトレースを生成します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml

 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1139
+#: apt.conf.5.xml

 msgid "Output the priority of each package list on startup."
 msgstr "起動時の各パッケージの優先度を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Output the priority of each package list on startup."
 msgstr "起動時の各パッケージの優先度を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1149
+#: apt.conf.5.xml

 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."


@@ -4958,7 +5764,7 @@ msgstr ""
 "した場合にのみ、適用されます)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "した場合にのみ、適用されます)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1160
+#: apt.conf.5.xml

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


@@ -4969,7 +5775,7 @@ msgstr ""
 "説明したものと同じです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "説明したものと同じです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1172
+#: apt.conf.5.xml

 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."


@@ -4977,14 +5783,24 @@ msgstr ""
 "<filename>/etc/apt/vendors.list</filename> から読み込んだ、ベンダの情報を出力"
 "します。"
 
 "<filename>/etc/apt/vendors.list</filename> から読み込んだ、ベンダの情報を出力"
 "します。"
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Display the external commands that are called by apt hooks.  This includes e."
+"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
+"<literal>APT::Update::{Pre,Post}-Invoke</literal>."
+msgstr ""
+"aptのフックにより呼び出される外部コマンドを表示します。これには例えば、設定オ"
+"プション <literal>DPkg::{Pre,Post}-Invoke</literal> や <literal>APT::Update::"
+"{Pre,Post}-Invoke</literal> があります。"
+

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

-#: apt.conf.5.xml:1194 apt_preferences.5.xml:547 sources.list.5.xml:234
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml

 msgid "Examples"
 msgstr "サンプル"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Examples"
 msgstr "サンプル"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:1195
+#: apt.conf.5.xml

 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."


@@ -4994,17 +5810,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:1207
+#: apt.conf.5.xml

 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml

 msgid "Preference control file for APT"
 msgstr "APT 用選択制御ファイル"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Preference control file for APT"
 msgstr "APT 用選択制御ファイル"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml

 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "


@@ -5016,7 +5832,7 @@ msgstr ""
 "ンストールするパッケージのバージョンを制御するのに使用します。"
 
 #. type: Content of: <refentry><refsect1><para>
 "ンストールするパッケージのバージョンを制御するのに使用します。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml

 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "


@@ -5037,7 +5853,7 @@ msgstr ""
 "のの選択を、ユーザが選択できるようになります。"
 
 #. type: Content of: <refentry><refsect1><para>
 "のの選択を、ユーザが選択できるようになります。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml

 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "


@@ -5052,7 +5868,7 @@ msgstr ""
 "し、インスタンスの選択には影響しません。"
 
 #. type: Content of: <refentry><refsect1><para>
 "し、インスタンスの選択には影響しません。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml

 msgid ""
 "Preferences are a strong power in the hands of a system administrator but "
 "they can become also their biggest nightmare if used without care! APT will "
 msgid ""
 "Preferences are a strong power in the hands of a system administrator but "
 "they can become also their biggest nightmare if used without care! APT will "


@@ -5075,7 +5891,7 @@ msgstr ""
 "ん)。以上、警告しました。"
 
 #. type: Content of: <refentry><refsect1><para>
 "ん)。以上、警告しました。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml

 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "


@@ -5095,24 +5911,24 @@ msgstr ""
 "する場合は黙って無視します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "する場合は黙って無視します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml

 msgid "APT's Default Priority Assignments"
 msgstr "APT のデフォルト優先度の割り当て"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgid "APT's Default Priority Assignments"
 msgstr "APT のデフォルト優先度の割り当て"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml

 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml

 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml

 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "


@@ -5138,7 +5954,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml

 msgid ""
 "If the target release has been specified then APT uses the following "
 "algorithm to set the priorities of the versions of a package.  Assign:"
 msgid ""
 "If the target release has been specified then APT uses the following "
 "algorithm to set the priorities of the versions of a package.  Assign:"


@@ -5147,12 +5963,12 @@ msgstr ""
 "バージョンの優先度を設定します。以下のように割り当てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "バージョンの優先度を設定します。以下のように割り当てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml

 msgid "priority 1"
 msgstr "優先度 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "priority 1"
 msgstr "優先度 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml

 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"


@@ -5165,12 +5981,12 @@ msgstr ""
 "アーカイブ由来のバージョン。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "アーカイブ由来のバージョン。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml

 msgid "priority 100"
 msgstr "優先度 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "priority 100"
 msgstr "優先度 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml

 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "


@@ -5183,30 +5999,36 @@ msgstr ""
 "\"ButAutomaticUpgrades: yes\" とマークされているアーカイブ由来のバージョン。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "\"ButAutomaticUpgrades: yes\" とマークされているアーカイブ由来のバージョン。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml

 msgid "priority 500"
 msgstr "優先度 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "priority 500"
 msgstr "優先度 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:124
-msgid ""
-"to the versions that are not installed and do not belong to the target "
-"release."
-msgstr "インストールされておらず、ターゲットリリースに含まれないバージョン。"
+#: apt_preferences.5.xml
+msgid "to the versions that do not belong to the target release."
+msgstr "ターゲットリリースに属していないバージョン。"

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

-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml

 msgid "priority 990"
 msgstr "優先度 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "priority 990"
 msgstr "優先度 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml
+msgid "to the versions that belong to the target release."
+msgstr "ターゲットリリースに属するバージョン。"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml

 msgid ""
 msgid ""

-"to the versions that are not installed and belong to the target release."
-msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。"
+"The highest of those priorities whose description matches the version is "
+"assigned to the version."
+msgstr ""
+"説明がバージョンとマッチし、優先順位が最も高いものがバージョンに割り当てられ"
+"ます。"

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

-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml

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


@@ -5224,7 +6046,7 @@ msgstr ""
 "てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml

 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."


@@ -5233,7 +6055,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:144
+#: apt_preferences.5.xml

 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "


@@ -5248,12 +6070,12 @@ 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:150
+#: apt_preferences.5.xml

 msgid "Install the highest priority version."
 msgstr "最も高い優先度のバージョンをインストールします。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 msgid "Install the highest priority version."
 msgstr "最も高い優先度のバージョンをインストールします。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml

 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."


@@ -5262,7 +6084,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:154
+#: apt_preferences.5.xml

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


@@ -5273,7 +6095,7 @@ msgstr ""
 "トールされていないものをインストールします。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "トールされていないものをインストールします。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml

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


@@ -5288,7 +6110,7 @@ msgstr ""
 "get upgrade</command> を実行するとパッケージが更新されます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "get upgrade</command> を実行するとパッケージが更新されます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml

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


@@ -5301,7 +6123,7 @@ msgstr ""
 "get upgrade</command> を実行しても、ダウングレードしません。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "get upgrade</command> を実行しても、ダウングレードしません。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml

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


@@ -5320,12 +6142,12 @@ msgstr ""
 "ケージがあるからです。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "ケージがあるからです。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml

 msgid "The Effect of APT Preferences"
 msgstr "APT プリファレンスファイルの効果"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "The Effect of APT Preferences"
 msgstr "APT プリファレンスファイルの効果"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml

 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "


@@ -5337,7 +6159,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:189
+#: apt_preferences.5.xml

 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "


@@ -5347,13 +6169,13 @@ msgid ""
 "spaces."
 msgstr ""
 "特定形式は、優先度 (\"Pin-Priority\") を、指定したバージョンやバージョン範囲"
 "spaces."
 msgstr ""
 "特定形式は、優先度 (\"Pin-Priority\") を、指定したバージョンやバージョン範囲"

-"の、指定したパッケージについて割り当てます。例えば以下のレコード"
-"ã\81¯ã\80\81\"<literal>&good-perl;</literal>\" ã\81§å§\8bã\81¾ã\82\8b <filename>perl</filename> "
-"パッケージを、高い優先度に設定します。空白で区切り、複数のパッケージを指定で"
-"きます。"
+"の、指定したパッケージについて割り当てます。例えば以下のレコードは、バージョ"
+"ã\83³ç\95ªå\8f·ã\81\8c \"<literal>&good-perl;</literal>\" ã\81§å§\8bã\81¾ã\82\8b <filename>perl</"
+"filename> パッケージを、高い優先度に設定します。空白で区切り、複数のパッケー"
+"ã\82¸ã\82\92æ\8c\87å®\9aã\81§ã\81\8dã\81¾ã\81\99ã\80\82"

 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>

-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml

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


@@ -5365,7 +6187,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml

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


@@ -5379,7 +6201,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:208
+#: apt_preferences.5.xml

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


@@ -5390,7 +6212,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:213
+#: apt_preferences.5.xml

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


@@ -5402,7 +6224,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml

 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "


@@ -5415,7 +6237,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:222
+#: apt_preferences.5.xml

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


@@ -5427,7 +6249,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml

 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "


@@ -5441,7 +6263,7 @@ msgstr ""
 "トアドレスではなく、\"Debian\" や \"Ximian\" といった作者やベンダ名です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "トアドレスではなく、\"Debian\" や \"Ximian\" といった作者やベンダ名です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml

 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"


@@ -5451,7 +6273,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:235
+#: apt_preferences.5.xml

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


@@ -5463,58 +6285,71 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml

 msgid ""
 "The following record assigns a high priority to all package versions "
 msgid ""
 "The following record assigns a high priority to all package versions "

-"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
-"</literal>\"."
+"belonging to any distribution whose Codename is \"<literal>&debian-testing-"
+"codename;</literal>\"."

 msgstr ""
 msgstr ""

-"以下のレコードは、コード名が \"<literal>&testing-codename;</literal>\" となっ"
-"ているディストリビューションに属するパッケージのバージョンを、高い優先度に割"
-"り当てます。"
+"以下のレコードは、コード名が \"<literal>&debian-testing-codename;</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:244
+#: apt_preferences.5.xml

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

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml

 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "

-"and whose release Version number is \"<literal>&stable-version;</literal>\"."
+"and whose release Version number is \"<literal>&debian-stable-version;</"
+"literal>\"."

 msgstr ""
 "以下のレコードは、アーカイブ名が \"<literal>stable</literal>\" で、リリース"
 msgstr ""
 "以下のレコードは、アーカイブ名が \"<literal>stable</literal>\" で、リリース"

-"バージョン番号が \"<literal>&stable-version;</literal>\" となっているリリース"
-"に属するパッケージを、すべて高い優先度に割り当てます。"
+"バージョン番号が \"<literal>&debian-stable-version;</literal>\" となっている"
+"ã\83ªã\83ªã\83¼ã\82¹ã\81«å±\9eã\81\99ã\82\8bã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\82\92ã\80\81ã\81\99ã\81¹ã\81¦é«\98ã\81\84å\84ªå\85\88度ã\81«å\89²ã\82\8aå½\93ã\81¦ã\81¾ã\81\99ã\80\82"

 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>

-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml

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

-"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"

 "Pin-Priority: 500\n"
 msgstr ""
 "Package: *\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: *\n"

-"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"

 "Pin-Priority: 500\n"
 
 "Pin-Priority: 500\n"
 

+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml
+msgid ""
+"The effect of the comma operator is similar to an \"and\" in logic: All "
+"conditions must be satisfied for the pin to match. There is one exception: "
+"For any type of condition (such as two \"a\" conditions), only the last such "
+"condition is checked."
+msgstr ""
+"コンマ演算子の効果は \"and\" 論理に似ています: ピンが一致するようにすべての条"
+"件がピンが一致しなければなりません。一つの例外があります: 条件のいずれかの型"
+"では (例えば、二つの \"a\" 条件)、ただ最後の条件のみがチェックされます。"
+

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

-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml

 msgid "Regular expressions and &glob; syntax"
 msgstr "正規表現と &glob; 構文"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "Regular expressions and &glob; syntax"
 msgstr "正規表現と &glob; 構文"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml

 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "


@@ -5528,19 +6363,19 @@ msgstr ""
 "ケージに、優先度500を割り当てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 "ケージに、優先度500を割り当てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>

-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"

-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"

 "Pin-Priority: 500\n"
 msgstr ""
 "Package: gnome* /kde/\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: gnome* /kde/\n"

-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"

 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml

 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "


@@ -5551,7 +6386,7 @@ msgstr ""
 "パッケージに、優先度 990 を割り当てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 "パッケージに、優先度 990 を割り当てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>

-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml

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


@@ -5563,7 +6398,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml

 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "


@@ -5580,12 +6415,12 @@ msgstr ""
 "体とは見なされません。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "体とは見なされません。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml

 msgid "How APT Interprets Priorities"
 msgstr "APT が優先度に割り込む方法"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "How APT Interprets Priorities"
 msgstr "APT が優先度に割り込む方法"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml

 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"


@@ -5594,12 +6429,12 @@ msgstr ""
 "ません。これは (おおざっぱにいうと) 以下のように解釈されます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "ません。これは (おおざっぱにいうと) 以下のように解釈されます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml

 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml

 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"


@@ -5607,12 +6442,12 @@ msgstr ""
 "パッケージがダウングレードしても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "パッケージがダウングレードしても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml

 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml

 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"


@@ -5621,12 +6456,12 @@ msgstr ""
 "に含まれなくても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "に含まれなくても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml

 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml

 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"


@@ -5635,12 +6470,12 @@ msgstr ""
 "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml

 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml

 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"


@@ -5650,12 +6485,12 @@ msgstr ""
 "ル"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "ル"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml

 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml

 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"


@@ -5664,30 +6499,41 @@ msgstr ""
 "ンストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "ンストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml

 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml

 msgid "prevents the version from being installed"
 msgstr "このバージョンのインストール禁止"
 
 msgid "prevents the version from being installed"
 msgstr "このバージョンのインストール禁止"
 

+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml
+msgid "P = 0"
+msgstr "P = 0"
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml
+msgid "has undefined behaviour, do not use it."
+msgstr "は動作が未定義です、使用しないでください。"
+

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

-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml

 msgid ""
 msgid ""

-"If any specific-form records match an available package version then the "
-"first such record determines the priority of the package version.  Failing "
-"that, if any general-form records match an available package version then "
-"the first such record determines the priority of the package version."
+"The first specific-form record matching an available package version "
+"determines the priority of the package version.  Failing that, the priority "
+"of the package is defined as the maximum of all priorities defined by "
+"generic-form records matching the version.  Records defined using patterns "
+"in the Pin field other than \"*\" are treated like specific-form records."

 msgstr ""
 msgstr ""

-"特定形式のレコードが利用可能パッケージバージョンに一致した場合、最初のレコー"
-"ã\83\89ã\81\8cã\80\81ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\83\90ã\83¼ã\82¸ã\83§ã\83³ã\81®å\84ªå\85\88度ã\82\92決å®\9aã\81\97ã\81¾ã\81\99ã\80\82失æ\95\97ã\81\97ã\81¦ã\80\81æ±\8eç\94¨å½¢å¼\8fã\81®ã\83¬ã\82³ã\83¼ã\83\89"
-"が利用可能パッケージバージョンに一致した場合、最初のレコードが、パッケージ"
-"バージョンの優先度を決定します。"
+"利用可能なパッケージバージョンに一致する最初の特定形式のレコードが、パッケー"
+"ã\82¸ã\83\90ã\83¼ã\82¸ã\83§ã\83³ã\81®å\84ªå\85\88度ã\82\92決å®\9aã\81\97ã\81¾ã\81\99ã\80\82ã\81\9dã\82\8cã\81«å¤±æ\95\97ã\81\99ã\82\8bã\81¨ã\80\81ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\83\90ã\83¼ã\82¸ã\83§ã\83³ã\81®å\84ª"
+"先度は、バージョンに一致する汎用形式のレコードで定義されたすべての優先度の最"
+"大値として定義されます。"

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

-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml

 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"


@@ -5696,7 +6542,7 @@ msgstr ""
 "仮定してください。"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 "仮定してください。"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>

-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml

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


@@ -5724,12 +6570,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml

 msgid "Then:"
 msgstr "すると、以下のように動作します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 msgid "Then:"
 msgstr "すると、以下のように動作します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml

 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "


@@ -5743,7 +6589,7 @@ msgstr ""
 "れている場合、<literal>perl</literal> はダウングレードされます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "れている場合、<literal>perl</literal> はダウングレードされます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml

 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "


@@ -5754,7 +6600,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:385
+#: apt_preferences.5.xml

 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"


@@ -5767,12 +6613,12 @@ msgstr ""
 "い場合にのみインストールされます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "い場合にのみインストールされます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml

 msgid "Determination of Package Version and Distribution Properties"
 msgstr "パッケージのバージョンとディストリビューションプロパティの決定"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "パッケージのバージョンとディストリビューションプロパティの決定"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml

 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "


@@ -5783,7 +6629,7 @@ msgstr ""
 "filename> ファイルを提供します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "filename> ファイルを提供します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml

 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"


@@ -5801,53 +6647,53 @@ msgstr ""
 "ます。APT 優先度の設定は、レコードごとに以下の 2 行だけです。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "ます。APT 優先度の設定は、レコードごとに以下の 2 行だけです。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml

 msgid "the <literal>Package:</literal> line"
 msgstr "<literal>Package:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Package:</literal> line"
 msgstr "<literal>Package:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml

 msgid "gives the package name"
 msgstr "パッケージ名"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgid "gives the package name"
 msgstr "パッケージ名"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml

 msgid "the <literal>Version:</literal> line"
 msgstr "<literal>Version:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Version:</literal> line"
 msgstr "<literal>Version:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml

 msgid "gives the version number for the named package"
 msgstr "その名前のパッケージのバージョン番号"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "gives the version number for the named package"
 msgstr "その名前のパッケージのバージョン番号"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml

 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>.../"
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
 "example, <filename>.../dists/stable/Release</filename>, or <filename>.../"

-"dists/&stable-codename;/Release</filename>.  It consists of a single multi-"
-"line record which applies to <emphasis>all</emphasis> of the packages in the "
-"directory tree below its parent.  Unlike the <filename>Packages</filename> "
-"file, nearly all of the lines in a <filename>Release</filename> file are "
-"relevant for setting APT priorities:"
+"dists/&debian-stable-codename;/Release</filename>.  It consists of a single "
+"multi-line record which applies to <emphasis>all</emphasis> of the packages "
+"in the directory tree below its parent.  Unlike the <filename>Packages</"
+"filename> file, nearly all of the lines in a <filename>Release</filename> "
+"file are relevant for setting APT priorities:"

 msgstr ""
 "<filename>Release</filename> ファイルは、通常 <filename>.../dists/"
 "<replaceable>dist-name</replaceable></filename> ディレクトリにあります。例え"
 "ば、<filename>.../dists/stable/Release</filename> や <filename>.../dists/"
 msgstr ""
 "<filename>Release</filename> ファイルは、通常 <filename>.../dists/"
 "<replaceable>dist-name</replaceable></filename> ディレクトリにあります。例え"
 "ば、<filename>.../dists/stable/Release</filename> や <filename>.../dists/"

-"&stable-codename;/Release</filename> です。これは、このディレクトリ以下にある"
-"<emphasis>全</emphasis>パッケージに適用する、複数行のレコード 1 つから成って"
-"ã\81\84ã\81¾ã\81\99ã\80\82<filename>Packages</filename> ã\83\95ã\82¡ã\82¤ã\83«ã\81¨é\81\95ã\81\84 <filename>Release</"
-"filename> ファイルは、以下のようにほとんどの行が APT 優先度の設定に関連しま"
-"す。"
+"&debian-stable-codename;/Release</filename> です。これは、このディレクトリ以"
+"下にある<emphasis>全</emphasis>パッケージに適用する、複数行のレコード 1 つか"
+"ã\82\89æ\88\90ã\81£ã\81¦ã\81\84ã\81¾ã\81\99ã\80\82<filename>Packages</filename> ã\83\95ã\82¡ã\82¤ã\83«ã\81¨é\81\95ã\81\84 "
+"<filename>Release</filename> ファイルは、以下のようにほとんどの行が APT 優先"
+"度の設定に関連します。"

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

-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml

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

-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml

 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "


@@ -5863,75 +6709,75 @@ 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:441
+#: apt_preferences.5.xml

 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml

 msgid "the <literal>Codename:</literal> line"
 msgstr "<literal>Codename:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Codename:</literal> line"
 msgstr "<literal>Codename:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml

 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "

-"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:"
+"For example, the line \"Codename: &debian-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>&debian-"
+"testing-codename;</literal>.  Specifying this value in the APT preferences "
+"file would require the line:"

 msgstr ""
 "このディレクトリツリーに属する全パッケージのコード名です。たとえ"
 msgstr ""
 "このディレクトリツリーに属する全パッケージのコード名です。たとえ"

-"ば、\"Codename: &testing-codename;\" という行は、<filename>Release</"
+"ば、\"Codename: &debian-testing-codename;\" という行は、<filename>Release</"

 "filename> ファイルの親ディレクトリツリー以下にある全パッケージが、"
 "filename> ファイルの親ディレクトリツリー以下にある全パッケージが、"

-"<literal>&testing-codename;</literal> と名前のついたバージョンであると指定し"
-"ます。APT プリファレンスファイルでこの値を指定するには、以下の行が必要になり"
-"ます。"
+"<literal>&debian-testing-codename;</literal> と名前のついたバージョンであると"
+"指定します。APT プリファレンスファイルでこの値を指定するには、以下の行が必要"
+"ã\81«ã\81ªã\82\8aã\81¾ã\81\99ã\80\82"

 
 #. 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:457
+#: apt_preferences.5.xml

 #, no-wrap
 #, no-wrap

-msgid "Pin: release n=&testing-codename;\n"
-msgstr "Pin: release n=&testing-codename;\n"
+msgid "Pin: release n=&debian-testing-codename;\n"
+msgstr "Pin: release n=&debian-testing-codename;\n"

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

-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml

 msgid ""
 "names the release version.  For example, the packages in the tree might "
 msgid ""
 "names the release version.  For example, the packages in the tree might "

-"belong to Debian release version &stable-version;.  Note that there is "
-"normally no version number for the <literal>testing</literal> and "
+"belong to Debian release version &debian-stable-version;.  Note that there "
+"is normally no version number for the <literal>testing</literal> and "

 "<literal>unstable</literal> distributions because they have not been "
 "released yet.  Specifying this in the APT preferences file would require one "
 "of the following lines."
 msgstr ""
 "リリースバージョン名です。例えば、このツリーのパッケージが、Debian リリース"
 "<literal>unstable</literal> distributions because they have not been "
 "released yet.  Specifying this in the APT preferences file would require one "
 "of the following lines."
 msgstr ""
 "リリースバージョン名です。例えば、このツリーのパッケージが、Debian リリース"

-"バージョン &stable-version; に属するとします。通常 <literal>testing</"
+"バージョン &debian-stable-version; に属するとします。通常 <literal>testing</"

 "literal> ディストリビューションや <literal>unstable</literal> ディストリ"
 "ビューションには、まだリリースされていないので、バージョン番号が付きません。"
 "APT プリファレンスファイルでこれを指定するには、以下の行のいずれかが必要にな"
 "ります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 "literal> ディストリビューションや <literal>unstable</literal> ディストリ"
 "ビューションには、まだリリースされていないので、バージョン番号が付きません。"
 "APT プリファレンスファイルでこれを指定するには、以下の行のいずれかが必要にな"
 "ります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>

-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"Pin: release v=&stable-version;\n"
-"Pin: release a=stable, v=&stable-version;\n"
-"Pin: release &stable-version;\n"
+"Pin: release v=&debian-stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"
+"Pin: release &debian-stable-version;\n"

 msgstr ""
 msgstr ""

-"Pin: release v=&stable-version;\n"
-"Pin: release a=stable, v=&stable-version;\n"
-"Pin: release &stable-version;\n"
+"Pin: release v=&debian-stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"
+"Pin: release &debian-stable-version;\n"

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

-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml

 msgid "the <literal>Component:</literal> line"
 msgstr "<literal>Component:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Component:</literal> line"
 msgstr "<literal>Component:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml

 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "


@@ -5948,18 +6794,18 @@ 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:492
+#: apt_preferences.5.xml

 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml

 msgid "the <literal>Origin:</literal> line"
 msgstr "<literal>Origin:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Origin:</literal> line"
 msgstr "<literal>Origin:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml

 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"


@@ -5971,18 +6817,18 @@ 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:505
+#: apt_preferences.5.xml

 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #, 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:511
+#: apt_preferences.5.xml

 msgid "the <literal>Label:</literal> line"
 msgstr "<literal>Label:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Label:</literal> line"
 msgstr "<literal>Label:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml

 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"


@@ -5994,13 +6840,13 @@ 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:518
+#: apt_preferences.5.xml

 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml

 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "


@@ -6025,12 +6871,12 @@ msgstr ""
 "filename> ファイルを含んでいます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "filename> ファイルを含んでいます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml

 msgid "Optional Lines in an APT Preferences Record"
 msgstr "APT プリファレンスレコードのオプション行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "APT プリファレンスレコードのオプション行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml

 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "


@@ -6040,12 +6886,12 @@ msgstr ""
 "literal> で始まる行を持てます。これは、コメント用の場所を確保します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "literal> で始まる行を持てます。これは、コメント用の場所を確保します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml

 msgid "Tracking Stable"
 msgstr "安定版の追跡"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgid "Tracking Stable"
 msgstr "安定版の追跡"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"


@@ -6069,7 +6915,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml

 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "


@@ -6084,8 +6930,7 @@ msgstr ""
 "す。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 "す。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"


@@ -6097,7 +6942,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml

 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "


@@ -6109,13 +6954,13 @@ msgstr ""
 "できます。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 "できます。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml

 #, 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>
 #, 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>

-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml

 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "


@@ -6128,12 +6973,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml

 msgid "Tracking Testing or Unstable"
 msgstr "テスト版や不安定版の追跡"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgid "Tracking Testing or Unstable"
 msgstr "テスト版や不安定版の追跡"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml

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


@@ -6161,7 +7006,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml

 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "


@@ -6178,7 +7023,7 @@ msgstr ""
 "先度を割り当てます。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "先度を割り当てます。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml

 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "


@@ -6190,13 +7035,13 @@ msgstr ""
 "ドできます。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 "ドできます。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml

 #, 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>
 #, 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>

-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml

 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "


@@ -6215,18 +7060,18 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml

 msgid "Tracking the evolution of a codename release"
 msgstr "コード名リリースの進化の追跡"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgid "Tracking the evolution of a codename release"
 msgstr "コード名リリースの進化の追跡"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"

-"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
+"Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid\n"

 "Package: *\n"
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"


@@ -6239,9 +7084,9 @@ msgid ""
 "Pin-Priority: -10\n"
 msgstr ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
 "Pin-Priority: -10\n"
 msgstr ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"

-"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
+"Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid\n"

 "Package: *\n"
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"


@@ -6254,7 +7099,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml

 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "


@@ -6278,123 +7123,236 @@ msgstr ""
 "す。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "す。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml

 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "

-"the release codenamed with <literal>&testing-codename;</literal>.  "
+"the release codenamed with <literal>&debian-testing-codename;</literal>.  "

 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "適切な &sources-list; ファイルと上記のプリファレンスファイルにより、以下のコ"
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "適切な &sources-list; ファイルと上記のプリファレンスファイルにより、以下のコ"

-"マンドのいずれかで、リリースコード名が <literal>&testing-codename;</literal> "
-"である最新バージョンにアップグレードできます。<placeholder type="
+"マンドのいずれかで、リリースコード名が <literal>&debian-testing-codename;</"
+"literal> である最新バージョンにアップグレードできます。<placeholder type="

 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml

 #, 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>
 #, 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>

-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml

 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 "
 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>&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\"/>"
+"recent <literal>&debian-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>sid</literal> ディストリ"
 "ビューションの最新バージョンにアップグレードします。それ以降、<command>apt-"
 msgstr ""
 "以下のコマンドで、指定したパッケージを <literal>sid</literal> ディストリ"
 "ビューションの最新バージョンにアップグレードします。それ以降、<command>apt-"

-"get upgrade</command> は <literal>&testing-codename;</literal> バージョンの"
-"ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81\8cæ\9b´æ\96°ã\81\95ã\82\8cã\81¦ã\81\84ã\82\8cã\81° <literal>&testing-codename;</literal> ã\81®æ\9c\80æ\96°ç\89\88"
-"に、<literal>sid</literal> バージョンのパッケージが更新されていれば "
-"<literal>sid</literal>の最新版にアップグレードします。<placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"get upgrade</command> は <literal>&debian-testing-codename;</literal> バー"
+"ã\82¸ã\83§ã\83³ã\81®ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81\8cæ\9b´æ\96°ã\81\95ã\82\8cã\81¦ã\81\84ã\82\8cã\81° <literal>&debian-testing-codename;</"
+"literal> の最新版に、<literal>sid</literal> バージョンのパッケージが更新され"
+"ていれば <literal>sid</literal>の最新版にアップグレードします。<placeholder "
+"type=\"programlisting\" id=\"0\"/>"

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

-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml

 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: sources.list.5.xml:35
+#: sources.list.5.xml

 msgid "List of configured APT data sources"
 msgstr "APT のデータ取得元の設定リスト"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "List of configured APT data sources"
 msgstr "APT のデータ取得元の設定リスト"
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:40
+#: sources.list.5.xml
+msgid ""
+"The source list <filename>/etc/apt/sources.list</filename> and the files "
+"contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
+"support any number of active sources and a variety of source media. The "
+"files list one source per line (one-line style) or contain multiline stanzas "
+"defining one or more sources per stanza (deb822 style), with the most "
+"preferred source listed first (in case a single version is available from "
+"more than one source). The information available from the configured sources "
+"is acquired by <command>apt-get update</command> (or by an equivalent "
+"command from another APT front-end)."
+msgstr ""
+"取得元リスト <filename>/etc/apt/sources.list</filename> と <filename>/etc/"
+"apt/sources.list.d/</filename> に含まれるファイルは、複数の取得元や様々なメ"
+"ディアをサポートするよう設計されています。ファイルは、1 行に一つの取得元をリ"
+"ストする (1 行スタイル) かまたはスタンザごとに複数の取得元を定義し、(シングル"
+"バージョンが複数の取得元から入手可能である場合には) 最も好ましい取得元を先頭"
+"に置く複数行のスタンザ (deb822 スタイル) を含みます。設定した取得元から利用可"
+"能な情報は、<command>apt-get update</command> (や、ほかの APT フロントエンド"
+"の同等のコマンド) で取得します。"
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml
+msgid "sources.list.d"
+msgstr "sources.list.d"
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml

 msgid ""
 msgid ""

-"The source list <filename>/etc/apt/sources.list</filename> is designed to "
-"support any number of active sources and a variety of source media. The file "
-"lists one source per line, with the most preferred source listed first. The "
-"information available from the configured sources is acquired by "
-"<command>apt-get update</command> (or by an equivalent command from another "
-"APT front-end)."
+"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
+"add sources.list entries in separate files.  Two different file formats are "
+"allowed as described in the next two sections.  Filenames need to have "
+"either the extension <filename>.list</filename> or <filename>.sources</"
+"filename> depending on the contained format.  The filenames may only contain "
+"letters (a-z and A-Z), digits (0-9), underscore (_), hyphen (-) and period "
+"(.) characters.  Otherwise APT will print a notice that it has ignored a "
+"file, unless that file matches a pattern in the <literal>Dir::Ignore-Files-"
+"Silently</literal> configuration list - in which case it will be silently "
+"ignored."

 msgstr ""
 msgstr ""

-"取得元リスト <filename>/etc/apt/sources.list</filename> は、複数の取得元や"
-"様々なメディアをサポートするよう設計されています。ファイルには、1 行にひとつ"
-"取得元を記述し、最も優先するものを先頭にします。設定した取得元から利用可能な"
-"情報は、<command>apt-get update</command> (や、他の APT フロントエンドの同等"
-"のコマンド) で取得します。"
+"<filename>/etc/apt/sources.list.d</filename> ディレクトリは、別々のファイル"
+"で source.list のエントリを追加する方法を提供します。次の二つの節で説明するよ"
+"うに、二つの異なるファイル形式が許可されています。ファイル名は、含まれている"
+"形式に応じて <filename>.list</filename> または <filename>.sources</filename> "
+"のいずれかの拡張子を持っている必要があります。ファイル名は、文字 (a-z と A-"
+"Z)、数字 (0-9)、アンダースコア (_)、ハイフン (-)、ピリオド (.) のみを含むこと"
+"ができます。そうでなければ、<literal>Dir::Ignore-Files-Silently</literal> 設"
+"定リストのパターンに一致するもの以外に対して、ファイルを無視するという注意を "
+"APT が出力します。一致する場合は黙って無視します。"
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml
+msgid "One-Line-Style Format"
+msgstr "1 行スタイル形式"

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

-#: sources.list.5.xml:47
+#: sources.list.5.xml

 msgid ""
 msgid ""

-"Each line specifying a source starts with type (e.g. <literal>deb-src</"
+"Files in this format have the extension <filename>.list</filename>.  Each "
+"line specifying a source starts with a type (e.g. <literal>deb-src</"

 "literal>)  followed by options and arguments for this type.  Individual "
 "entries cannot be continued onto a following line. Empty lines are ignored, "
 "and a <literal>#</literal> character anywhere on a line marks the remainder "
 "literal>)  followed by options and arguments for this type.  Individual "
 "entries cannot be continued onto a following line. Empty lines are ignored, "
 "and a <literal>#</literal> character anywhere on a line marks the remainder "

-"of that line as a comment."
+"of that line as a comment. Consequently an entry can be disabled by "
+"commenting out the entire line.  If options should be provided they are "
+"separated by spaces and all of them together are enclosed by square brackets "
+"(<literal>[]</literal>)  included in the line after the type separated from "
+"it with a space.  If an option allows multiple values these are separated "
+"from each other with a comma (<literal>,</literal>). An option name is "
+"separated from its value(s) by an equals sign (<literal>=</literal>). "
+"Multivalue options also have <literal>-=</literal> and <literal>+=</literal> "
+"as separators, which instead of replacing the default with the given "
+"value(s) modify the default value(s) to remove or include the given values."
+msgstr ""
+"この形式のファイルは、<filename>.list</filename> 拡張子を持っています。取得元"
+"を指定する各行は、この型のオプションと引数が続く型 <literal>deb-src</"
+"literal> から始まります。個々のエントリは、次の行に継続することはできません。"
+"空行は無視され、行の任意の位置の <literal>#</literal> 文字はコメントとして行"
+"の残りの部分をマークします。したがって行全体をコメントアウトすることによっ"
+"て、エントリを無効にすることができます。オプションが提供されている場合、ス"
+"ペースで区切られ、すべて角カッコ (<literal>[]</literal>) で囲まれていて、行の"
+"中でスペースで区切られた型の後ろに含まれます。複数の値が許されるオプションの"
+"場合、カンマ (<literal>,</literal>) で分離されています。オプション名は、イ"
+"コール記号 (<literal>=</literal>) で分離されます。複数値のオプションも "
+"<literal>-=</literal> および <literal>+=</literal> をセパレータとして持ち、デ"
+"フォルト値から与えられた値を削除するか、またはデフォルト値に与えられた値を含"
+"めます。"
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This is the traditional format and supported by all apt versions.  Note that "
+"not all options as described below are supported by all apt versions.  Note "
+"also that some older applications parsing this format on their own might not "
+"expect to encounter options as they were uncommon before the introduction of "
+"multi-architecture support."

 msgstr ""
 msgstr ""

-"取得元の各行は、タイプ (例: <literal>deb-src</literal>) で始まり、そのタイプ"
-"のオプションや引数が続きます。個々のエントリは、次行に続けられません。空行は"
-"無視され、<literal>#</literal> 文字を行のどこにおいても、それ以降はコメントに"
-"なります。"
+"伝統的な形式とすべての apt のバージョンでサポートされています。下記のようにす"
+"べてのオプションがすべての apt のバージョンでサポートされているわけでないこと"
+"に注意してください。いくつかの古いアプリケーションは、自分でこの形式をパース"
+"するので、マルチアーキテクチャのサポートの導入前には珍しいオプションに遭遇す"
+"ることを期待しないかもしれないことに注意してください。"

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

-#: sources.list.5.xml:55
-msgid "sources.list.d"
-msgstr "sources.list.d"
+#: sources.list.5.xml
+msgid "deb822-Style Format"
+msgstr "deb822 スタイル形式"

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

-#: sources.list.5.xml:56
-msgid ""
-"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
-"add sources.list entries in separate files.  The format is the same as for "
-"the regular <filename>sources.list</filename> file.  File names need to end "
-"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
-"digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
-"Otherwise APT will print a notice that it has ignored a file, unless that "
-"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in which case it will be silently ignored."
-msgstr ""
-"<filename>/etc/apt/sources.list.d</filename> ディレクトリは、個別ファイルで "
-"source.list エントリを追加する方法を提供します。フォーマットは、通常の "
-"<filename>sources.list</filename> ファイルと同じです。ファイル名は、"
-"<filename>.list</filename> で終わる必要があり、文字 (a-z と A-Z)、数字 "
-"(0-9)、アンダースコア (_)、ハイフン (-)、ピリオド (.) のみでできていなければ"
-"なりません。そうでなければ、<literal>Dir::Ignore-Files-Silently</literal> 設"
-"定リストのパターンに一致するもの以外に対して、ファイルを無視するという注意を "
-"APT が出力します。一致する場合は黙って無視します。"
+#: sources.list.5.xml
+msgid ""
+"Files in this format have the extension <filename>.sources</filename>.  The "
+"format is similar in syntax to other files used by Debian and its "
+"derivatives, such as the metadata files that apt will download from the "
+"configured sources or the <filename>debian/control</filename> file in a "
+"Debian source package.  Individual entries are separated by an empty line; "
+"additional empty lines are ignored, and a <literal>#</literal> character at "
+"the start of the line marks the entire line as a comment. An entry can hence "
+"be disabled by commenting out each line belonging to the stanza, but it is "
+"usually easier to add the field \"Enabled: no\" to the stanza to disable the "
+"entry. Removing the field or setting it to yes reenables it.  Options have "
+"the same syntax as every other field: A fieldname separated by a colon "
+"(<literal>:</literal>) and optionally spaces from its value(s).  Note "
+"especially that multiple values are separated by spaces, not by commas as in "
+"the one-line format. Multivalue fields like <literal>Architectures</literal> "
+"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
+"Remove</literal> to modify the default value rather than replacing it."
+msgstr ""
+"この形式のファイルは、<filename>.sources</filename> 拡張子を持っています。形"
+"式は、設定された取得元または Debian ソースパッケージの debian/control ファイ"
+"ルから apt がダウンロードするメタデータファイルのような、Debian とその派生で"
+"使用されるほかのファイルの構文と似ています。個々のエントリは空行で分離されて"
+"います: 追加の空行は無視され、行頭の <literal>#</literal> 文字は、コメントと"
+"して行全体をマークします。エントリは、スタンザに属する各行をコメントアウトし"
+"て無効にすることができますが、通常は \"Enabled: no\" フィールドスタンザに追加"
+"してエントリを無効にする方が簡単です。フィールドを削除するか、そのフィールド"
+"を yes に設定すると、再び有効にできます。オプションは、ほかのすべてのフィール"
+"ドと同じ構文を持っています: フィールド名はコロン (<literal>:</literal>) で区"
+"切られ、必要に応じてその値から空白を空けます。特に、1 行形式では、複数の値は"
+"空白で区切られ、コンマではないことに注意してください。"
+"<literal>Architectures</literal> のような複数値のフィールドは、設定を置き換え"
+"るのではなく、デフォルト値を変更する <literal>Architectures-Add</literal> お"
+"よび <literal>Architectures-Remove</literal> を持っています。"
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This is a new format supported by apt itself since version 1.1. Previous "
+"versions ignore such files with a notice message as described earlier.  It "
+"is intended to make this format gradually the default format, deprecating "
+"the previously described one-line-style format, as it is easier to create, "
+"extend and modify for humans and machines alike especially if a lot of "
+"sources and/or options are involved.  Developers who are working with and/or "
+"parsing apt sources are highly encouraged to add support for this format and "
+"to contact the APT team to coordinate and share this work. Users can freely "
+"adopt this format already, but may encounter problems with software not "
+"supporting the format yet."
+msgstr ""
+"バージョン 1.1 以降の apt 自身によりサポートされる新しい形式です。前述のよう"
+"に以前のバージョンでは、通知メッセージでそのようなファイルを無視します。多く"
+"のソースおよび/またはオプションが関与している場合は特に、人間と機械を問わず、"
+"作成、拡張、変更を簡単にするために、先に述べた 1 行スタイル形式を非推奨にし、"
+"徐々にこの形式をデフォルト形式にすることが意図されています。apt ソースを作業"
+"および/またはパースしている開発者は、このフォーマットのサポートを追加すること"
+"と、調整するために APT チームに連絡すること、この作業を共有することをお勧めし"
+"ます。ユーザはすでに自由にこの形式を採用することができますが、この形式をまだ"
+"サポートしていないソフトウェアで問題が発生する場合があります。"

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

-#: sources.list.5.xml:67
-msgid "The deb and deb-src types"
-msgstr "deb ã\82¿ã\82¤ã\83\97ã\81¨ deb-src ã\82¿ã\82¤ã\83\97"
+#: sources.list.5.xml
+msgid "The deb and deb-src Types: General Format"
+msgstr "deb ã\81\8aã\82\88ã\81³ deb-src ã\82¿ã\82¤ã\83\97: ä¸\80è\88¬å½¢å¼\8f"

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

-#: sources.list.5.xml:68
+#: sources.list.5.xml

 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "

-"<literal>distribution</literal> is generally an archive name like "
+"<literal>distribution</literal> is generally a suite name like "

 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "

-"<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-"literal> while component is one of <literal>main</literal>, "
+"<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-"
+"codename;</literal> while component is one of <literal>main</literal>, "

 "<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
 "src</literal> type references a Debian distribution's source code in the "
 "same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
 "<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
 "src</literal> type references a Debian distribution's source code in the "
 "same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "


@@ -6403,261 +7361,444 @@ msgstr ""
 "<literal>deb</literal> タイプでは典型的な 2 段階の Debian アーカイブ "
 "<filename>distribution/component</filename> を参照します。"
 "<literal>distribution</literal> は通常 <literal>stable</literal> や "
 "<literal>deb</literal> タイプでは典型的な 2 段階の Debian アーカイブ "
 "<filename>distribution/component</filename> を参照します。"
 "<literal>distribution</literal> は通常 <literal>stable</literal> や "

-"<literal>testing</literal> または <literal>&stable-codename;</literal> や "
-"<literal>&testing-codename;</literal> のようなコード名になります。component "
-"ã\81¯ã\80\81<literal>main</literal>, <literal>contrib</literal>, <literal>non-free</"
-"literal> のどれかです。<literal>deb-src</literal> タイプでは、debian ディスト"
-"ã\83ªã\83\93ã\83¥ã\83¼ã\82·ã\83§ã\83³ã\81®ã\82½ã\83¼ã\82¹ã\82³ã\83¼ã\83\89ã\82\92ã\80\81<literal>deb</literal> ã\82¿ã\82¤ã\83\97ã\81¨å\90\8cã\81\98å½¢å¼\8fã\81§å\8f\82ç\85§"
-"ã\81\97ã\81¾ã\81\99ã\80\82<literal>deb-src</literal> è¡\8cã\81¯ã\80\81ã\82½ã\83¼ã\82¹ã\82¤ã\83³ã\83\87ã\83\83ã\82¯ã\82¹ã\82\92å\8f\96å¾\97ã\81\99ã\82\8bã\81®ã\81«å¿\85è¦\81"
-"です。"
+"<literal>testing</literal> または <literal>&debian-stable-codename;</"
+"literal> や <literal>&debian-testing-codename;</literal> のようなコード名にな"
+"ã\82\8aã\81¾ã\81\99ã\80\82component ã\81¯ã\80\81<literal>main</literal>, <literal>contrib</literal>, "
+"<literal>non-free</literal> のどれかです。<literal>deb-src</literal> タイプで"
+"ã\81¯ã\80\81debian ã\83\87ã\82£ã\82¹ã\83\88ã\83ªã\83\93ã\83¥ã\83¼ã\82·ã\83§ã\83³ã\81®ã\82½ã\83¼ã\82¹ã\82³ã\83¼ã\83\89ã\82\92ã\80\81<literal>deb</literal> ã\82¿"
+"ã\82¤ã\83\97ã\81¨å\90\8cã\81\98å½¢å¼\8fã\81§å\8f\82ç\85§ã\81\97ã\81¾ã\81\99ã\80\82<literal>deb-src</literal> è¡\8cã\81¯ã\80\81ã\82½ã\83¼ã\82¹ã\82¤ã\83³ã\83\87ã\83\83ã\82¯"
+"ã\82¹ã\82\92å\8f\96å¾\97ã\81\99ã\82\8bã\81®ã\81«å¿\85è¦\81ã\81§ã\81\99ã\80\82"

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

-#: sources.list.5.xml:79
+#: sources.list.5.xml

 msgid ""
 msgid ""

-"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"The format for two one-line-style entries using the <literal>deb</literal> "
+"and <literal>deb-src</literal> types is:"

 msgstr ""
 msgstr ""

-"<literal>deb</literal> タイプと <literal>deb-src</literal> タイプで使用する "
-"<filename>sources.list</filename> エントリのフォーマットは、以下のようになり"
-"ます。"
+"<literal>deb</literal> および <literal>deb-src</literal> タイプで使用する 2 "
+"つの 1 行スタイルのエントリの形式は、以下のようになります:"

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

-#: sources.list.5.xml:82
-#, fuzzy, no-wrap
-#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
-msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ オプション ] uri distribution [コンポーネント1] [コンポーネント2] [...]"
+#: sources.list.5.xml
+#, no-wrap
+msgid ""
+"deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]\n"
+"deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]"
+msgstr ""
+"deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]\n"
+"deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]"

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

-#: sources.list.5.xml:86
+#: sources.list.5.xml

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"     Type: deb\n"
-"     URI: http://example.com\n"
-"     Suites: stable\n"
-"     Sections: component1 component2\n"
-"     [option1]: [option1-value]\n"
-"\n"
-"     Type: deb-src\n"
-"     URI: http://example.com\n"
-"     Suites: stable\n"
-"     Sections: component1 component2\n"
-"     [option1]: [option1-value]\n"
+"     Types: deb deb-src\n"
+"     URIs: uri\n"
+"     Suites: suite\n"
+"     Components: [component1] [component2] [...]\n"
+"     option1: value1\n"
+"     option2: value2\n"

 "   "
 msgstr ""
 "   "
 msgstr ""

+"     Types: deb deb-src\n"
+"     URIs: uri\n"
+"     Suites: suite\n"
+"     Components: [component1] [component2] [...]\n"
+"     option1: value1\n"
+"     option2: value2\n"
+"   "

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

-#: sources.list.5.xml:84
+#: sources.list.5.xml

 msgid ""
 msgid ""

-"Alternatively a rfc822 style format is also supported: <placeholder type="
-"\"literallayout\" id=\"0\"/>"
+"Alternatively the equivalent entry in deb822 style looks like this: "
+"<placeholder type=\"literallayout\" id=\"0\"/>"

 msgstr ""
 msgstr ""

+"他に deb822 スタイルで同等のエントリもサポートしています: <placeholder type="
+"\"literallayout\" id=\"0\"/>"

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

-#: sources.list.5.xml:100
-#, fuzzy
-#| msgid ""
-#| "The URI for the <literal>deb</literal> type must specify the base of the "
-#| "Debian distribution, from which APT will find the information it needs.  "
-#| "<literal>distribution</literal> can specify an exact path, in which case "
-#| "the components must be omitted and <literal>distribution</literal> must "
-#| "end with a slash (<literal>/</literal>). This is useful for the case when "
-#| "only a particular sub-section of the archive denoted by the URI is of "
-#| "interest.  If <literal>distribution</literal> does not specify an exact "
-#| "path, at least one <literal>component</literal> must be present."
+#: sources.list.5.xml

 msgid ""
 "The URI for the <literal>deb</literal> type must specify the base of the "
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>suite</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>suite</literal> must end with a "
 "slash (<literal>/</literal>). This is useful for the case when only a "
 msgid ""
 "The URI for the <literal>deb</literal> type must specify the base of the "
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>suite</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>suite</literal> must end with a "
 "slash (<literal>/</literal>). This is useful for the case when only a "

-"particular sub-section of the archive denoted by the URI is of interest.  If "
-"<literal>suite</literal> does not specify an exact path, at least one "
+"particular sub-directory of the archive denoted by the URI is of interest.  "
+"If <literal>suite</literal> does not specify an exact path, at least one "

 "<literal>component</literal> must be present."
 msgstr ""
 "<literal>deb</literal> タイプの URI は、APT が必要な情報を見つけられるよう"
 "<literal>component</literal> must be present."
 msgstr ""
 "<literal>deb</literal> タイプの URI は、APT が必要な情報を見つけられるよう"

-"に、Debian ディストリビューションの基底を指定しなければなりません。"
-"<literal>distribution</literal> には正確なパスを指定できます。その場合 "
-"component を省略し、<literal>distribution</literal> はスラッシュ (<literal>/"
-"</literal>) で終わらなくてはなりません。これは URL で指定されたアーカイブの、"
-"特定のサブセクションのみに関心があるときに役に立ちます。"
-"<literal>distribution</literal> に正確なパスを指定しないのなら、少なくともひ"
-"ã\81¨ã\81¤ã\81¯ <literal>component</literal> ã\82\92æ\8c\87å®\9aã\81\97ã\81ªã\81\91ã\82\8cã\81°ã\81ªã\82\8aã\81¾ã\81\9bã\82\93ã\80\82"
+"に、Debian ディストリビューションの基底を指定しなければなりません。<literal>"
+"スイート</literal>には正確なパスを指定できます。その場合コンポーネントを省略"
+"し、<literal>スイート</literal>はスラッシュ (<literal>/</literal>) で終わらな"
+"くてはなりません。これは URL で指定されたアーカイブの、特定のサブディレクトリ"
+"のみに関心があるときに役に立ちます。<literal>スイート</literal>に正確なパスを"
+"指定しないのなら、少なくとも一つは <literal>コンポーネント</literal> を指定し"
+"なければなりません。"

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

-#: sources.list.5.xml:109
-#, fuzzy
-#| msgid ""
-#| "<literal>distribution</literal> may also contain a variable, <literal>"
-#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
-#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-#| "This permits architecture-independent <filename>sources.list</filename> "
-#| "files to be used. In general this is only of interest when specifying an "
-#| "exact path, <literal>APT</literal> will automatically generate a URI with "
-#| "the current architecture otherwise."
+#: sources.list.5.xml

 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
 "literal> or <literal>armel</literal>) used on the system. This permits "
 "architecture-independent <filename>sources.list</filename> files to be used. "
 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
 "literal> or <literal>armel</literal>) used on the system. This permits "
 "architecture-independent <filename>sources.list</filename> files to be used. "

-"In general this is only of interest when specifying an exact path, "
+"In general this is only of interest when specifying an exact path; "

 "<literal>APT</literal> will automatically generate a URI with the current "
 "architecture otherwise."
 msgstr ""
 "<literal>APT</literal> will automatically generate a URI with the current "
 "architecture otherwise."
 msgstr ""

-"<literal>distribution</literal> は、<literal>$(ARCH)</literal> 変数を含む場合"
-"ã\81\8cã\81\82ã\82\8aã\81¾ã\81\99ã\80\82<literal>$(ARCH)</literal> å¤\89æ\95°ã\81¯ã\80\81ã\82·ã\82¹ã\83\86ã\83 ã\81§ä½¿ç\94¨ã\81\97ã\81¦ã\81\84ã\82\8b Debian "
-"ã\82¢ã\83¼ã\82­ã\83\86ã\82¯ã\83\81ã\83£ (<literal>amd64</literal> ã\82\84 <literal>armel</literal> ã\81ªã\81©) ã\81«"
-"展開されます。これにより、アーキテクチャに依存しない <filename>sources.list</"
+"<literal>スイート</literal> は、<literal>$(ARCH)</literal> 変数を含む場合があ"
+"ã\82\8aã\81¾ã\81\99ã\80\82<literal>$(ARCH)</literal> å¤\89æ\95°ã\81¯ã\80\81ã\82·ã\82¹ã\83\86ã\83 ã\81§ä½¿ç\94¨ã\81\97ã\81¦ã\81\84ã\82\8b Debian ã\82¢ã\83¼"
+"ã\82­ã\83\86ã\82¯ã\83\81ã\83£ (<literal>amd64</literal> ã\82\84 <literal>armel</literal> ã\81ªã\81©) ã\81«å±\95é\96\8b"
+"されます。これにより、アーキテクチャに依存しない <filename>sources.list</"

 "filename> ファイルを使用できます。一般的に、これは正しいパスを指定するときに"
 "気にするだけです。そうでない場合は、<literal>APT</literal> は現在のアーキテク"
 "チャで URI を自動的に生成します。"
 
 #. type: Content of: <refentry><refsect1><para>
 "filename> ファイルを使用できます。一般的に、これは正しいパスを指定するときに"
 "気にするだけです。そうでない場合は、<literal>APT</literal> は現在のアーキテク"
 "チャで URI を自動的に生成します。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:117
-#, fuzzy
-#| msgid ""
-#| "Since only one distribution can be specified per line it may be necessary "
-#| "to have multiple lines for the same URI, if a subset of all available "
-#| "distributions or components at that location is desired.  APT will sort "
-#| "the URI list after it has generated a complete set internally, and will "
-#| "collapse multiple references to the same Internet host, for instance, "
-#| "into a single connection, so that it does not inefficiently establish an "
-#| "FTP connection, close it, do something else, and then re-establish a "
-#| "connection to that same host. This feature is useful for accessing busy "
-#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
-#| "also parallelizes connections to different hosts to more effectively deal "
-#| "with sites with low bandwidth."
-msgid ""
-"In the traditional style sources.list format since only one distribution can "
-"be specified per line it may be necessary to have multiple lines for the "
-"same URI, if a subset of all available distributions or components at that "
+#: sources.list.5.xml
+msgid ""
+"Especially in the one-line-style format since only one distribution can be "
+"specified per line it may be necessary to have multiple lines for the same "
+"URI, if a subset of all available distributions or components at that "

 "location is desired.  APT will sort the URI list after it has generated a "
 "complete set internally, and will collapse multiple references to the same "
 "Internet host, for instance, into a single connection, so that it does not "
 "location is desired.  APT will sort the URI list after it has generated a "
 "complete set internally, and will collapse multiple references to the same "
 "Internet host, for instance, into a single connection, so that it does not "

-"inefficiently establish an FTP connection, close it, do something else, and "
-"then re-establish a connection to that same host. This feature is useful for "
-"accessing busy FTP sites with limits on the number of simultaneous anonymous "
-"users. APT also parallelizes connections to different hosts to more "
-"effectively deal with sites with low bandwidth."
-msgstr ""
-"有効な全 distribution, component の場所から、一部が必要な場合、1 行につき 1 "
-"distribution しか指定できないため、同じ URI の行を複数記述することになるで"
-"しょう。APT は内部で URI リストを生成してから、並べ替えます。そして、同じイン"
-"ターネットホストに対しては複数の参照をまとめます。例えば FTP 接続後、切断して"
-"からまた同じホストに再接続するといった、効率の悪いことをせずに、1 接続にまと"
-"めます。この機能は、同時接続匿名ユーザ数を制限している、混んでいる FTP サイト"
-"にアクセスするのに便利です。APT は、帯域の狭いサイトを効率よく扱うのに、異な"
-"るホストへは、接続を並行して行うようにもしています。"
-
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:131
-msgid ""
-"<literal>options</literal> is always optional and needs to be surrounded by "
-"square brackets. It can consist of multiple settings in the form "
-"<literal><replaceable>setting</replaceable>=<replaceable>value</"
-"replaceable></literal>.  Multiple settings are separated by spaces. The "
-"following settings are supported by APT (note however that unsupported "
-"settings will be ignored silently):"
-msgstr ""
-"<literal>オプション</literal> は、常に省略可能で、角カッコで囲む必要がありま"
-"す。複数の設定を <literal><replaceable>設定</replaceable>=<replaceable>値</"
-"replaceable></literal> の形式で定義できます。複数の設定は空白で区切ります。以"
-"下の設定は APT がサポートしているものです (未サポートのものは黙って無視しま"
-"す)。"
+"inefficiently establish a connection, close it, do something else, and then "
+"re-establish a connection to that same host. APT also parallelizes "
+"connections to different hosts to more effectively deal with sites with low "
+"bandwidth."
+msgstr ""
+"特に 1 行スタイル形式では 1 行につき 1 つのディストリビューションしか指定でき"
+"ないため、同じ URI の行を複数記述することになるでしょう。APT は内部で URI リ"
+"ストを生成してから、並べ替えます。そして、同じインターネットホストに対しては"
+"複数の参照をまとめます。例えば FTP 接続後、切断してからまた同じホストに再接続"
+"するといった効率の悪いことをせずに、1 接続にまとめます。APT は、帯域の狭いサ"
+"イトを効率よく扱うため異なるホストへは接続を並行して行うようにもしています。"

 
 

-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:137
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml

 msgid ""
 msgid ""

-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> can be used to specify for which architectures "
-"information should be downloaded. If this option is not set all "
-"architectures defined by the <literal>APT::Architectures</literal> option "
-"will be downloaded."
-msgstr ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> により、どのアーキテクチャ情報をダウンロードするか指"
-"定します。このオプションを指定していないと、<literal>APT::Architectures</"
-"literal> オプションに定義してある、全アーキテクチャをダウンロードします。"
+"It is important to list sources in order of preference, with the most "
+"preferred source listed first. Typically this will result in sorting by "
+"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
+"followed by distant Internet hosts, for example)."
+msgstr ""
+"最優先する取得元を最初に記述するというように、優先順に取得元を記述するのは重"
+"要です。一般的には、スピードの速い順に並べることになる (例えば、CD-ROM に続い"
+"てローカルネットワークのホスト、さらに続いて彼方のインターネットホスト) で"
+"しょう。"

 
 

-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:141
-#, fuzzy
-#| msgid ""
-#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-#| "replaceable>,…</literal> can be used to specify for which architectures "
-#| "information should be downloaded. If this option is not set all "
-#| "architectures defined by the <literal>APT::Architectures</literal> option "
-#| "will be downloaded."
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid "&sourceslist-list-format;"
+msgstr "&sourceslist-list-format;"
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid "&sourceslist-sources-format;"
+msgstr "&sourceslist-sources-format;"
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml

 msgid ""
 msgid ""

-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
-"<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
-"architectures from the set which will be downloaded."
+"As an example, the sources for your distribution could look like this in one-"
+"line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
+"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"

 msgstr ""
 msgstr ""

-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> により、どのアーキテクチャ情報をダウンロードするか指"
-"定します。このオプションを指定していないと、<literal>APT::Architectures</"
-"literal> オプションに定義してある、全アーキテクチャをダウンロードします。"
+"例として、あなたのディストリビューション用のソースは、1 行スタイル形式で次の"
+"ようになります: <placeholder type=\"literallayout\" id=\"0\"/> または deb822 "
+"スタイル形式でこのようになります: <placeholder type=\"literallayout\" id="
+"\"1\"/>"
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml
+msgid "The deb and deb-src types: Options"
+msgstr "deb および deb-src タイプ: オプション"
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"Each source entry can have options specified to modify which source is "
+"accessed and how data is acquired from it. Format, syntax and names of the "
+"options vary between the one-line-style and deb822-style formats as "
+"described, but they both have the same options available. For simplicity we "
+"list the deb822 fieldname and provide the one-line name in brackets.  "
+"Remember that besides setting multivalue options explicitly, there is also "
+"the option to modify them based on the default, but we aren't listing those "
+"names explicitly here. Unsupported options are silently ignored by all APT "
+"versions."
+msgstr ""
+"各取得元エントリは、アクセスされる取得元や取得されるデータを変更するために指"
+"定するオプションを持つことができます。オプションの形式、構文と名前は、記載さ"
+"れているように 1 行スタイルと deb822 スタイルの間で異なりますが、どちらも同じ"
+"オプションが用意されています。簡単にするために、deb822 フィールド名を一覧表示"
+"し、カッコ内に 1 行の名前を提供します。明示的に複数の値を持つオプションを設定"
+"する以外に、デフォルトをベースに変更するためのオプションもあることを忘れない"
+"でください。ここでは明示的にそれらの名前はリストしていません。サポートされて"
+"いないオプションは、すべての APT バージョンで黙って無視されます。"

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

-#: sources.list.5.xml:144
+#: sources.list.5.xml

 msgid ""
 msgid ""

-"<literal>trusted=yes</literal> can be set to indicate that packages from "
-"this source are always authenticated even if the <filename>Release</"
-"filename> file is not signed or the signature can't be checked. This "
-"disables parts of &apt-secure; and should therefore only be used in a local "
-"and trusted context. <literal>trusted=no</literal> is the opposite which "
-"handles even correctly authenticated sources as not authenticated."
+"<option>Architectures</option> (<option>arch</option>) is a multivalue "
+"option defining for which architectures information should be downloaded. If "
+"this option isn't set the default is all architectures as defined by the "
+"<option>APT::Architectures</option> config option."

 msgstr ""
 msgstr ""

-"<literal>trusted=yes</literal> により、<filename>Release</filename> ファイル"
-"が未署名だったり、署名がチェックできなかったりしても、この取得元からのパッ"
-"ケージを常に認証すると指定します。これは &apt-secure; の一部を無効にしてしま"
-"うため、ローカルで信頼できる場合にのみ、使用するようにしてください。"
-"<literal>trusted=no</literal> は反対に、正しく認証された取得元であっても、未"
-"認証として扱います。"
+"<option>Architectures</option> (<option>arch</option>) は複数の値を持つオプ"
+"ションで、どのアーキテクチャ情報をダウンロードするか指定します。このオプショ"
+"ンを指定しないと、<option>APT::Architectures</option> 設定オプションに定義し"
+"てあるすべてのアーキテクチャをダウンロードします。"

 
 

-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:151
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml

 msgid ""
 msgid ""

-"It is important to list sources in order of preference, with the most "
-"preferred source listed first. Typically this will result in sorting by "
-"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
-"followed by distant Internet hosts, for example)."
+"<option>Languages</option> (<option>lang</option>) is a multivalue option "
+"defining for which languages information such as translated package "
+"descriptions should be downloaded.  If this option isn't set the default is "
+"all languages as defined by the <option>Acquire::Languages</option> config "
+"option."

 msgstr ""
 msgstr ""

-"最優先する取得元を最初に記述するというように、優先順に取得元を記述するのは重"
-"要です。一般的には、スピードの速い順に並べることになる (例えば、CD-ROM に続い"
-"てローカルネットワークのホスト、さらに続いて彼方のインターネットホスト) で"
-"しょう。"
+"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> により、どのアーキテクチャ情報をダウンロードするか指"
+"定します。このオプションを指定しないと、<literal>APT::Architectures</"
+"literal> オプションに定義してある全アーキテクチャをダウンロードします。"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "<option>Targets</option> (<option>target</option>) is a multivalue option "
+#| "defining which download targets apt will try to acquire from this source. "
+#| "If not specified, the default set is defined by the <option>Acquire::"
+#| "IndexTargets</option> configuration scope.  Additionally, specific "
+#| "targets can be enabled or disabled by using the identifier as field name "
+#| "instead of using this multivalue option."
+msgid ""
+"<option>Targets</option> (<option>target</option>) is a multivalue option "
+"defining which download targets apt will try to acquire from this source. If "
+"not specified, the default set is defined by the <option>Acquire::"
+"IndexTargets</option> configuration scope (targets are specified by their "
+"name in the <literal>Created-By</literal> field).  Additionally, targets can "
+"be enabled or disabled by using the <literal>Identifier</literal> field as "
+"an option with a boolean value instead of using this multivalue option."
+msgstr ""
+"<option>Targets</option> (<option>target</option>) は、apt が取得元から取得し"
+"ようとするダウンロードターゲットを定義する複数の値を持つオプションです。指定"
+"しない場合、デフォルトセットは、<option>Acquire::IndexTargets</option> 設定ス"
+"コープで定義されます。さらに、具体的なターゲットは、この複数の値を持つオプ"
+"ションの使用の代わりにフィールド名など識別子を使用して有効または無効にするこ"
+"とができます。"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>PDiffs</option> (<option>pdiffs</option>)  is a yes/no value which "
+"controls if APT should try to use PDiffs to update old indexes instead of "
+"downloading the new indexes entirely. The value of this option is ignored if "
+"the repository doesn't announce the availability of PDiffs.  Defaults to the "
+"value of the option with the same name for a specific index file defined in "
+"the <option>Acquire::IndexTargets</option> scope, which itself defaults to "
+"the value of configuration option <option>Acquire::PDiffs</option> which "
+"defaults to <literal>yes</literal>."
+msgstr ""
+"<option>PDiffs</option> (<option>pdiffs</option>) は、新しいインデックスを完"
+"全にダウンロードする代わりに、古いインデックスを更新するため PDiffs を使用す"
+"るかどうかを制御する yes/no 値です。レポジトリが PDiffs の提供を公開していな"
+"い場合は、このオプションの値は無視されます。<option>Acquire::IndexTargets</"
+"option> スコープ中に定義された特定のインデックスファイル用の同じ名前のオプ"
+"ション値がデフォルトになり、設定オプション <option>Acquire::PDiffs</option> "
+"のデフォルト値は <literal>yes</literal> です。"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>By-Hash</option> (<option>by-hash</option>)  can have the value "
+"<literal>yes</literal>, <literal>no</literal> or <literal>force</literal> "
+"and controls if APT should try to acquire indexes via a URI constructed from "
+"a hashsum of the expected file instead of using the well-known stable "
+"filename of the index. Using this can avoid hashsum mismatches, but requires "
+"a supporting mirror. A <literal>yes</literal> or <literal>no</literal> value "
+"activates/disables the use of this feature if this source indicates support "
+"for it, while <literal>force</literal> will enable the feature regardless of "
+"what the source indicates. Defaults to the value of the option of the same "
+"name for a specific index file defined in the <option>Acquire::IndexTargets</"
+"option> scope, which itself defaults to the value of configuration option "
+"<option>Acquire::By-Hash</option> which defaults to <literal>yes</literal>."
+msgstr ""
+"<option>By-Hash</option> (<option>by-hash</option>) は、<literal>yes</"
+"literal>、<literal>no</literal> または <literal>force</literal> の値を持つこ"
+"とができます。そして、APT がインデックスのよく知られた安定版の名前を使用する"
+"代わりに、期待されるファイルのハッシュ値から構築された URI を経由してインデッ"
+"クスを取得するかどうかを制御します。これを使用すると、ハッシュ値の不一致を避"
+"けることができますが、ミラーのサポートを必要とします。この取得元がそのサポー"
+"トを示す場合、<literal>yes</literal> または <literal>no</literal> の値は、こ"
+"の機能の使用を有効化/無効化します。<literal>force</literal> は取得元が示すも"
+"のに関係なく、機能を有効にします。<option>Acquire::IndexTargets</option> ス"
+"コープ中に定義された特定のインデックスファイル用の同じ名前のオプション値がデ"
+"フォルトになり、設定オプション <option>Acquire::By-Hash</option> のデフォルト"
+"値は <literal>yes</literal> です。"

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

-#: sources.list.5.xml:156
-msgid "Some examples:"
-msgstr "例:"
+#: sources.list.5.xml
+msgid ""
+"Furthermore, there are options which if set affect <emphasis>all</emphasis> "
+"sources with the same URI and Suite, so they have to be set on all such "
+"entries and can not be varied between different components. APT will try to "
+"detect and error out on such anomalies."
+msgstr ""
+"さらに、設定が同じ URI とスイートの<emphasis>すべて</emphasis>の取得元に影響"
+"する場合のオプションがあり、このようなすべてのエントリに設定する必要があり、"
+"異なる要素間で変化することができません。APT はこのような異常を検出してエラー"
+"出力しようとします。"

 
 

-#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:158
-#, no-wrap
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml

 msgid ""
 msgid ""

-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-"   "
+"<option>Allow-Insecure</option> (<option>allow-insecure</option>), "
+"<option>Allow-Weak</option> (<option>allow-weak</option>) and <option>Allow-"
+"Downgrade-To-Insecure</option> (<option>allow-downgrade-to-insecure</"
+"option>)  are boolean values which all default to <literal>no</literal>.  If "
+"set to <literal>yes</literal> they circumvent parts of &apt-secure; and "
+"should therefore not be used lightly!"

 msgstr ""
 msgstr ""

-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
-"   "
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
+"which defaults to APT deciding if a source is considered trusted or if "
+"warnings should be raised before e.g.  packages are installed from this "
+"source. This option can be used to override that decision. The value "
+"<literal>yes</literal> tells APT always to consider this source as trusted, "
+"even if it doesn't pass authentication checks. It disables parts of &apt-"
+"secure;, and should therefore only be used in a local and trusted context "
+"(if at all) as otherwise security is breached. The value <literal>no</"
+"literal> does the opposite, causing the source to be handled as untrusted "
+"even if the authentication checks passed successfully. The default value "
+"can't be set explicitly."
+msgstr ""
+"<option>Trusted</option> (<option>trusted</option>) は、APT の判断のデフォル"
+"トのトライステート値で、取得元が信頼できる、以前警告が発生した (例えば、パッ"
+"ケージをこの取得元からインストールしたときに)、信頼できないの 3 値です。この"
+"オプションは、APT の決定を上書きするために使用することができます。値 "
+"<literal>yes</literal> は、それが認証チェックに合格しない場合であっても、この"
+"取得元が信頼できると考えられることを常に APT に伝えます。&apt-secure; の一部"
+"を無効にするので、(すべてであれば) ローカルおよび信頼されたコンテキストでのみ"
+"使用するべきです。そうしなければ、セキュリティが破られます。値 <literal>no</"
+"literal> は反対のことを行います。認証チェックに合格した場合でも取得元を信頼で"
+"きないとして扱います。デフォルト値は明示的に設定することはできません。"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
+#| "absolute path to a keyring file (has to be accessible and readable for "
+#| "the <literal>_apt</literal> user, so ensure everyone has read-permissions "
+#| "on the file) or a fingerprint of a key either in the <filename>trusted."
+#| "gpg</filename> keyring or in one of the keyrings in the <filename>trusted."
+#| "gpg.d/</filename> directory (see <command>apt-key fingerprint</command>). "
+#| "If the option is set, only the key(s) in this keyring or only the key "
+#| "with this fingerprint is used for the &apt-secure; verification of this "
+#| "repository. Otherwise all keys in the trusted keyrings are considered "
+#| "valid signers for this repository."
+msgid ""
+"<option>Signed-By</option> (<option>signed-by</option>)  is either an "
+"absolute path to a keyring file (has to be accessible and readable for the "
+"<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
+"file) or one or more fingerprints of keys either in the <filename>trusted."
+"gpg</filename> keyring or in the keyrings in the <filename>trusted.gpg.d/</"
+"filename> directory (see <command>apt-key fingerprint</command>). If the "
+"option is set, only the key(s) in this keyring or only the keys with these "
+"fingerprints are used for the &apt-secure; verification of this repository. "
+"Defaults to the value of the option with the same name if set in the "
+"previously acquired <filename>Release</filename> file.  Otherwise all keys "
+"in the trusted keyrings are considered valid signers for this repository."
+msgstr ""
+"<option>Signed-By</option> (<option>signed-by</option>) は、(<literal>_apt</"
+"literal> ユーザがアクセス可能かつ読み取り可能な必要があり、つまりすべてのユー"
+"ザがファイルの読み取り権限を持っている) キーリングファイルへの絶対パスまたは "
+"<filename>trusted.gpg</filename> キーリング中または <filename>trusted.gpg.d/"
+"</filename> ディレクトリ中のキーリングの一つのいずれかのキーのフィンガープリ"
+"ントです (<command>apt-key fingerprint</command> を参照)。オプションが設定さ"
+"れている場合、キーリング中のキーのみまたはこのフィンガープリントのキーのみ"
+"が、このリポジトリの the &apt-secure; 検証で使用されます。それ以外の場合は、"
+"信頼できるキーリング内のすべてのキーは、このリポジトリの有効な署名者とみなさ"
+"れています。"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Check-Valid-Until</option> (<option>check-valid-until</option>)  is "
+"a yes/no value which controls if APT should try to detect replay attacks. A "
+"repository creator can declare a time until which the data provided in the "
+"repository should be considered valid, and if this time is reached, but no "
+"new data is provided, the data is considered expired and an error is "
+"raised.  Besides increasing security, as a malicious attacker can't send old "
+"data forever to prevent a user from upgrading to a new version, this also "
+"helps users identify mirrors which are no longer updated. However, some "
+"repositories such as historic archives are not updated any more by design, "
+"so this check can be disabled by setting this option to <literal>no</"
+"literal>.  Defaults to the value of configuration option <option>Acquire::"
+"Check-Valid-Until</option> which itself defaults to <literal>yes</literal>."
+msgstr ""
+"<option>Check-Valid-Until</option> (<option>check-valid-until</option>) は、"
+"APT がリプレイ攻撃を検出するかどうかを制御する yes/no 値です。リポジトリの作"
+"成者は、リポジトリに提供されたデータが有効とみなされる時間を宣言することがで"
+"きます。そして、この時間に達しているが、新しいデータが提供されていない場合、"
+"データが期限切れになったとみなされ、エラーが発生します。セキュリティを高める"
+"ことに加えて、新しいバージョンにアップグレードするユーザを守るために、悪意の"
+"ある攻撃者が古いデータを永遠に送れないようにすることで、長期間更新されていな"
+"いミラーをユーザが特定するのに役立ちます。しかしながら、歴史的アーカイブな"
+"ど、いくつかのリポジトリは、設計によりこれ以上更新されないので、このオプショ"
+"ンを <literal>no</literal> に設定することで、このチェックを無効にすることがで"
+"きます。設定オプション <option>Acquire::Check-Valid-Until</option> の値がデ"
+"フォルトになり、そのデフォルトは <literal>yes</literal> です。"
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Valid-Until-Min</option> (<option>valid-until-min</option>) and "
+"<option>Valid-Until-Max</option> (<option>valid-until-max</option>) can be "
+"used to raise or lower the time period in seconds in which the data from "
+"this repository is considered valid. -Max can be especially useful if the "
+"repository provides no Valid-Until field on its Release file to set your own "
+"value, while -Min can be used to increase the valid time on seldom updated "
+"(local) mirrors of a more frequently updated but less accessible archive "
+"(which is in the sources.list as well) instead of disabling the check "
+"entirely.  Default to the value of the configuration options "
+"<option>Acquire::Min-ValidTime</option> and <option>Acquire::Max-ValidTime</"
+"option> which are both unset by default."
+msgstr ""
+"<option>Valid-Until-Min</option> (<option>valid-until-min</option>) および "
+"<option>Valid-Until-Max</option> (<option>valid-until-max</option>) は、この"
+"リポジトリからのデータの有効期間 (秒単位) を上げたり下げたりするために使用す"
+"ることができます。リポジトリが独自の値を設定するリリースファイルに Valid-"
+"Until フィールドがないものを提供する場合、-Max は特に有用です。-Min は完全に"
+"チェックを無効にする代わりに (sources.list 同様にある) より頻繁に更新があるミ"
+"ラーの、あまりアクセスされないアーカイブの有効期間を増やすことができます。設"
+"定オプション <option>Acquire::Min-ValidTime</option> および <option>Acquire::"
+"Max-ValidTime</option> の値がデフォルトになり、その両方のデフォルト値は "
+"unset です。"

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

-#: sources.list.5.xml:164
-msgid "URI specification"
+#: sources.list.5.xml
+msgid "URI Specification"

 msgstr "URI の仕様"
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr "URI の仕様"
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:166
+#: sources.list.5.xml

 msgid "The currently recognized URI types are:"
 msgid "The currently recognized URI types are:"

-msgstr "現在認識できる URI タイプは以下のとおりです。"
+msgstr "現在認識できる URI タイプは以下のとおりです:"

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

-#: sources.list.5.xml:170
+#: sources.list.5.xml

 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "


@@ -6667,7 +7808,7 @@ msgstr ""
 "にします。これは NFS マウントやローカルミラーで便利です。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 "にします。これは NFS マウントやローカルミラーで便利です。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:177
+#: sources.list.5.xml

 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."


@@ -6677,7 +7818,7 @@ msgstr ""
 "グラムを使用してください。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 "グラムを使用してください。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:184
+#: sources.list.5.xml

 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"


@@ -6693,7 +7834,7 @@ msgstr ""
 "指定してください。この認証方法は安全ではないことに注意してください。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 "指定してください。この認証方法は安全ではないことに注意してください。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:195
+#: sources.list.5.xml

 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "


@@ -6712,7 +7853,7 @@ msgstr ""
 "す)。設定ファイルで HTTP を利用するプロキシが指定してあっても、無視されます。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 "す)。設定ファイルで HTTP を利用するプロキシが指定してあっても、無視されます。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:207
+#: sources.list.5.xml

 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "


@@ -6724,7 +7865,7 @@ msgstr ""
 "用していて、APT でコピーを行う場合に便利です。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 "用していて、APT でコピーを行う場合に便利です。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:214
+#: sources.list.5.xml

 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "


@@ -6738,12 +7879,12 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>

-#: sources.list.5.xml:221
+#: sources.list.5.xml

 msgid "adding more recognizable URI types"
 msgstr "さらに認識できる URI タイプの追加"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgid "adding more recognizable URI types"
 msgstr "さらに認識できる URI タイプの追加"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:223
+#: sources.list.5.xml

 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"


@@ -6761,44 +7902,86 @@ msgstr ""
 "transport-debtorrent; を参照してください。"
 
 #. type: Content of: <refentry><refsect1><para>
 "transport-debtorrent; を参照してください。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:235
+#: sources.list.5.xml

 msgid ""
 msgid ""

-"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
+"Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "

 "stable/main, stable/contrib, and stable/non-free."
 msgstr ""
 "stable/main, stable/contrib, and stable/non-free."
 msgstr ""

-"/home/jason/debian に格納されている stable/main, stable/contrib, stable/non-"
+"/home/apt/debian に格納されている stable/main, stable/contrib, stable/non-"

 "free 用のローカル (または NFS) アーカイブを使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 "free 用のローカル (または NFS) アーカイブを使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:237
+#: sources.list.5.xml

 #, no-wrap
 #, no-wrap

-msgid "deb file:/home/jason/debian stable main contrib non-free"
-msgstr "deb file:/home/jason/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free"
+msgstr "deb file:/home/apt/debian stable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: stable\n"
+"Components: main contrib non-free"
+msgstr ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: stable\n"
+"Components: main contrib non-free"

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

-#: sources.list.5.xml:239
+#: sources.list.5.xml

 msgid "As above, except this uses the unstable (development) distribution."
 msgstr "上記と同様ですが、不安定版 (開発版) を使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr "上記と同様ですが、不安定版 (開発版) を使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:240
+#: sources.list.5.xml
+#, no-wrap
+msgid "deb file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb file:/home/apt/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml

 #, no-wrap
 #, no-wrap

-msgid "deb file:/home/jason/debian unstable main contrib non-free"
-msgstr "deb file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
+msgstr ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"

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

-#: sources.list.5.xml:242
-msgid "Source line for the above"
-msgstr "上記のソース行は以下のようになります。"
+#: sources.list.5.xml
+msgid "Sources specification for the above."
+msgstr "上記のソースの指定は以下のようになります。"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb-src file:/home/apt/debian unstable main contrib non-free"

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

-#: sources.list.5.xml:243
+#: sources.list.5.xml

 #, no-wrap
 #, no-wrap

-msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
-msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb-src\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
+msgstr ""
+"Types: deb-src\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"

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

-#: sources.list.5.xml:245
+#: sources.list.5.xml

 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "


@@ -6809,17 +7992,43 @@ msgstr ""
 "<literal>armel</literal> アーキテクチャのパッケージ情報を取得します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 "<literal>armel</literal> アーキテクチャのパッケージ情報を取得します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:247
+#: sources.list.5.xml

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"deb http://ftp.debian.org/debian &stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"

 msgstr ""
 msgstr ""

-"deb http://ftp.debian.org/debian &stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: http://deb.debian.org/debian\n"
+"Suites: &debian-stable-codename;\n"
+"Components: main\n"
+"\n"
+"Types: deb\n"
+"URIs: http://deb.debian.org/debian\n"
+"Suites: &debian-stable-codename;\n"
+"Components: main\n"
+"Architectures: amd64 armel\n"
+msgstr ""
+"Types: deb\n"
+"URIs: http://deb.debian.org/debian\n"
+"Suites: &debian-stable-codename;\n"
+"Components: main\n"
+"\n"
+"Types: deb\n"
+"URIs: http://deb.debian.org/debian\n"
+"Suites: &debian-stable-codename;\n"
+"Components: main\n"
+"Architectures: amd64 armel\n"

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

-#: sources.list.5.xml:250
+#: sources.list.5.xml

 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."


@@ -6828,28 +8037,56 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 "す。"
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:252
+#: sources.list.5.xml

 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 

+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: http://archive.debian.org/debian-archive\n"
+"Suites: hamm\n"
+"Components: main"
+msgstr ""
+"Types: deb\n"
+"URIs: http://archive.debian.org/debian-archive\n"
+"Suites: hamm\n"
+"Components: main"
+

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

-#: sources.list.5.xml:254
+#: sources.list.5.xml

 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "

-"directory, and uses only the &stable-codename;/contrib area."
+"directory, and uses only the &debian-stable-codename;/contrib area."

 msgstr ""
 "ftp.debian.org のアーカイブに FTP アクセスし、debian ディレクトリ以下の "
 msgstr ""
 "ftp.debian.org のアーカイブに FTP アクセスし、debian ディレクトリ以下の "

-"&stable-codename;/contrib のみを使用します。"
+"&debian-stable-codename;/contrib のみを使用します。"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"

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

-#: sources.list.5.xml:256
+#: sources.list.5.xml

 #, no-wrap
 #, no-wrap

-msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
-msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: &debian-stable-codename;\n"
+"Components: contrib"
+msgstr ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: &debian-stable-codename;\n"
+"Components: contrib"

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

-#: sources.list.5.xml:258
+#: sources.list.5.xml

 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "


@@ -6862,19 +8099,45 @@ msgstr ""
 "つだけになります。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 "つだけになります。"
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:262
+#: sources.list.5.xml

 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 

+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: unstable\n"
+"Components: contrib"
+msgstr ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: unstable\n"
+"Components: contrib"
+

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

-#: sources.list.5.xml:271
+#: sources.list.5.xml

 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 

+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: http://ftp.tlh.debian.org/universe\n"
+"Suites: unstable/binary-$(ARCH)/"
+msgstr ""
+"Types: deb\n"
+"URIs: http://ftp.tlh.debian.org/universe\n"
+"Suites: unstable/binary-$(ARCH)/"
+

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

-#: sources.list.5.xml:264
+#: sources.list.5.xml

 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"


@@ -6882,7 +8145,7 @@ msgid ""
 "amd64, and so forth for other supported architectures. [Note this example "
 "only illustrates how to use the substitution variable; official debian "
 "archives are not structured like this] <placeholder type=\"literallayout\" "
 "amd64, and so forth for other supported architectures. [Note this example "
 "only illustrates how to use the substitution variable; official debian "
 "archives are not structured like this] <placeholder type=\"literallayout\" "

-"id=\"0\"/>"
+"id=\"0\"/> <placeholder type=\"literallayout\" id=\"1\"/>"

 msgstr ""
 "ftp.tlh.debian.org のアーカイブに HTTP アクセスし、universe ディレクトリ以下"
 "を使用します。また、i386 マシンでは <filename>unstable/binary-i386</"
 msgstr ""
 "ftp.tlh.debian.org のアーカイブに HTTP アクセスし、universe ディレクトリ以下"
 "を使用します。また、i386 マシンでは <filename>unstable/binary-i386</"


@@ -6890,20 +8153,64 @@ msgstr ""
 "amd64</filename> 以下にあるファイル、その他サポートするアーキテクチャごとの"
 "ファイルのみ使用します。[このサンプルは変数展開の使用法の説明でしかないことに"
 "注意してください。公式 debian アーカイブはこのような構造になっていません] "
 "amd64</filename> 以下にあるファイル、その他サポートするアーキテクチャごとの"
 "ファイルのみ使用します。[このサンプルは変数展開の使用法の説明でしかないことに"
 "注意してください。公式 debian アーカイブはこのような構造になっていません] "

-"<placeholder type=\"literallayout\" id=\"0\"/>"
+"<placeholder type=\"literallayout\" id=\"0\"/> <placeholder type="
+"\"literallayout\" id=\"1\"/>"

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

-#: sources.list.5.xml:276
-msgid "&apt-cache; &apt-conf;"
-msgstr "&apt-cache; &apt-conf;"
+#: sources.list.5.xml
+msgid ""
+"Uses HTTP to get binary packages as well as sources from the stable, testing "
+"and unstable suites and the components main and contrib."
+msgstr ""
+"安定版、テスト版、不安定版スイートからバイナリパッケージやソース、およびmain "
+"と contrib コンポーネントを入手するため HTTP を使用しています。"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid ""
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
+msgstr ""
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid ""
+"Types: deb deb-src\n"
+"URIs: http://deb.debian.org/debian\n"
+"Suites: stable testing unstable\n"
+"Components: main contrib\n"
+msgstr ""
+"Types: deb deb-src\n"
+"URIs: http://deb.debian.org/debian\n"
+"Suites: stable testing unstable\n"
+"Components: main contrib\n"
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+#, fuzzy
+#| msgid "&apt-cache;, &apt-config;, &apt-preferences;."
+msgid "&apt-get;, &apt-conf;, &apt-acquire-additional-files;"
+msgstr "&apt-cache;, &apt-config;, &apt-preferences;."

 
 #. type: Content of: <refentry><refmeta><manvolnum>
 
 #. type: Content of: <refentry><refmeta><manvolnum>

-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml

 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml

 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"


@@ -6912,7 +8219,7 @@ msgstr ""
 "るユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
 "るユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml

 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "


@@ -6926,27 +8233,27 @@ msgstr ""
 "ぞれに対し、以下の形式で 1 行ずつ出力します。"
 
 #. type: Content of: <refentry><refsect1><para>
 "ぞれに対し、以下の形式で 1 行ずつ出力します。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml

 msgid "package version template-file config-script"
 msgstr "package version template-file config-script"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "package version template-file config-script"
 msgstr "package version template-file config-script"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml

 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
 "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
 "(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "

-"filenames of the form <filename>package.template.XXXX</filename> and "
-"<filename>package.config.XXXX</filename>"
+"filenames of the form <filename>package.template.XXXXXX</filename> and "
+"<filename>package.config.XXXXXX</filename>"

 msgstr ""
 "テンプレートファイルや、設定スクリプトは、<option>-t</option> や <option>--"
 "tempdir</option> で指定した一時ディレクトリ (<literal>APT::ExtractTemplates::"
 "TempDir</literal>) に書き出され、ファイル名は、<filename>package.template."
 msgstr ""
 "テンプレートファイルや、設定スクリプトは、<option>-t</option> や <option>--"
 "tempdir</option> で指定した一時ディレクトリ (<literal>APT::ExtractTemplates::"
 "TempDir</literal>) に書き出され、ファイル名は、<filename>package.template."

-"XXXX</filename> や <filename>package.config.XXXX</filename> といった形になり"
-"ます。"
+"XXXXXX</filename> や <filename>package.config.XXXXXX</filename> といった形に"
+"ã\81ªã\82\8aã\81¾ã\81\99ã\80\82"

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

-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml

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


@@ -6957,7 +8264,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><para>
 "literal>"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml

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


@@ -6966,12 +8273,12 @@ msgstr ""
 "には十進の 100 を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 "には十進の 100 を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml

 msgid "Utility to sort package index files"
 msgstr "パッケージインデックスファイルのソートユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Utility to sort package index files"
 msgstr "パッケージインデックスファイルのソートユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml

 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (source index or "
 "package index) and sort the records so that they are ordered by the package "
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (source index or "
 "package index) and sort the records so that they are ordered by the package "


@@ -6983,14 +8290,14 @@ msgstr ""
 "また、内部のソート規則に従って、内部フィールドについてもソートを行います。"
 
 #. type: Content of: <refentry><refsect1><para>
 "また、内部のソート規則に従って、内部フィールドについてもソートを行います。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml

 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 "出力はすべて標準出力に送られ、入力は検索できるファイルでなければなりません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 "出力はすべて標準出力に送られ、入力は検索できるファイルでなければなりません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml

 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."


@@ -6999,7 +8306,7 @@ msgstr ""
 "<literal>APT::SortPkgs::Source</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
 "<literal>APT::SortPkgs::Source</literal>"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml

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


@@ -7008,12 +8315,12 @@ msgstr ""
 "の 100 を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 "の 100 を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml

 msgid "Utility to generate index files"
 msgstr "インデックスファイル生成ユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Utility to generate index files"
 msgstr "インデックスファイル生成ユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml

 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "


@@ -7025,7 +8332,7 @@ msgstr ""
 "は、元のサイトの内容に基づき生成されるべきです。"
 
 #. type: Content of: <refentry><refsect1><para>
 "は、元のサイトの内容に基づき生成されるべきです。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml

 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"


@@ -7039,7 +8346,7 @@ msgstr ""
 "全なアーカイブの生成プロセス「スクリプト」である綿密な手段を含んでいます。"
 
 #. type: Content of: <refentry><refsect1><para>
 "全なアーカイブの生成プロセス「スクリプト」である綿密な手段を含んでいます。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml

 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "


@@ -7053,7 +8360,7 @@ msgstr ""
 "望した圧縮出力ファイルの作成を自動的に実行します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "望した圧縮出力ファイルの作成を自動的に実行します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml

 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "


@@ -7066,13 +8373,13 @@ msgstr ""
 "とほぼ同じです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "とほぼ同じです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml

 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr "<option>--db</option> オプションで、キャッシュ DB を指定できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr "<option>--db</option> オプションで、キャッシュ DB を指定できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml

 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "


@@ -7085,7 +8392,7 @@ msgstr ""
 "は、&dpkg-scansources; とほぼ同じです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "は、&dpkg-scansources; とほぼ同じです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml

 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "


@@ -7096,7 +8403,7 @@ msgstr ""
 "override オプションを使用します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "override オプションを使用します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml

 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "


@@ -7113,18 +8420,32 @@ msgstr ""
 "で出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "で出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml
+#, fuzzy
+#| msgid ""
+#| "The <literal>release</literal> command generates a Release file from a "
+#| "directory tree. It recursively searches the given directory for "
+#| "uncompressed <filename>Packages</filename> and <filename>Sources</"
+#| "filename> files and ones compressed with <command>gzip</command>, "
+#| "<command>bzip2</command> or <command>lzma</command> as well as "
+#| "<filename>Release</filename> and <filename>md5sum.txt</filename> files by "
+#| "default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>). "
+#| "Additional filename patterns can be added by listing them in "
+#| "<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
+#| "stdout a <filename>Release</filename> file containing (by default) an "
+#| "MD5, SHA1, SHA256 and SHA512 digest for each file."

 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "

-"<filename>Packages</filename> and <filename>Sources</filename> files and "
-"ones compressed with <command>gzip</command>, <command>bzip2</command> or "
-"<command>lzma</command> as well as <filename>Release</filename> and "
-"<filename>md5sum.txt</filename> files by default (<literal>APT::FTPArchive::"
-"Release::Default-Patterns</literal>). Additional filename patterns can be "
-"added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
-"literal>.  It then writes to stdout a <filename>Release</filename> file "
-"containing an MD5, SHA1 and SHA256 digest for each file."
+"and compressed <filename>Packages</filename>, <filename>Sources</filename>, "
+"<filename>Contents</filename>, <filename>Components</filename> and "
+"<filename>icons</filename> files as well as <filename>Release</filename>, "
+"<filename>Index</filename> and <filename>md5sum.txt</filename> files by "
+"default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>).  "
+"Additional filename patterns can be added by listing them in <literal>APT::"
+"FTPArchive::Release::Patterns</literal>.  It then writes to stdout a "
+"<filename>Release</filename> file containing (by default) an MD5, SHA1, "
+"SHA256 and SHA512 digest for each file."

 msgstr ""
 "<literal>release</literal> コマンドは、ディレクトリツリーから Release ファイ"
 "ルを生成します。与えたディレクトリを再帰的に検索し、未圧縮の "
 msgstr ""
 "<literal>release</literal> コマンドは、ディレクトリツリーから Release ファイ"
 "ルを生成します。与えたディレクトリを再帰的に検索し、未圧縮の "


@@ -7134,21 +8455,31 @@ msgstr ""
 "や <filename>md5sum.txt</filename> ファイルをデフォルト (<literal>APT::"
 "FTPArchive::Release::Default-Patterns</literal>) で探します。また "
 "<literal>APT::FTPArchive::Release::Patterns</literal> に列挙して、さらにファ"
 "や <filename>md5sum.txt</filename> ファイルをデフォルト (<literal>APT::"
 "FTPArchive::Release::Default-Patterns</literal>) で探します。また "
 "<literal>APT::FTPArchive::Release::Patterns</literal> に列挙して、さらにファ"

-"イル名のパターンを追加できます。その後、MD5, SHA1, SHA256 の各ダイジェストを"
-"ファイルごとに格納した <filename>Release</filename> ファイルを標準出力に書き"
-"出します。"
+"イル名のパターンを追加できます。その後、(デフォルトで) MD5, SHA1, SHA256 と "
+"SHA512 の各ダイジェストをファイルごとに格納した <filename>Release</filename> "
+"ファイルを標準出力に書き出します。"

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

-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml
+#, fuzzy
+#| msgid ""
+#| "Values for the additional metadata fields in the Release file are taken "
+#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
+#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
+#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
+#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
+#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
+#| "literal>, <literal>Description</literal>."

 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"

-"literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
-"supported fields are: <literal>Origin</literal>, <literal>Label</literal>, "
+"literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The "
+"supported fields are <literal>Origin</literal>, <literal>Label</literal>, "

 "<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
 "literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
 "<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
 "literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "

-"<literal>Architectures</literal>, <literal>Components</literal>, "
-"<literal>Description</literal>."
+"<literal>Signed-By</literal>, <literal>Architectures</literal>, "
+"<literal>Components</literal> and <literal>Description</literal>."

 msgstr ""
 "Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::"
 "Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::"
 msgstr ""
 "Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::"
 "Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::"


@@ -7159,7 +8490,7 @@ msgstr ""
 "<literal>Components</literal>, <literal>Description</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>Components</literal>, <literal>Description</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml

 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "


@@ -7173,7 +8504,7 @@ msgstr ""
 "のディレクトリから作成するかを指定する、柔軟な方法を提供します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "のディレクトリから作成するかを指定する、柔軟な方法を提供します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml

 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."


@@ -7182,12 +8513,12 @@ msgstr ""
 "もう必要ないレコードを削除して整理します。"
 
 #. type: Content of: <refentry><refsect1><title>
 "もう必要ないレコードを削除して整理します。"
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml

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

-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml

 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "


@@ -7204,7 +8535,7 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><para>
 "す。"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml

 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""


@@ -7212,12 +8543,12 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "す。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml

 msgid "<literal>Dir</literal> Section"
 msgstr "<literal>Dir</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "<literal>Dir</literal> Section"
 msgstr "<literal>Dir</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml

 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "


@@ -7229,7 +8560,7 @@ 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:155
+#: apt-ftparchive.1.xml

 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "


@@ -7239,17 +8570,17 @@ msgstr ""
 "リには <filename>ls-LR</filename> と dist ノードがあります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "リには <filename>ls-LR</filename> と dist ノードがあります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml

 msgid "Specifies the location of the override files."
 msgstr "オーバーライドファイルの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Specifies the location of the override files."
 msgstr "オーバーライドファイルの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml

 msgid "Specifies the location of the cache files."
 msgstr "キャッシュファイルの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Specifies the location of the cache files."
 msgstr "キャッシュファイルの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml

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


@@ -7258,12 +8589,12 @@ msgstr ""
 "ファイルの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "ファイルの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml

 msgid "<literal>Default</literal> Section"
 msgstr "<literal>Default</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "<literal>Default</literal> Section"
 msgstr "<literal>Default</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml

 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "


@@ -7274,19 +8605,25 @@ 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:186
+#: apt-ftparchive.1.xml
+#, fuzzy
+#| 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 compression), 'gzip' and 'bzip2'. The default for all compression "
+#| "schemes is '. gzip'."

 msgid ""
 "Sets the default compression schemes to use for the package index files. It "
 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 "
-"compression), 'gzip' and 'bzip2'. The default for all compression schemes is "
-"'. gzip'."
+"is a string that contains a space separated list of at least one of the "
+"compressors configured via the <option>APT::Compressor</option> "
+"configuration scope.  The default for all compression schemes is '. gzip'."

 msgstr ""
 "パッケージインデックスファイルのデフォルト圧縮方法を設定します。少なくとも "
 "'.' (圧縮なし), 'gzip', 'bzip2' のどれかが入る、空白区切りの文字列です。圧縮"
 "方法のデフォルトはすべて '. gzip' です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgstr ""
 "パッケージインデックスファイルのデフォルト圧縮方法を設定します。少なくとも "
 "'.' (圧縮なし), 'gzip', 'bzip2' のどれかが入る、空白区切りの文字列です。圧縮"
 "方法のデフォルトはすべて '. gzip' です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml

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


@@ -7295,7 +8632,7 @@ msgstr ""
 "deb' です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "deb' です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml

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


@@ -7304,7 +8641,7 @@ 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:206
+#: apt-ftparchive.1.xml

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


@@ -7313,7 +8650,7 @@ 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:212
+#: apt-ftparchive.1.xml

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


@@ -7322,7 +8659,7 @@ 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:218
+#: apt-ftparchive.1.xml

 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."


@@ -7331,7 +8668,7 @@ 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:224
+#: apt-ftparchive.1.xml

 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"


@@ -7342,7 +8679,7 @@ 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:231
+#: apt-ftparchive.1.xml

 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."


@@ -7351,7 +8688,7 @@ msgstr ""
 "インデックスファイルは、umask を無視してこのモードを使用します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "インデックスファイルは、umask を無視してこのモードを使用します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml

 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "


@@ -7361,12 +8698,12 @@ msgstr ""
 "<filename>Translation-en</filename> ファイルに分割するかを指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "<filename>Translation-en</filename> ファイルに分割するかを指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml

 msgid "<literal>TreeDefault</literal> Section"
 msgstr "<literal>TreeDefault</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "<literal>TreeDefault</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml

 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "


@@ -7377,7 +8714,7 @@ 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:253
+#: apt-ftparchive.1.xml

 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "


@@ -7387,7 +8724,7 @@ 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:260
+#: apt-ftparchive.1.xml

 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "


@@ -7403,7 +8740,7 @@ msgstr ""
 "き、少なくとも新しいファイルが必要です。デフォルトは 10 で、単位は日です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "き、少なくとも新しいファイルが必要です。デフォルトは 10 で、単位は日です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml

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


@@ -7412,7 +8749,7 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "$(SECTION)/binary-$(ARCH)/</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml

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


@@ -7421,7 +8758,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/source/</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "$(DIST)/$(SECTION)/source/</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml

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


@@ -7430,7 +8767,7 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/Packages</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "$(SECTION)/binary-$(ARCH)/Packages</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml

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


@@ -7439,7 +8776,7 @@ msgstr ""
 "$(SECTION)/source/Sources</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "$(SECTION)/source/Sources</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml

 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"


@@ -7450,7 +8787,7 @@ msgstr ""
 "$(SECTION)/i18n/Translation-en</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "$(SECTION)/i18n/Translation-en</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"


@@ -7460,7 +8797,7 @@ msgstr ""
 "設定します。デフォルトは、<filename>$(DIST)/$(SECTION)/</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "設定します。デフォルトは、<filename>$(DIST)/$(SECTION)/</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml

 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "


@@ -7474,12 +8811,12 @@ msgstr ""
 "ftparchive</command> は自動でパッケージファイルをまとめます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "ftparchive</command> は自動でパッケージファイルをまとめます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml

 msgid "Sets header file to prepend to the contents output."
 msgstr "contents の出力に付けるヘッダファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets header file to prepend to the contents output."
 msgstr "contents の出力に付けるヘッダファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml

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


@@ -7488,7 +8825,7 @@ 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:329
+#: apt-ftparchive.1.xml

 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "


@@ -7499,7 +8836,7 @@ 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:336
+#: apt-ftparchive.1.xml

 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "


@@ -7511,12 +8848,12 @@ msgstr ""
 "トリが先頭につきます。ソースインデックスを処理する際に使用します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "トリが先頭につきます。ソースインデックスを処理する際に使用します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml

 msgid "<literal>Tree</literal> Section"
 msgstr "<literal>Tree</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "<literal>Tree</literal> Section"
 msgstr "<literal>Tree</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml

 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "


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

-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml

 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 "
 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/&stable-codename;</filename>."
+"setting such as <filename>dists/&debian-stable-codename;</filename>."

 msgstr ""
 "<literal>Tree</literal> セクションは、<literal>$(DIST)</literal> 変数で設定さ"
 "れているスコープタグをとり、ツリーのルート (<literal>ArchiveDir</literal>が先"
 msgstr ""
 "<literal>Tree</literal> セクションは、<literal>$(DIST)</literal> 変数で設定さ"
 "れているスコープタグをとり、ツリーのルート (<literal>ArchiveDir</literal>が先"

-"頭につくパス) を定義します。通常、この設定は <filename>dists/&stable-"
+"頭につくパス) を定義します。通常、この設定は <filename>dists/&debian-stable-"

 "codename;</filename> のようになります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "codename;</filename> のようになります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml

 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "


@@ -7553,7 +8890,7 @@ msgstr ""
 "い変数と同様に、<literal>Tree</literal> セクションで使用できます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 "い変数と同様に、<literal>Tree</literal> セクションで使用できます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml

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


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

-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml

 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"


@@ -7578,7 +8915,7 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml

 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"


@@ -7588,18 +8925,24 @@ msgstr ""
 "<literal>main contrib non-free</literal> のようになります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "<literal>main contrib non-free</literal> のようになります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml

 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "

-"this tree has a source archive."
-msgstr ""
-"search セクション以下に現れるアーキテクチャを、空白区切りで指定したリストで"
-"す。特殊アーキテクチャ 'source' は、ソースアーカイブのツリーであることを示し"
-"ます。"
+"this tree has a source archive.  The architecture 'all' signals that "
+"architecture specific files like <filename>Packages</filename> should not "
+"include information about architecture <literal>all</literal> packages in "
+"all files as they will be available in a dedicated file."
+msgstr ""
+"検索部の下に表示されるすべてのアーキテクチャの空白区切りリストです。特別な"
+"アーキテクチャ「source」は、このツリーがソースアーカイブを持っていることを示"
+"すために使用されます。アーキテクチャ「all」は、<filename>Packages</filename> "
+"のようなアーキテクチャ固有のファイルがすべてのファイル中のアーキテクチャ "
+"<literal>all</literal> パッケージに関する情報を含まず、専用のファイルで利用で"
+"きることを示します。"

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

-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml

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


@@ -7608,7 +8951,7 @@ 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:396
+#: apt-ftparchive.1.xml

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


@@ -7617,22 +8960,22 @@ 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:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml

 msgid "Sets the binary extra override file."
 msgstr "バイナリ特別オーバーライドファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets the binary extra override file."
 msgstr "バイナリ特別オーバーライドファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml

 msgid "Sets the source extra override file."
 msgstr "ソース特別オーバーライドファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgid "Sets the source extra override file."
 msgstr "ソース特別オーバーライドファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml

 msgid "<literal>BinDirectory</literal> Section"
 msgstr "<literal>BinDirectory</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "<literal>BinDirectory</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml

 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "


@@ -7646,12 +8989,12 @@ msgstr ""
 "<literal>Section</literal><literal>Architecture</literal> 設定に似ています。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "<literal>Section</literal><literal>Architecture</literal> 設定に似ています。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml

 msgid "Sets the Packages file output."
 msgstr "Packages ファイルの出力先を設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets the Packages file output."
 msgstr "Packages ファイルの出力先を設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml

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


@@ -7660,42 +9003,42 @@ msgstr ""
 "か <literal>Sources</literal> のうち、ひとつは必要です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "か <literal>Sources</literal> のうち、ひとつは必要です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml

 msgid "Sets the Contents file output (optional)."
 msgstr "Contents ファイルの出力先を設定します (オプション)。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets the Contents file output (optional)."
 msgstr "Contents ファイルの出力先を設定します (オプション)。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml

 msgid "Sets the binary override file."
 msgstr "バイナリオーバーライドファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets the binary override file."
 msgstr "バイナリオーバーライドファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml

 msgid "Sets the source override file."
 msgstr "ソースオーバーライドファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets the source override file."
 msgstr "ソースオーバーライドファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml

 msgid "Sets the cache DB."
 msgstr "キャッシュ DB を設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets the cache DB."
 msgstr "キャッシュ DB を設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml

 msgid "Appends a path to all the output paths."
 msgstr "全出力パスに付加するパス。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Appends a path to all the output paths."
 msgstr "全出力パスに付加するパス。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml

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

-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml

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

-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml

 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "


@@ -7710,19 +9053,19 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>

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

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

-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml

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

-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml

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


@@ -7739,12 +9082,12 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><title>
 "す。"
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml

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

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

 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "


@@ -7755,12 +9098,12 @@ msgstr ""
 "ケージ名、2 番目のフィールドは割り当てるセクションです。"
 
 #. type: Content of: <refentry><refsect1><title>
 "ケージ名、2 番目のフィールドは割り当てるセクションです。"
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml

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

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

 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "


@@ -7770,7 +9113,7 @@ msgstr ""
 "す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml

 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "


@@ -7780,7 +9123,8 @@ msgid ""
 "<literal><replaceable>Index</replaceable></literal> can be "
 "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
 "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
 "<literal><replaceable>Index</replaceable></literal> can be "
 "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
 "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "

-"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+"<literal>MD5</literal>, <literal>SHA1</literal>, <literal>SHA256</literal> "
+"or <literal>SHA512</literal>."

 msgstr ""
 "与えたチェックサムを生成します。このオプションはデフォルトで on です。off に"
 "すると生成したインデックスファイルには checksum フィールドが含まれません。設"
 msgstr ""
 "与えたチェックサムを生成します。このオプションはデフォルトで on です。off に"
 "すると生成したインデックスファイルには checksum フィールドが含まれません。設"


@@ -7790,10 +9134,11 @@ msgstr ""
 "<literal><replaceable>Index</replaceable></literal> は <literal>Packages</"
 "literal>, <literal>Sources</literal>, <literal>Release</literal> になります。"
 "<literal><replaceable>Checksum</replaceable></literal> は <literal>MD5</"
 "<literal><replaceable>Index</replaceable></literal> は <literal>Packages</"
 "literal>, <literal>Sources</literal>, <literal>Release</literal> になります。"
 "<literal><replaceable>Checksum</replaceable></literal> は <literal>MD5</"

-"literal>, <literal>SHA1</literal>, <literal>SHA256</literal> になります。"
+"literal>, <literal>SHA1</literal>, <literal>SHA256</literal> または "
+"<literal>SHA512</literal> になります。"

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

-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml

 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."


@@ -7802,7 +9147,7 @@ msgstr ""
 "目: <literal>APT::FTPArchive::DB</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "目: <literal>APT::FTPArchive::DB</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml

 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "


@@ -7815,7 +9160,7 @@ msgstr ""
 "<literal>quiet</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>quiet</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml

 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "


@@ -7828,7 +9173,7 @@ msgstr ""
 "<literal>APT::FTPArchive::DeLinkAct</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::FTPArchive::DeLinkAct</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml

 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "


@@ -7843,7 +9188,7 @@ msgstr ""
 "<literal>APT::FTPArchive::Contents</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::FTPArchive::Contents</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml

 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"


@@ -7853,7 +9198,7 @@ msgstr ""
 "選択します。設定項目: <literal>APT::FTPArchive::SourceOverride</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "選択します。設定項目: <literal>APT::FTPArchive::SourceOverride</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml

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


@@ -7862,7 +9207,7 @@ msgstr ""
 "FTPArchive::ReadOnlyDB</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "FTPArchive::ReadOnlyDB</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml

 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "


@@ -7875,7 +9220,7 @@ msgstr ""
 "け付けます。設定項目: <literal>APT::FTPArchive::Architecture</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "け付けます。設定項目: <literal>APT::FTPArchive::Architecture</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml

 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "


@@ -7898,7 +9243,7 @@ msgstr ""
 "加チェックには、意味がありません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "加チェックには、意味がありません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml

 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "


@@ -7913,13 +9258,13 @@ msgstr ""
 "み生成できることに注意してください。"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
 "み生成できることに注意してください。"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>

-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml

 #, 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>
 #, 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>

-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml

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


@@ -7928,7 +9273,7 @@ msgstr ""
 "は、以下のようにします。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
 "は、以下のようにします。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml

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


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

-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "apt"
-msgstr "apt"
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "16 June 1998"
-msgstr "16 June 1998"
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk offline.dbk
+msgid "en"
+msgstr "ja"

 
 

-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "Debian"
-msgstr "Debian"
-
-#. type: SH
-#: apt.8:18
-#, no-wrap
-msgid "NAME"
-msgstr "名前"
-
-#. type: Plain text
-#: apt.8:20
-msgid "apt - Advanced Package Tool"
-msgstr "apt - 高度パッケージツール"
-
-#. type: SH
-#: apt.8:20
-#, no-wrap
-msgid "SYNOPSIS"
-msgstr "書式"
-
-#. type: Plain text
-#: apt.8:22
-msgid "B<apt>"
-msgstr "B<apt>"
-
-#. type: SH
-#: apt.8:22
-#, no-wrap
-msgid "DESCRIPTION"
-msgstr "説明"
-
-#. type: Plain text
-#: apt.8:31
-msgid ""
-"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as "
-"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-"System. Some options are only implemented in B<apt-get>(8)  though."
-msgstr ""
-"APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理のため"
-"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の "
-"B<synaptic>(8) といった、いくつかのフロントエンドが用意されています。いくつか"
-"のオプションは B<apt-get>(8) にしか実装されていません。"
-
-#. type: SH
-#: apt.8:31
-#, no-wrap
-msgid "SEE ALSO"
-msgstr "関連項目"
-
-#. type: Plain text
-#: apt.8:38
-msgid ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-msgstr ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-
-#. type: SH
-#: apt.8:38
-#, no-wrap
-msgid "DIAGNOSTICS"
-msgstr "診断メッセージ"
-
-#. type: Plain text
-#: apt.8:40
-msgid "apt returns zero on normal operation, decimal 100 on error."
-msgstr "apt は正常終了時に 0 を返します。エラー時には十進の 100 を返します。"
-
-#. type: SH
-#: apt.8:40
-#, no-wrap
-msgid "BUGS"
-msgstr "バグ"
-
-#. type: Plain text
-#: apt.8:42
-msgid "This manpage isn't even started."
-msgstr "このマニュアルページは、始まってさえいません。"
-
-#. type: Plain text
-#: apt.8:51
-msgid ""
-"See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-"B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
-"B<reportbug>(1)  command."
-msgstr ""
-"E<lt>http://bugs.debian.org/aptE<gt> をご覧ください。B<apt> のバグを報告する"
-"場合は、I</usr/share/doc/debian/bug-reporting.txt> や B<reportbug>(1) コマン"
-"ドをご覧ください。"
-
-#. type: SH
-#: apt.8:51
-#, no-wrap
-msgid "AUTHOR"
-msgstr "著者"
-
-#. type: Plain text
-#: apt.8:52
-msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
-msgstr ""
-"apt は APT チーム E<lt>apt@packages.debian.orgE<gt> によって書かれました。"
-
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Content of: <book><title>
+#: guide.dbk

 msgid "APT User's Guide"
 msgstr "APT ユーザガイド"
 
 msgid "APT User's Guide"
 msgstr "APT ユーザガイド"
 

-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk offline.dbk
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk offline.dbk
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"

 
 

-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk offline.dbk
+msgid "Version &apt-product-version;"
+msgstr "バージョン &apt-product-version;"

 
 

-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk

 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr "本文書は APT パッケージマネージャの使い方の概要を提供します。"
 
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr "本文書は APT パッケージマネージャの使い方の概要を提供します。"
 

-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk offline.dbk
+msgid "License Notice"
+msgstr "ライセンスについて"

 
 

-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk offline.dbk

 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "


@@ -8094,8 +9337,8 @@ msgstr ""
 "published by the Free Software Foundation; either version 2 of the License, "
 "or (at your option) any later version."
 
 "published by the Free Software Foundation; either version 2 of the License, "
 "or (at your option) any later version."
 

-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk offline.dbk

 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."


@@ -8103,35 +9346,42 @@ msgstr ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
 
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
 

-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk

 msgid "General"
 msgstr "全般"
 
 msgid "General"
 msgstr "全般"
 

-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."

 msgstr ""
 msgstr ""

+"APT パッケージは現在、APT <command>dselect</command> メソッドと <command>apt-"
+"get</command> コマンドラインユーザインターフェイスの2つを収録しています。両方"
+"ともインターネットから新しいパッケージをダウンロードするのと同様、パッケージ"
+"をインストール、削除する方法を提供しています。"

 
 

-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk

 msgid "Anatomy of the Package System"
 msgstr "パッケージシステムの構造"
 
 msgid "Anatomy of the Package System"
 msgstr "パッケージシステムの構造"
 

-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
 "the system. The most prominent of its features is the dependency system."
 msgstr ""
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
 "the system. The most prominent of its features is the dependency system."
 msgstr ""

+"Debian パッケージシステムには各パッケージに関連する膨大な情報があり、システム"
+"に手際良く簡単に統合することを支援します。その最も重要な機能は依存システムで"
+"す。"

 
 

-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "


@@ -8139,27 +9389,40 @@ msgid ""
 "things the average user is required to install. Also, it allows for choices "
 "in mail transport agents, X servers and so on."
 msgstr ""
 "things the average user is required to install. Also, it allows for choices "
 "in mail transport agents, X servers and so on."
 msgstr ""

+"依存システムにより、システムにあるライブラリ等の共有要素を個々のプログラムを"
+"使えるようになります。簡単に言うと、プログラムのうちまれに利用される部分を別"
+"個のパッケージに配置して、平均的ユーザがインストールを必要とするものの数を減"
+"らします。また、メール転送エージェントや X サーバ等の選択ができるようにもなり"
+"ます。"

 
 

-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
 "package requires another package to be installed at the same time to work "
 "properly."
 msgstr ""
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
 "package requires another package to be installed at the same time to work "
 "properly."
 msgstr ""

+"依存システムの理解はまず単純な依存の概念を把握することから始まります。単純な"
+"依存というのは、あるパッケージが適切に機能するためには別のパッケージが同時に"
+"インストールされている必要があるということです。"

 
 

-#. type: <p></p>
-#: guide.sgml:63
+# Translator's NOTE: maybe s/GPGP/GPG/?
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
 "simple dependency on GPG. Also, because it is an emacs extension it has a "
 "simple dependency on emacs, without emacs it is completely useless."
 msgstr ""
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
 "simple dependency on GPG. Also, because it is an emacs extension it has a "
 "simple dependency on emacs, without emacs it is completely useless."
 msgstr ""

+"例えば mailcrypt は emacs を拡張するプログラムで、GPG によるメールの暗号化を"
+"支援します。GPGP がインストールされていなければ mailcrypt は役に立たないので "
+"mailcrypt には GPG に単純に依存しています。また、これは emacs の拡張なので "
+"emacs に単純に依存し、emacs がないと何の役にも立ちません。"

 
 

-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "


@@ -8170,9 +9433,17 @@ msgid ""
 "system so all mail transport agents have a conflicting dependency with all "
 "other mail transport agents."
 msgstr ""
 "system so all mail transport agents have a conflicting dependency with all "
 "other mail transport agents."
 msgstr ""

+"理解しておかないといけないもう一つの重要な依存に競合する依存があります。これ"
+"はあるパッケージが別のパッケージと同時にインストールされていると機能せず、シ"
+"ステムにとってひどく有害なこともあります。例として sendmail や exim、qmail 等"
+"のメール転送エージェントで考えてみましょう。メール転送エージェントはどれも"
+"メールを受け取るのにネットワークを待ち受ける必要があるため、2つインストールす"
+"ることは不可能です。複数インストールするとシステムに重大な被害を与える可能性"
+"があるため、メール転送エージェントはどれも他のあらゆるメール転送エージェント"
+"と競合依存となっています。"

 
 

-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "


@@ -8183,86 +9454,121 @@ msgid ""
 "depend on mail-transport-agent. This can add a great deal of confusion when "
 "trying to manually fix packages."
 msgstr ""
 "depend on mail-transport-agent. This can add a great deal of confusion when "
 "trying to manually fix packages."
 msgstr ""

+"複雑な例としては、別のパッケージのように装うパッケージがあります。exim と "
+"sendmail について見てみると、その多くの目的は同一で、両方ともメールを配送し、"
+"一般的インターフェイスを解釈します。そこで、パッケージシステムにはどちらも "
+"mail-transport-agents だと宣言する方法があります。そうして exim と sendmail "
+"は両方とも mail-transport-agent を提供すると宣言し、他のメール転送エージェン"
+"トを必要とするパッケージは mail-transport-agent に依存します。手作業により"
+"パッケージを修正しようとしたときに多大な混乱が生まれる可能性があります。"

 
 

-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
 "issues by providing a number of automatic algorithms that help in selecting "
 "packages for installation."
 msgstr ""
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
 "issues by providing a number of automatic algorithms that help in selecting "
 "packages for installation."
 msgstr ""

+"既にインストールされている、あるいはされていないパッケージについて、1つの依存"
+"が生まれる可能性は常にあります。APT はインストールするパッケージの選択を支援"
+"する自動化でのアルゴリズムをいくつか提供することで依存問題の解決支援に努めま"
+"す。"

 
 

-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk

 msgid "apt-get"
 msgstr "apt-get"
 
 msgid "apt-get"
 msgstr "apt-get"
 

-#. type: <p></p>
-#: guide.sgml:102
+#. type: Content of: <book><chapter><para>
+#: guide.dbk
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> はコマンドラインからパッケージをインストールする簡"
+"単な方法を提供します。<command>dpkg</command> とは異なり、<command>apt-get</"
+"command> は .deb ファイルを解釈せず、連携するのはパッケージ特有の名前で、イン"
+"ストールできるのは<emphasis>ソース</emphasis>にある .deb アーカイブだけです。"
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"

 msgstr ""
 msgstr ""

+"http プロキシサーバを使っている場合はまず http_proxy 環境変数をセットする必要"
+"があります。sources.list(5) を見てください"

 
 

-#. type: <p></p>
-#: guide.sgml:109
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"

 msgstr ""
 msgstr ""

+"<command>apt-get</command> を使う前にまずやるべきことは<placeholder type="
+"\"footnote\" id=\"0\"/>パッケージ一覧を<emphasis>ソース</emphasis>から取得す"
+"ることで、それにより利用できるパッケージがわかるようになります。これには "
+"<literal>apt-get update</literal> を実行します。例えば"

 
 

-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"

-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"

 msgstr ""
 "# apt-get update\n"
 msgstr ""
 "# apt-get update\n"

-"Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
-"Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
-"Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"取得 http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
+"取得 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"パッケージリストを読み込んでいます... 完了\n"

 
 

-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid "Once updated there are several commands that can be used:"
 msgid "Once updated there are several commands that can be used:"

-msgstr ""
+msgstr "更新後は複数のコマンドを使えます:"

 
 

-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk

 msgid "upgrade"
 msgstr "upgrade"
 
 msgid "upgrade"
 msgstr "upgrade"
 

-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk

 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "

-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
-msgstr ""
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
+msgstr ""
+"upgrade を行うとシステム全体を穏やかにアップグレードします。アップグレードで"
+"は新しいパッケージのインストールや既存のパッケージの削除、アップグレードする"
+"と他のパッケージを破壊する可能性のある場合のそのパッケージのアップグレードは"
+"行いません。これは毎日実行してシステムを比較的安全にアップグレードできます。"
+"upgrade を行うとアップグレードできないパッケージがある場合にその一覧を表示し"
+"ます。これは通常新しいパッケージに依存しているか他のパッケージと競合している"
+"ということになります。<command>dselect</command> や <literal>apt-get "
+"install</literal> を使うとそういったパッケージを強制的にインストールできま"
+"す。"

 
 

-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk

 msgid "install"
 msgstr "install"
 
 msgid "install"
 msgstr "install"
 

-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk

 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "


@@ -8272,236 +9578,349 @@ msgid ""
 "listed packages and will print a summary and ask for confirmation if "
 "anything other than its arguments are changed."
 msgstr ""
 "listed packages and will print a summary and ask for confirmation if "
 "anything other than its arguments are changed."
 msgstr ""

+"install を使ってパッケージを名前によりインストールします。パッケージは自動的"
+"に取得、インストールされます。これはインストールするパッケージの名前が既にわ"
+"かっていて GUI を使って選択したくない場合に有用です。インストールするパッケー"
+"ジはいくらでも指定でき、全て取得されます。install では対象パッケージ一覧から"
+"自動的に依存問題の解決に努めてまとめを提示し、指示以外の変更がある場合は確認"
+"を促します。"

 
 

-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk

 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 

-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk

 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "

-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."

 msgstr ""
 msgstr ""

+"dist-upgrade は完全なアップグレードを行うように設計されていて、Debian のリ"
+"リース間のアップグレードを単純化します。洗練されたアルゴリズムを使って、シス"
+"テムをできるだけ最新のリリースにするためにインストール、アップグレード、削除"
+"する最善のパッケージ群を決定します。状況によっては <command>dselect</"
+"command> で手作業により時間を掛けて依存を解決するよりも dist-upgrade を使う方"
+"が希望には合うかもしれません。dist-upgrade 完了後は <command>dselect</"
+"command> を使って、残っているパッケージがあればインストールできます。"

 
 

-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk

 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
 msgstr ""
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
 msgstr ""

+"dist-upgrade が実行する内容をよく観察するのは重要です。かなり驚くような判断が"
+"なされることもあります。"

 
 

-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."

 msgstr ""
 msgstr ""

-
-#. type: <heading></heading>
-#: guide.sgml:168
+"<command>apt-get</command> にはコマンドラインオプションが複数あり、man ページ"
+"の <citerefentry><refentrytitle>apt-get</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry> で詳細に説明されています。最も有用なオプションは取"
+"得したファイルをインストールしない <literal>-d</literal> です。システムが大量"
+"のパッケージをダウンロードする必要がある場合、何かうまくいかなかったときにイ"
+"ンストールを開始するのは望ましくはないでしょう。<literal>-d</literal> を指定"
+"すると、ダウンロードしたときのコマンドを単純に再び、<literal>-d</literal> を"
+"付けずに実行することでダウンロードしたアーカイブをインストールできます。"
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk

 msgid "DSelect"
 msgstr "DSelect"
 
 msgid "DSelect"
 msgstr "DSelect"
 

-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."

 msgstr ""
 msgstr ""

+"APT の <command>dselect</command> メソッドは <command>dselect</command> パッ"
+"ケージ選択 GUI を使った完全な APT システムを提供します。インストールや削除す"
+"るパッケージの選択には <command>dselect</command> を使い、実際のインストール"
+"は APT が行います。"

 
 

-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "

 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""

-
-#. type: <example></example>
-#: guide.sgml:198
+"APT メソッドを有効にするには、<command>dselect</command> でアクセス(a) を選択"
+"し、それから APT メソッドを選択する必要があります。そうするとアーカイブの取得"
+"先の場所となる<emphasis>ソース</emphasis>群を聞かれます。これにはリモートのイ"
+"ンターネットサイトやローカルの Debian ミラー、CD-ROM を指定できます。各ソース"
+"で Debian アーカイブ全体のうちの一部を提供でき、APT は自動的に組み合わせて"
+"パッケージ群一式を構成します。CD-ROM がある場合はまずそれを指定し、それからミ"
+"ラーを指定するのが良い方法で、そうすることで最新のバグ修正にアクセスできるよ"
+"うになります。APT はインターネットからダウンロードする前に CD-ROM にあるパッ"
+"ケージを自動的に利用します。"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"

-"\t \n"
+"\n"

 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"

-"\t   \n"
+"\n"

 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"

-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
-msgstr "   "
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
+msgstr ""
+"   ディストリビューションソース位置一覧の準備\n"
+"\n"
+" Debian ディストリビューションの基底 URL を指定してください。\n"
+" 認識できるアクセス方法: http file\n"
+"\n"
+" 例:\n"
+"      file:/mnt/debian,\n"
+"      ftp://ftp.debian.org/debian,\n"
+"      http://ftp.de.debian.org/debian,\n"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"

 
 

-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."

 msgstr ""
 msgstr ""

+"<emphasis>ソース</emphasis>の準備は基礎となる Debian アーカイブの質問から始ま"
+"り、デフォルトは HTTP ミラーとなっています。その次は取得するディストリビュー"
+"ションを質問します。"

 
 

-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"

-"   \n"
-" Distribution [stable]:"
-msgstr " "
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
+"\n"
+" Distribution [stable]:\n"

 msgstr ""
 msgstr ""

+" 取得するディストリビューションのタグやパッケージファイルへのパスを\n"
+" / で終える形式で指定してください。ディストリビューションのタグには\n"
+" 以下のようなものがあります: stable unstable testing non-US\n"
+"\n"
+" ディストリビューション [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"ディストリビューションはアーカイブ中の Debian バージョンを参照し、"
+"<emphasis>stable</emphasis> は最新のリリース版を、<emphasis>unstable</"
+"emphasis> は開発版を参照します。<emphasis>non-US</emphasis> は一部のミラーで"
+"のみ利用可能で、合衆国からの輸出ができない暗号化技術その他のものを収録する"
+"パッケージを参照します。ただしこういったパッケージの合衆国への輸入は合法で"
+"す。"

 
 

-#. type: <example></example>
-#: guide.sgml:228
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"

-"  \n"
-" Components [main contrib non-free]:"
-msgstr " "
+"\n"
+" Components [main contrib non-free]:\n"
+msgstr ""
+" 取得するコンポーネントを指定してください\n"
+" コンポーネントには以下のようなものがあります: main contrib non-free\n"
+"\n"
+" コンポーネント [main contrib non-free]:\n"

 
 

-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
 "packages while contrib and non-free contain things that have various "
 "restrictions placed on their use and distribution."
 msgstr ""
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
 "packages while contrib and non-free contain things that have various "
 "restrictions placed on their use and distribution."
 msgstr ""

+"コンポーネント一覧は取得するサブディストリビューションの一覧を参照します。こ"
+"のディストリビューションはソフトウェアのライセンスを基にして分けられていま"
+"す。main にあるのは DFSG フリーのパッケージですが contrib や non-free には利"
+"用目的や配布形態に様々な制限を課せられているものが収録されています。"

 
 

-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
 msgstr ""
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
 msgstr ""

+"ソースはいくらでも追加できます。準備スクリプトは必要なソースを全て指定するま"
+"で聞き続けます。"

 
 

-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."

 msgstr ""
 msgstr ""

+"<command>dselect</command> を使う前にメニューから更新(u)を選択して利用可能な"
+"パッケージ一覧を更新する必要があります。これは <literal>apt-get update</"
+"literal> の上位集合で、取得した情報を <command>dselect</command> から利用でき"
+"るようにします。以前に <literal>apt-get update</literal> を実行していても更新"
+"(u)を実行する必要があります。"

 
 

-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
 "[R]emove commands have no meaning, the [I]nstall command performs both of "
 "them together."
 msgstr ""
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
 "[R]emove commands have no meaning, the [I]nstall command performs both of "
 "them together."
 msgstr ""

+"その後は選択(s)を使って選択し、導入(i)を使ってインストールします。APT メソッ"
+"ドを使っている場合は設定(c)や削除(r)コマンドに意味はなく、導入(i)コマンドがそ"
+"の両方を実行します。"

 
 

-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "

-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."

 msgstr ""
 msgstr ""

+"デフォルトで APT はインストールに成功したパッケージ (.deb) ファイルを自動的に"
+"削除します。この挙動を変更するには /etc/apt/apt.conf 中に <literal>Dselect::"
+"clean \"prompt\";</literal> と記述します。"

 
 

-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk

 msgid "The Interface"
 msgstr "インターフェース"
 
 msgid "The Interface"
 msgstr "インターフェース"
 

-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk
+msgid ""
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"<command>dselect</command> メソッドは実際に <command>apt-get</command> に対す"
+"るラッパースクリプト群です。このメソッドでは <command>apt-get</command> 単体"
+"に存在している以上の機能を実際に提供しています。"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "

 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""

+"APT の <command>dselect</command> メソッドと <command>apt-get</command> は共"
+"に同一のインターフェイスを共有しています。通常は行う内容を告知して実行する簡"
+"単なシステムです。<placeholder type=\"footnote\" id=\"0\"/> 実行内容のまとめ"
+"を告知した後 APT が参考になる状態メッセージをいくらか表示するため、どれくらい"
+"進んでいるのか、あるいは残り作業がどれくらいあるのか見積もることができるよう"
+"になっています。"

 
 

-#. type: <heading></heading>
-#: guide.sgml:280
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk

 msgid "Startup"
 msgstr "スタートアップ"
 
 msgid "Startup"
 msgstr "スタートアップ"
 

-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "

-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."

 msgstr ""
 msgstr ""

+"update 以外のあらゆる操作で、APT はいくつか処理を行い内部状態を準備します。ま"
+"た、システムの状態についてもいくらか確認します。この処理は <literal>apt-get "
+"check</literal> によりいつでも実行できます。"

 
 

-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"

-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"

 msgstr ""
 "# apt-get check\n"
 msgstr ""
 "# apt-get check\n"

-"Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"パッケージリストを読み込んでいます... 完了\n"
+"依存関係ツリーを作成しています\n"
+"状態情報を読み取っています... 完了\n"

 
 

-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
 "If some of the package files are not found then they will be ignored and a "
 "warning will be printed when apt-get exits."
 msgstr ""
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
 "If some of the package files are not found then they will be ignored and a "
 "warning will be printed when apt-get exits."
 msgstr ""

+"これが最初に行うのはパッケージファイルを全てメモリに読み込むことです。APT は"
+"キャッシュを使うようになっているので、この処理は次に実行するときには早く終わ"
+"ります。見つけられないパッケージファイルがある場合は無視され、apt-get 終了時"
+"に注意を表示します。"

 
 

-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "

-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."

 msgstr ""
 msgstr ""

+"最後の処理はシステムの依存関係の詳細な分析です。インストール、あるいは展開さ"
+"れたパッケージの依存関係を全て確認し、問題ないか判断します。問題が見つかった"
+"場合は報告し、<command>apt-get</command> の実行を拒否します。"

 
 

-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "# apt-get check\n"
 #, no-wrap
 msgid ""
 "# apt-get check\n"


@@ -8511,33 +9930,34 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"

-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"

 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"

-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"

 "  cthugha: Depends: svgalibg1 but it is not installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"

-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"

 msgstr ""
 "# apt-get check\n"
 msgstr ""
 "# apt-get check\n"

-"Reading Package Lists... Done\n"
-"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
-"Sorry, but the following packages have unmet dependencies:\n"
-"  9fonts: Depends: xlib6g but it is not installed\n"
-"  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  adduser: Depends: perl-base but it is not installed\n"
-"  aumix: Depends: libgpmg1 but it is not installed\n"
-"  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
-"  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
-
-#. type: <p></p>
-#: guide.sgml:329
+"パッケージリストを読み込んでいます... 完了\n"
+"依存関係ツリーを作成しています\n"
+"状態情報を読み取っています... 完了\n"
+"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれません。\n"
+"下のパッケージには満たせない依存関係があります:\n"
+"  9fonts: 依存: xlib6g しかし、インストールされていません\n"
+"  uucp: 依存: mailx しかし、インストールされていません\n"
+"  blast: 依存: xlib6g (&gt;= 3.3-5) しかし、インストールされていません\n"
+"  adduser: 依存: perl-base しかし、インストールされていません\n"
+"  aumix: 依存: libgpmg1 しかし、インストールされていません\n"
+"  debiandoc-sgml: 依存: sgml-base しかし、インストールされていません\n"
+"  bash-builtins: 依存: bash (&gt;= 2.01) しかし、2.0-3 はインストールされています\n"
+"  cthugha: 依存: svgalibg1 しかし、インストールされていません\n"
+"           依存: xlib6g (&gt;= 3.3-5) しかし、インストールされていません\n"
+"  libreadlineg2: 競合:libreadline2 (&lt;&lt; 2.1-2.1)\n"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "


@@ -8545,62 +9965,97 @@ msgid ""
 "that are unmet. A short explanation of why the package has a dependency "
 "problem is also included."
 msgstr ""
 "that are unmet. A short explanation of why the package has a dependency "
 "problem is also included."
 msgstr ""

+"この例ではシステムに libreadlineg2 に関する重大な問題を含めて多数の問題があり"
+"ます。未解決の依存関係があれば各パッケージごとにそのパッケージに問題があるこ"
+"とを示し、併せて未解決の依存関係を1行で出力します。そのパッケージの依存問題の"
+"理由について簡潔な説明も添えられます。"

 
 

-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"

 msgstr ""
 msgstr ""

+"APT はそれでも既知の依存関係を全て検討し、パッケージが壊れた状態となることを"
+"回避しようとします。"

 
 

-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"The second situation is much less serious than the first because APT places "
-"certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"There are two ways a system can get into a broken state like this. The first "
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."

 msgstr ""
 msgstr ""

+"システムがこのように壊れた状態となる原因は2つあります。1つ目はアップグレード"
+"実行時にパッケージ間の難解な依存関係を <command>dpkg</command> がいくらか欠い"
+"ていることによります。<placeholder type=\"footnote\" id=\"0\"/>2つ目はパッ"
+"ケージのインストール処理中に何か失敗した場合です。この状況では依存するパッ"
+"ケージがインストールされないままパッケージが展開されている可能性があります。"

 
 

-#. type: <p></p>
-#: guide.sgml:351
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:356
+"The second situation is much less serious than the first because APT places "
+"certain constraints on the order that packages are installed. In both cases "
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
+msgstr ""
+"APT がパッケージのインストール順序に特定の制約を設けていることにより2つ目の状"
+"況は1つ目の状況と比べて重大ですらなくなります。どちらの場合でも <command>apt-"
+"get</command> に <literal>-f</literal> オプションを指定することで APT は解決"
+"方法を推測し、処理を続けます。APT <command>dselect</command> メソッドでは常"
+"に <literal>-f</literal> オプションを有効にして、メンテナスクリプトでの問題が"
+"起きた場合でも簡単に処理を継続できるようにしています。"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"しかし、1つ目の状況により重大な壊れ方になっているシステムの修正に <literal>-"
+"f</literal> オプションを使った場合はインストールにすぐに失敗、あるいはインス"
+"トール順序がおかしくなる可能性があります。どちらの場合も、APT が処理を十分に"
+"進められるところまで手作業により dpkg を使って (恐らく強制するオプションを指"
+"定して) 状況を修正する必要があります。"
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk

 msgid "The Status Report"
 msgstr "状態レポート"
 
 msgid "The Status Report"
 msgstr "状態レポート"
 

-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."

 msgstr ""
 msgstr ""

+"処理を続ける前に <command>apt-get</command> は実行しようとする処理について報"
+"告します。通常この報告は実行される操作の種類を反映したものになりますが、一般"
+"的要素がいくつかあります。どの場合でもこの処理一覧は最終的な状態を示し、"
+"<literal>-f</literal> オプションその他の実行されるコマンドに関連する動作を考"
+"慮したものとなります。"

 
 

-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk

 msgid "The Extra Package list"
 msgstr "追加パッケージリスト"
 
 msgid "The Extra Package list"
 msgstr "追加パッケージリスト"
 

-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"


@@ -8608,156 +10063,180 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"

-"  ssh"
+"  ssh\n"

 msgstr ""
 msgstr ""

-"The following extra packages will be installed:\n"
+"以下の特別パッケージがインストールされます:\n"

 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"

-"  ssh"
+"  ssh\n"

 
 

-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "

-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."

 msgstr ""
 msgstr ""

+"追加パッケージリストはコマンドラインで指示した以外にインストールやアップグ"
+"レードされるパッケージを全て表示します。これは <literal>install</literal> コ"
+"マンドの場合にのみ生成されます。一覧に挙げられるパッケージは自動インストール"
+"の結果による場合が多くなります。"

 
 

-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk

 msgid "The Packages to Remove"
 msgstr "削除するパッケージ"
 
 msgid "The Packages to Remove"
 msgstr "削除するパッケージ"
 

-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"

-"  nas xpilot xfig"
+"  nas xpilot xfig\n"

 msgstr ""
 msgstr ""

+"以下のパッケージは「削除」されます:\n"

 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"

-"  nas xpilot xfig"
+"  nas xpilot xfig\n"

 
 

-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "

-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:402
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
+msgstr ""
+"削除するパッケージリストはシステムから削除されるパッケージを全て表示します。"
+"これはどの操作でも起きるもので、重要なものが失われることのないように注意深く"
+"確認すべきです。<literal>-f</literal> オプションを使った場合はパッケージの削"
+"除を伴うことが特に多く、そのためこのオプションを指定した場合は特に注意を払う"
+"ようにしてください。この一覧にはインストールの中止等により一部だけがインス"
+"トールされているために削除されるパッケージが含まれることがあります。"
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk

 msgid "The New Packages list"
 msgstr "新規パッケージリスト"
 
 msgid "The New Packages list"
 msgstr "新規パッケージリスト"
 

-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"

-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"

 msgstr ""
 msgstr ""

-"The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"以下のパッケージが新たにインストールされます:\n"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"

 
 

-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
 "done."
 msgstr ""
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
 "done."
 msgstr ""

+"新規パッケージリストでは単純にこれから起きることを再通知します。このパッケー"
+"ジ一覧は現在システムにインストールされておらず、APT 処理後には存在することに"
+"なります。"

 
 

-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk

 msgid "The Kept Back list"
 msgstr "一時固定リスト"
 
 msgid "The Kept Back list"
 msgstr "一時固定リスト"
 

-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"

-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"

 msgstr ""
 msgstr ""

-"The following packages have been kept back\n"
+"以下のパッケージは保留されます\n"

 "  compface man-db tetex-base msql libpaper svgalib1\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"

-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"

 
 

-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "

-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:431
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
+msgstr ""
+"システム全体をアップグレードする場合、新しいパッケージが必要であったり既にイ"
+"ンストールされているパッケージと競合するためにパッケージの新しいバージョンが"
+"インストールできないということがあります。この場合、そのパッケージは一時固定"
+"リストに表示されます。この一覧に挙げられたパッケージをインストールする最善の"
+"方法は <literal>apt-get install</literal> または <command>dselect</command> "
+"を使ってその問題を解決することです。"
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk

 msgid "Held Packages warning"
 msgstr "保留パッケージの警告"
 
 msgid "Held Packages warning"
 msgstr "保留パッケージの警告"
 

-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"

-"  cvs"
+"  cvs\n"

 msgstr ""
 msgstr ""

-"The following held packages will be changed:\n"
-"  cvs"
+"以下の変更禁止パッケージは変更されます:\n"
+"  cvs\n"

 
 

-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
 "This should only happen during dist-upgrade or install."
 msgstr ""
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
 "This should only happen during dist-upgrade or install."
 msgstr ""

+"保留となっているパッケージをインストールするように APT に指示することもできま"
+"す。その際、保留となっているパッケージを変更することを警告します。これは "
+"dist-upgrade または install を指示したときにしか起きないはずです。"

 
 

-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk

 msgid "Final summary"
 msgstr "最後のまとめ"
 
 msgid "Final summary"
 msgstr "最後のまとめ"
 

-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."

-msgstr ""
+msgstr "最後に、APT は発生する全変更のまとめを表示します。"

 
 

-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"

-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"

 msgstr ""
 msgstr ""

-"206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
-"12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"アップグレード: 206 個、新規インストール: 8 個、削除: 23 個、保留: 51 個。\n"
+"12 個のパッケージが完全にインストールまたは削除されていません。\n"
+"66.7MB 中 65.7MB のアーカイブを取得する必要があります。\n"
+"この操作後に追加で 26.5MB のディスク容量が消費されます。\n"

 
 

-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "


@@ -8773,28 +10252,42 @@ msgid ""
 "If a large number of packages are being removed then the value may indicate "
 "the amount of space that will be freed."
 msgstr ""
 "If a large number of packages are being removed then the value may indicate "
 "the amount of space that will be freed."
 msgstr ""

+"まとめの1行目は単純に一覧を全て短くまとめたもので、アップグレードされる (既に"
+"インストールされていて新しいバージョンが利用可能な) パッケージの数についても"
+"示します。2行目は設定が完了していないパッケージの数を示し、インストールを中止"
+"した場合にこれに集計されることがあります。最終行はそのインストールで必要とな"
+"る容量の要件を示します。最初の数値の組はアーカイブファイルのサイズを示しま"
+"す。この1つ目の数値はリモートから取得してくる必要のあるバイト数、2つ目は必要"
+"となる全アーカイブの合計サイズを示します。次の数値は現在インストールされてい"
+"るパッケージと新しくインストールしたパッケージのサイズの違いを示します。これ"
+"は処理が全て終わった後に /usr で消費される容量にほぼ相当します。パッケージを"
+"大量に削除する場合は解放される容量を示すこともあります。"

 
 

-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
 msgstr ""
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
 msgstr ""

+"他の報告として、-u オプションを使うとアップグレードされるパッケージを表示しま"
+"す。これは前に示した例と似たものです。"

 
 

-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk

 msgid "The Status Display"
 msgstr "状態表示"
 
 msgid "The Status Display"
 msgstr "状態表示"
 

-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
 msgstr ""
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
 msgstr ""

+"アーカイブやパッケージファイルのダウンロード中、APT は状態を示す一連のメッ"
+"セージを表示します。"

 
 

-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "# apt-get update\n"
 #, no-wrap
 msgid ""
 "# apt-get update\n"


@@ -8803,95 +10296,124 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"

-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"

 msgstr ""
 "# apt-get update\n"
 msgstr ""
 "# apt-get update\n"

-"Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
-"Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
-"Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
-"Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
-"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
-
-#. type: <p></p>
-#: guide.sgml:500
-msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:509
+"取得:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
+"取得:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"ヒット http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
+"取得:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
+"取得:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk
+msgid ""
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
+msgstr ""
+"APT がファイルの取得を開始すると、最終行でダウンロードの進捗状況を示しつつ"
+"<emphasis>取得</emphasis>で始まる行が表示されます。進捗の最初のパーセント値は"
+"全ファイルに対する取得済みの全体での割合を示します。残念ながらパッケージファ"
+"イルのサイズは不明なので <literal>apt-get update</literal> は不正確な予測を行"
+"う可能性があります。"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "

-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:524
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
+msgstr ""
+"状態を示す行の次の節は各ダウンロードスレッドごとに1度ずつ繰り返され、進行中の"
+"操作や処理についての有用な情報をいくらか示します。この節は単純に "
+"<emphasis>Forking</emphasis> となっていることもあり、その場合は OS がダウン"
+"ロード用のモジュールを読み込んでいることを示します。[ の後の最初の語は履歴に"
+"表示されている取得番号です。その次の語はダウンロード対象の名前の短縮形です。"
+"アーカイブの場合は取得中のパッケージの名前が入ります。"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "

-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:530
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
+msgstr ""
+"単一引用符内はダウンロードのやりとりの進捗を示す有益な文字列です。標準的には"
+"<emphasis>...へ接続しています</emphasis>から<emphasis>ファイルを待っています"
+"</emphasis>へ、それから<emphasis>...をダウンロードしています</emphasis>または"
+"<emphasis>...を再開しています</emphasis>へと進みます。最後の値はリモートサイ"
+"トからダウンロードしたバイト数です。ダウンロードが始まるとこれは "
+"<literal>102/10.2k</literal> のように表示され、この場合10.2キロバイトのうち"
+"102バイトが取得済みであることを示します。合計サイズは常に4ケタで表示され、表"
+"示空間を保つようになっています。サイズ表示の後はそのファイル自体の進捗状況を"
+"百分率で示したものです。その2つ後は瞬間的な平均速度です。この値は5秒ごとに更"
+"新され、その間のデータ転送速度を反映します。最後は推定転送時間を表示していま"
+"す。これは定期的に更新され、表示している転送速度で全て完了する時間を表示しま"
+"す。"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "

-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."

 msgstr ""
 msgstr ""

+"状態表示は0.5秒ごとに更新してダウンロードの進捗状況を絶えず通知し、取得行は新"
+"しいファイルの処理が始まるたびに流れていきます。状態表示は絶えず更新されるた"
+"めファイルへの記録には適しません。<literal>-q</literal> オプションを使うと状"
+"態を表示しないようにできます。"

 
 

-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk

 msgid "Dpkg"
 msgstr "Dpkg"
 
 msgid "Dpkg"
 msgstr "Dpkg"
 

-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT はアーカイブのインストールに <command>dpkg</command> を使い、ダウンロード"
+"の完了後は <command>dpkg</command> インターフェイスに切り替わります。"
+"<command>dpkg</command> もパッケージの処理中にいくつか質問し、パッケージ自体"
+"も複数質問するかもしれません。通常それぞれの質問の前にそれが何を聞いているの"
+"か説明します。その質問の内容は多岐にわたるものであり、ここで説明できるもので"
+"は全くありません。"
+
+#. type: Content of: <book><title>
+#: offline.dbk

 msgid "Using APT Offline"
 msgstr "オフラインでの APT の使用法"
 
 msgid "Using APT Offline"
 msgstr "オフラインでの APT の使用法"
 

-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk

 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."


@@ -8899,32 +10421,38 @@ msgstr ""
 "このドキュメントはネットワークがない環境での APT の使用方法を説明しています。"
 "具体的には、アップグレード時の「スニーカーネット」アプローチです。"
 
 "このドキュメントはネットワークがない環境での APT の使用方法を説明しています。"
 "具体的には、アップグレード時の「スニーカーネット」アプローチです。"
 

-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"

 
 

-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk

 msgid "Introduction"
 msgstr "はじめに"
 
 msgid "Introduction"
 msgstr "はじめに"
 

-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk

 msgid "Overview"
 msgstr "概要"
 
 msgid "Overview"
 msgstr "概要"
 

-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
 "machine is on a slow link, such as a modem and another machine has a very "
 "fast connection but they are physically distant."
 msgstr ""
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
 "machine is on a slow link, such as a modem and another machine has a very "
 "fast connection but they are physically distant."
 msgstr ""

+"通常 APT は Debian アーカイブに、ローカルメディアから、あるいはネットワーク経"
+"由で直接アクセスできる必要があります。他によくある苦情としてはある Debian マ"
+"シンの接続がモデム等のために低速で、別のマシンには非常に高速な接続があるけれ"
+"ども物理的に遠い、といったことがあります。"

 
 

-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "


@@ -8932,36 +10460,53 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "

-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:57
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
+msgstr ""
+"これに対する解法としては Zip や SuperDisk ディスクといった大容量脱着可能メ"
+"ディアを使います。こういったディスクは Debian アーカイブ全体を格納するには十"
+"分とは言えない容量ですがほとんどのユーザにとって必要なその一部を収めるには十"
+"分余裕があります。その考え方は APT を使って必要なパッケージの一覧を生成し、接"
+"続状態の良好な別のマシンを使ってそのディスク上に取得します。APT を使える別の "
+"Debian マシンや、完全に異なる OS で wget のようなダウンロードツールを使うこと"
+"も可能です。<emphasis>リモートホスト</emphasis>はパッケージをダウンロードする"
+"マシン、<emphasis>対象ホスト</emphasis>は接続がないあるいは良くないマシンだと"
+"考えてください。"
+
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "

-"that the disc should be formated with a filesystem that can handle long file "
-"names such as ext2, fat32 or vfat."
+"that the disc should be formatted with a filesystem that can handle long "
+"file names such as ext2, fat32 or vfat."

 msgstr ""
 msgstr ""

+"これは APT 設定ファイルを独創的に操作することで実現できます。あるディスクを "
+"APT が検索するようにするために必須となる前提条件はアーカイブファイルです。そ"
+"のディスクは長いファイル名を扱えるファイルシステム、例えば ext2 や fat32、"
+"vfat でフォーマットする必要があることに注意してください。"

 
 

-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk

 msgid "Using APT on both machines"
 msgstr "両方のマシンでの APT の使用法"
 
 msgid "Using APT on both machines"
 msgstr "両方のマシンでの APT の使用法"
 

-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
 "remote machine to fetch the latest package files and decide which packages "
 "to download. The disk directory structure should look like:"
 msgstr ""
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
 "remote machine to fetch the latest package files and decide which packages "
 "to download. The disk directory structure should look like:"
 msgstr ""

+"APT を両方のマシンで利用できるようにする最も単純な設定を考えます。基本的な考"
+"え方は status ファイルのコピーをそのディスクに置いて最新のパッケージファイル"
+"の取得やダウンロードするパッケージの決定にはリモートマシンを使います。その"
+"ディスクのディレクトリ構造は次のようになります:"

 
 

-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk

 #, no-wrap
 msgid ""
 "  /disc/\n"
 #, no-wrap
 msgid ""
 "  /disc/\n"


@@ -8971,7 +10516,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
 "       partial/\n"
 "    status\n"
 "    sources.list\n"

-"    apt.conf"
+"    apt.conf\n"

 msgstr ""
 "  /disc/\n"
 "    archives/\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"


@@ -8980,33 +10525,42 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
 "       partial/\n"
 "    status\n"
 "    sources.list\n"

-"    apt.conf"
+"    apt.conf\n"

 
 

-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk

 msgid "The configuration file"
 msgstr "設定ファイル"
 
 msgid "The configuration file"
 msgstr "設定ファイル"
 

-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "

-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."

 msgstr ""
 msgstr ""

+"設定ファイルでは APT が管理ファイルをそのディスクに保存し、そのディスク上の設"
+"定ファイルを同様に利用するように指示する必要があります。sources.list ではリ"
+"モートマシンから利用する適切なサイトを指定し、status ファイルは<emphasis>対象"
+"ホスト</emphasis>の <emphasis>/var/lib/dpkg/status</emphasis> をコピーしたも"
+"のを利用します。ローカルアーカイブを使っている場合はその URI を利用しないとい"
+"けないことに注意してください。書式はファイルの URI と同一です。"

 
 

-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 msgid ""

-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"

 msgstr ""
 msgstr ""

+"<emphasis>apt.conf</emphasis> には APT がそのディスクを使うようにするのに必要"
+"な情報を記述しないといけません:"

 
 

-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk

 #, no-wrap
 msgid ""
 " APT\n"
 #, no-wrap
 msgid ""
 " APT\n"


@@ -9014,10 +10568,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"

-"   \n"
+"\n"

 "   Get::Download-Only \"true\";\n"
 " };\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"

-" \n"
+"\n"

 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"


@@ -9028,20 +10582,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"

-"   \n"
+"\n"

 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"

-" };"
+" };\n"

 msgstr ""
 " APT\n"
 " {\n"
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"

-"   \n"
+"\n"

 "   Get::Download-Only \"true\";\n"
 " };\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"

-" \n"
+"\n"

 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"


@@ -9052,85 +10606,103 @@ msgstr ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"

-"   \n"
+"\n"

 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"

-" };"
+" };\n"

 
 

-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "

-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:136
-msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:142
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
+msgstr ""
+"apt.conf の man ページや <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis> にある見本の設定ファイルを調べるとさらなる詳細があります。"
+
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk
+msgid ""
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
+msgstr ""
+"対象のマシンでまず行うことはディスクをマウントしてそのディスクに <emphasis>/"
+"var/lib/dpkg/status</emphasis> をコピーすることです。概要にまとめられているよ"
+"うに、ディレクトリ <emphasis>archives/partial/</emphasis> 及び "
+"<emphasis>lists/partial/</emphasis> を作成する必要もあるでしょう。それから"
+"ディスクをリモートマシンに移動して sources.list を設定します。リモートマシン"
+"では以下の手順を実行します:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk

 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"

-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"

 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ package ファイルを APT が取得します ]\n"
 " # apt-get dist-upgrade\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ package ファイルを APT が取得します ]\n"
 " # apt-get dist-upgrade\n"

-" [ 対象マシンをアップグレードするのに必要なパッケージを、APT が取得します ]"
+" [ 対象マシンをアップグレードするのに必要なパッケージを、APT が取得します ]\n"

 
 

-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "

-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."

 msgstr ""
 msgstr ""

+"dist-upgrade コマンドは他の任意の標準的な APT コマンド、特に dselect-upgrade "
+"に置き換えることができます。<emphasis>dselect</emphasis> 等の APT フロントエ"
+"ンドを使うこともできます。しかし、それには選択したときにローカルコンピュータ"
+"とやりとりしてしまうという問題があります。"

 
 

-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
 msgstr ""
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
 msgstr ""

+"これで、対象のマシンをアップグレードするのに必要な索引ファイルとアーカイブが"
+"全てこのディスクに収録されたということになります。ディスクを戻して実行します:"

 
 

-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk

 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"

-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"

 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"

-" [ キャッシュファイルのローカルコピーを生成します ]\n"
-" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-" [ もしくはその他の APT コマンド ]"
+"  [ キャッシュファイルのローカルコピーを生成します ]\n"
+"  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
+"  [ もしくはその他の APT コマンド ]\n"

 
 

-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
 msgstr ""
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
 msgstr ""

+"適切に機能するためにはローカルのファイルを status ファイルに再指定する必要が"
+"あります。これは非常に重要です!"

 
 

-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "


@@ -9138,149 +10710,616 @@ msgid ""
 "the local machine - but this may not always be possible. DO NOT copy the "
 "status file if dpkg or APT have been run in the mean time!!"
 msgstr ""
 "the local machine - but this may not always be possible. DO NOT copy the "
 "status file if dpkg or APT have been run in the mean time!!"
 msgstr ""

+"dselect を使っている場合、disc/status はリモートマシンで何か選択すると更新さ"
+"れるため /var/lib/dpkg/status にコピーするのは非常に危険です。選択はローカル"
+"マシンでのみ行うことを強く勧めます - しかしこれは常に可能だとは限りません。"
+"dpkg や APT を実行している間は status ファイルをコピー *しないでください* !!"

 
 

-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk

 msgid "Using APT and wget"
 msgid "Using APT and wget"

-msgstr "APT と wget の使用法"
+msgstr "APT と wget の使用"

 
 

-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 msgid ""

-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."

 msgstr ""
 msgstr ""

+"<emphasis>wget</emphasis> は人気のある移植性の高いダウンロードツールで、ほぼ"
+"あらゆるマシンで実行できます。上記の方法とは異なり、これには利用可能なパッ"
+"ケージの一覧を Debian マシンで用意しておく必要があります。"

 
 

-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
 "option to apt-get and then preparing a wget script to actually fetch the "
 "packages."
 msgstr ""
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
 "option to apt-get and then preparing a wget script to actually fetch the "
 "packages."
 msgstr ""

+"基本的な考え方は、リモートサイトからダウンロードしたアーカイブファイルだけを"
+"収録したディスクを作成するということです。これは apt-get に --print-uris オプ"
+"ションを使って行い、それから wget スクリプトを準備して実際にパッケージを取得"
+"します。"

 
 

-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk

 msgid "Operation"
 msgstr "操作"
 
 msgid "Operation"
 msgstr "操作"
 

-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
 msgstr ""
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
 msgstr ""

+"前の技とは異なり、特別な設定ファイルを必要としません。標準的な APT コマンドを"
+"単純に使ってファイル一覧を生成します。"

 
 

-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"

 " [ Press no when prompted, make sure you are happy with the actions ]\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"

-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"

 msgstr ""
 msgstr ""

-" # apt-get dist-upgrade \n"
-" [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get dist-upgrade\n"
+" [ 問い合わせには no を回答し、意図しない動作を起こすことのないように ]\n"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"

 
 

-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
 msgstr ""
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
 msgstr ""

+"dselect-upgrade を含め、ここでは dist-upgrade 以外の任意のコマンドを使えま"
+"す。"

 
 

-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
 "with the current directory as the disc's mount point so as to save the "
 "output on the disc."
 msgstr ""
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
 "with the current directory as the disc's mount point so as to save the "
 "output on the disc."
 msgstr ""

+"/disc/wget-script ファイルには、必要なアーカイブを取得するために実行する "
+"wget コマンドの一覧を収録するようになっています。ディスク上の出力を減らすた"
+"め、このスクリプトは現在のディレクトリをそのディスクのマウントポイントとして"
+"実行するようにしてください。"

 
 

-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid "The remote machine would do something like"
 msgstr "リモートマシンでは以下のようにします。"
 
 msgid "The remote machine would do something like"
 msgstr "リモートマシンでは以下のようにします。"
 

-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk

 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"

-"  [ wait.. ]"
+"  [ wait.. ]\n"

 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"

-"  [ お待ちください... ]"
+"  [ お待ちください... ]\n"

 
 

-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
 msgstr ""
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
 msgstr ""

+"アーカイブのダウンロードが終わってディスクが Debian マシンに返ってくるとイン"
+"ストールを続けられるようになります。"

 
 

-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk

 #, no-wrap
 #, no-wrap

-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"

 
 

-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid "Which will use the already fetched archives on the disc."
 msgid "Which will use the already fetched archives on the disc."

-msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。"
+msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
+
+#~ msgid "dpkg trigger usage (and related options)"
+#~ msgstr "dpkg トリガの使い方 (および関連オプション)"
+
+#~ msgid ""
+#~ "APT can call &dpkg; in such a way as to let it make aggressive use of "
+#~ "triggers over multiple calls of &dpkg;. Without further options &dpkg; "
+#~ "will use triggers once each time it runs.  Activating these options can "
+#~ "therefore decrease the time needed to perform the install or upgrade. "
+#~ "Note that it is intended to activate these options per default in the "
+#~ "future, but as it drastically changes the way APT calls &dpkg; it needs a "
+#~ "lot more testing.  <emphasis>These options are therefore currently "
+#~ "experimental and should not be used in production environments.</"
+#~ "emphasis> It also breaks progress reporting such that all front-ends will "
+#~ "currently stay around half (or more) of the time in the 100% state while "
+#~ "it actually configures all packages."
+#~ msgstr ""
+#~ "APT は、複数の &dpkg; 呼び出しトリガを、積極的に行わせる方法で &dpkg; を呼"
+#~ "び出せます。オプションがなければ、実行のたびに &dpkg; は一度トリガを引くだ"
+#~ "けです。そのため、このオプションを有効にすると、インストールやアップグレー"
+#~ "ドにかかる時間を、短くできます。将来、このオプションを、デフォルトで有効に"
+#~ "する方向であることに注意してください。しかし、APT が &dpkg; を呼ぶ方法と"
+#~ "いった大幅な変更を行うには、もっとたくさんのテストが必要です。<emphasis>し"
+#~ "たがって、このオプションは現在実験中で、本番環境では使用するべきではありま"
+#~ "せん。</emphasis>さらに、すべてのフロントエンドが、実際には全パッケージを"
+#~ "設定中なのに、半分 (もしくはそれ以上) の時間 100% のままとなり、進捗レポー"
+#~ "トを壊してしまいます。"
+
+#~ msgid ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+#~ msgstr ""
+#~ "DPkg::NoTriggers \"true\";\n"
+#~ "PackageManager::Configure \"smart\";\n"
+#~ "DPkg::ConfigurePending \"true\";\n"
+#~ "DPkg::TriggersPending \"true\";"
+
+#~ 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 understand the current risks and problems with these options, but "
+#~ "are brave enough to help testing them, create a new configuration file "
+#~ "and test a combination of options. Please report any bugs, problems and "
+#~ "improvements you encounter and make sure to note which options you have "
+#~ "used in your reports. Asking &dpkg; for help could also be useful for "
+#~ "debugging proposes, see e.g. <command>dpkg --audit</command>. A defensive "
+#~ "option combination would be <placeholder type=\"literallayout\" id=\"0\"/>"
+#~ msgstr ""
+#~ "APT がこのオプションをサポートすることや、将来このオプションが (大きな) ト"
+#~ "ラブルの原因にならないことは、保証されないことに注意してください。このオプ"
+#~ "ションの現在のリスクと問題を理解し、テストを手伝う十分な勇気があるなら、新"
+#~ "しい設定ファイルを作成し、オプションの組み合わせのテストをお願いしたいで"
+#~ "す。遭遇したどんなバグ、問題、改善点を、どのようなオプションを使用したかと"
+#~ "添えて報告してください。デバッグに役立つ可能性のある情報を &dpkg; に問い合"
+#~ "わせることを提案します (例: <command>dpkg --audit</command> を参照)。防御"
+#~ "的なオプションの組み合わせは、以下のようになります。<placeholder type="
+#~ "\"literallayout\" id=\"0\"/>"
+
+#~ 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 "
+#~ "short: &dpkg; will not run the triggers when this flag is present unless "
+#~ "it is explicitly called to do so in an extra call.  Note that this option "
+#~ "exists (undocumented) also in older APT versions with a slightly "
+#~ "different meaning: Previously these option only append --no-triggers to "
+#~ "the configure calls to &dpkg; - now APT will also add this flag to the "
+#~ "unpack and remove calls."
+#~ msgstr ""
+#~ "&dpkg; を呼び出すすべてのフラグ (ConfigurePending 呼び出し以外) を付与しま"
+#~ "せん。実際にこれが何を意味するのか興味があるなら、&dpkg; を参照してくださ"
+#~ "い。要するに、追加呼び出しで明示的に呼び出されない限り、このフラグがある"
+#~ "と、&dpkg; はトリガを実行しません。また、古いバージョンの APT に、意味がわ"
+#~ "ずかに異なる、このオプションが存在することに注意してください (ドキュメント"
+#~ "なし)。以前のこのオプションは、&dpkg; の呼び出し設定に、--no-triggers を追"
+#~ "加するだけでした。現在 APT は、このフラグを、展開呼び出しや削除呼び出しに"
+#~ "も追加します。"
+
+#~ msgid ""
+#~ "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
+#~ "and \"<literal>no</literal>\".  The default value is \"<literal>all</"
+#~ "literal>\", which causes APT to configure all packages. The "
+#~ "\"<literal>smart</literal>\" way is to configure only packages which need "
+#~ "to be configured before another package can be unpacked (Pre-Depends), "
+#~ "and let the rest be configured by &dpkg; with a call generated by the "
+#~ "ConfigurePending option (see below). On the other hand, \"<literal>no</"
+#~ "literal>\" will not configure anything, and totally relies on &dpkg; for "
+#~ "configuration (which at the moment will fail if a Pre-Depends is "
+#~ "encountered). Setting this option to any value other than <literal>all</"
+#~ "literal> will implicitly also activate the next option by default, as "
+#~ "otherwise the system could end in an unconfigured and potentially "
+#~ "unbootable state."
+#~ msgstr ""
+#~ "有効な値は \"<literal>all</literal>\", \"<literal>smart</literal>\", "
+#~ "\"<literal>no</literal>\" です。デフォルト値は \"<literal>all</literal>\" "
+#~ "で、APT にすべてのパッケージを設定させます。\"<literal>smart</literal>\" "
+#~ "では、他のパッケージを展開する前に、設定が終わっていなければならないパッ"
+#~ "ケージ (事前依存) のみを設定し、残りを ConfigurePending オプション (後述) "
+#~ "で生成した &dpkg; 呼び出しで設定します。他方では、\"<literal>no</literal>"
+#~ "\" は何も設定しません。設定については &dpkg; にすべて依存します (事前依存"
+#~ "があると失敗します)。このオプションを <literal>all</literal> 以外の値に設"
+#~ "定すると、次のオプションを暗黙的に有効にします。そうしないと、設定が完了せ"
+#~ "ず、起動しなくなる可能性があるからです。"
+
+#~ msgid ""
+#~ "Useful for the <literal>smart</literal> configuration as a package which "
+#~ "has pending triggers is not considered as <literal>installed</literal>, "
+#~ "and &dpkg; treats them as <literal>unpacked</literal> currently which is "
+#~ "a showstopper for Pre-Dependencies (see debbugs #526774). Note that this "
+#~ "will process all triggers, not only the triggers needed to configure this "
+#~ "package."
+#~ msgstr ""
+#~ "<literal>installed</literal> として認識されない保留トリガがあるパッケージ"
+#~ "を、<literal>smart</literal> 設定するのに便利です。&dpkg; は現在、先行依存"
+#~ "関係には無力な <literal>unpacked</literal> として扱います (debbugs "
+#~ "#526774 参照)。このパッケージを設定するのに必要なトリガのみでなく、すべて"
+#~ "のトリガを処理することに注意してください。"
+
+#~ msgid ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+#~ msgstr ""
+#~ "OrderList::Score {\n"
+#~ "\tDelete 500;\n"
+#~ "\tEssential 200;\n"
+#~ "\tImmediate 10;\n"
+#~ "\tPreDepends 50;\n"
+#~ "};"
+
+#~ msgid ""
+#~ "Essential packages (and their dependencies) should be configured "
+#~ "immediately after unpacking. It is a good idea to do this quite early in "
+#~ "the upgrade process as these configure calls also currently require "
+#~ "<literal>DPkg::TriggersPending</literal> which will run quite a few "
+#~ "triggers (which may not be needed). Essentials get per default a high "
+#~ "score but the immediate flag is relatively low (a package which has a Pre-"
+#~ "Depends is rated higher).  These option and the others in the same group "
+#~ "can be used to change the scoring. The following example shows the "
+#~ "settings with their default values.  <placeholder type=\"literallayout\" "
+#~ "id=\"0\"/>"
+#~ msgstr ""
+#~ "不可欠パッケージ (と、その依存しているパッケージ) は展開を終えると、すぐに"
+#~ "設定するべきです。アップグレードプロセスの初期に、設定してしまうのが良いの"
+#~ "ですが、現在 <literal>DPkg::TriggersPending</literal> を要求しているパッ"
+#~ "ケージも同時に行うため、かなり多くのトリガ (すべてが必要とは限らない) を処"
+#~ "理することになります。不可欠パッケージは、デフォルトではスコアを高く設定さ"
+#~ "れていますが、即時フラグは相対的に低くなっています (先行依存パッケージのほ"
+#~ "うが高い)。このオプションと、これと同じグループに属するものは、このスコア"
+#~ "付けを変更するのに使用します。以下の例では、デフォルト値を変更しています。"
+#~ "<placeholder type=\"literallayout\" id=\"0\"/>"
+
+#~ msgid "List fingerprints of trusted keys."
+#~ msgstr "信頼キーのフィンガープリントを一覧表示します。"
+
+#~ msgid "<filename>/etc/apt/trustdb.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
+
+#~ msgid "Local trust database of archive keys."
+#~ msgstr "アーカイブキーのローカル信頼データベースです。"
+
+#~ msgid "&keyring-filename;"
+#~ msgstr "&keyring-filename;"
+
+#~ msgid "Keyring of &keyring-distro; archive trusted keys."
+#~ msgstr "&keyring-distro; アーカイブ信頼キーのキーリングです。"

 
 

-#~ msgid "Debian GNU/Linux"
-#~ msgstr "Debian GNU/Linux"
+#~ msgid "&keyring-removed-filename;"
+#~ msgstr "&keyring-removed-filename;"

 
 

-#~ msgid "&apt-commonoptions;"
-#~ msgstr "&apt-commonoptions;"
+#~ msgid "Keyring of &keyring-distro; archive removed trusted keys."
+#~ msgstr "削除された &keyring-distro; アーカイブ信頼キーのキーリングです。"

 
 

-#~ msgid "&file-sourceslist; &file-statelists;"
-#~ msgstr "&file-sourceslist; &file-statelists;"
+#~ msgid ""
+#~ "In the future APT will refuse to work with unauthenticated repositories "
+#~ "by default until support for them is removed entirely. Users have the "
+#~ "option to opt-in to this behavior already by setting the configuration "
+#~ "option <option>Acquire::AllowInsecureRepositories</option> to "
+#~ "<literal>false</literal>."
+#~ msgstr ""
+#~ "将来的には、リポジトリ認証サポートが完全に削除されるまで、APT はデフォルト"
+#~ "で認証されていないリポジトリでの動作を拒否するでしょう。設定オプション "
+#~ "<option>Acquire::AllowInsecureRepositories</option> を <literal>false</"
+#~ "literal> に設定することで、ユーザはこのような動作にするオプトインするオプ"
+#~ "ションがあります。"

 
 #~ msgid ""
 
 #~ msgid ""

-#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
-#~ "given one of the commands below must be present.  <placeholder type="
-#~ "\"variablelist\" id=\"0\"/>"
+#~ "Allow the update operation to load data files from a repository without a "
+#~ "trusted signature. If enabled this option no data files will be loaded "
+#~ "and the update operation fails with a error for this source. The default "
+#~ "is false for backward compatibility. This will be changed in the future."

 #~ msgstr ""
 #~ msgstr ""

-#~ "<option>-h</option> オプションや <option>--help</option> オプションを除"
-#~ "き、以下に挙げるコマンドが必要です。<placeholder type=\"variablelist\" id="
-#~ "\"0\"/>"
+#~ "信頼された署名がないリポジトリからデータファイルをロードする更新操作を許可"
+#~ "します。このオプションを有効にした場合は、データファイルはロードされず、更"
+#~ "新処理はこの取得元からのエラーで失敗します。デフォルトは、下位互換性を維持"
+#~ "するために無効です。これは将来的に変更されます。"
+
+#~ msgid "&apt-get;, &apt-conf;"
+#~ msgstr "&apt-get;, &apt-conf;"

 
 #~ msgid ""
 
 #~ msgid ""

-#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
-#~ "given one of the commands below must be present."
+#~ "This is a space separated list of all the architectures that appear under "
+#~ "search section. The special architecture 'source' is used to indicate "
+#~ "that this tree has a source archive."

 #~ msgstr ""
 #~ msgstr ""

-#~ "<option>-h</option> オプションや <option>--help</option> オプションを除"
-#~ "き、以下に挙げるコマンドが必要です。"
+#~ "search セクション以下に現れるアーキテクチャを、空白区切りで指定したリスト"
+#~ "です。特殊アーキテクチャ 'source' は、ソースアーカイブのツリーであることを"
+#~ "示します。"

 
 

-#~ msgid "Dir Section"
-#~ msgstr "Dir セクション"
+#~ msgid ""
+#~ "<command>apt</command> (Advanced Package Tool) is the command-line tool "
+#~ "for handling packages. It provides a commandline interface for the "
+#~ "package management of the system.  See also &apt-get; and &apt-cache; for "
+#~ "more low-level command options."
+#~ msgstr ""
+#~ "<command>apt</command> (Advanced Package Tool、高度パッケージツール) は"
+#~ "パッケージ処理用のコマンドラインツールです。システムのパッケージ管理用コマ"
+#~ "ンドラインインターフェイスを提供します。さらなる低レベルコマンドオプション"
+#~ "については &apt-get; 及び &apt-cache; も参照してください。"

 
 

-#~ msgid "Default Section"
-#~ msgstr "Default セクション"
+#~ msgid ""
+#~ "<literal>search</literal> searches for the given term(s) and display "
+#~ "matching packages."
+#~ msgstr ""
+#~ "<literal>search</literal> では指定した語を検索して該当するパッケージを表示"
+#~ "します。"

 
 

-#~ msgid "TreeDefault Section"
-#~ msgstr "TreeDefault セクション"
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "<literal>show</literal> では指定したパッケージについてのパッケージ情報を表"
+#~ "示します。"
+
+#~ msgid ""
+#~ "<literal>install</literal> is followed by one or more package names "
+#~ "desired for installation or upgrading."
+#~ msgstr ""
+#~ "<literal>install</literal> に続けてインストールやアップグレードしたいパッ"
+#~ "ケージの名前を指定します。"

 
 

-#~ msgid "Tree Section"
-#~ msgstr "Tree セクション"
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "<literal>update</literal> を使うとパッケージ索引ファイルをそれぞれのソース"
+#~ "と再同期します。"
+
+#~ msgid "Script usage"
+#~ msgstr "スクリプトでの利用"
+
+#~ msgid "Differences to &apt-get;"
+#~ msgstr "&apt-get; との違い"
+
+#~ msgid ""
+#~ "The <command>apt</command> command is meant to be pleasant for end users "
+#~ "and does not need to be backward compatible like &apt-get;. Therefore "
+#~ "some options are different:"
+#~ msgstr ""
+#~ "<command>apt</command> コマンドはエンドユーザにとって使いやすいように意図"
+#~ "して作られているため &apt-get; のように後方互換性が必ずしもあるとは限りま"
+#~ "せん。したがって、一部のオプションに異なる点があります:"
+
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr ""
+#~ "オプション <literal>DPkg::Progress-Fancy</literal> が有効になっています。"
+
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "オプション <literal>APT::Color</literal> が有効になっています。"
+
+#~ msgid ""
+#~ "A new <literal>list</literal> command is available similar to "
+#~ "<literal>dpkg --list</literal>."
+#~ msgstr ""
+#~ "新しい <literal>list</literal> コマンドは <literal>dpkg --list</literal> "
+#~ "と同じように利用できます。"

 
 #~ msgid ""
 
 #~ msgid ""

-#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-#~ "&file-statelists;"
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."

 #~ msgstr ""
 #~ msgstr ""

-#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-#~ "&file-statelists;"
+#~ "オプション <literal>upgrade</literal> では <literal>--with-new-pkgs</"
+#~ "literal> がデフォルトで有効になっています。"

 
 

-#~ msgid "&file-trustedgpg;"
-#~ msgstr "&file-trustedgpg;"
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "gpg に上級オプションを渡します。adv --recv-key とすると、公開鍵をダウン"
+#~ "ロードできます。"
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr ""
+#~ "パッケージが自動的にインストールされたかどうかのマークを変更します。"
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "<command>apt-mark</command> は、パッケージが自動的にインストールされたかど"
+#~ "うかのマークを変更します。"
+
+#~ msgid ""
+#~ "<literal>hold</literal> is used to mark a package as held back, which "
+#~ "will prevent the package from being automatically installed, upgraded or "
+#~ "removed.  The command is only a wrapper around <command>dpkg --set-"
+#~ "selections</command> and the state is therefore maintained by &dpkg; and "
+#~ "not affected by the <option>--file</option> option."
+#~ msgstr ""
+#~ "<literal>hold</literal> は、パッケージが自動的にインストール・アップグレー"
+#~ "ド・削除が行われないよう、パッケージに保留マークをつけるのに使用します。こ"
+#~ "のコマンドは <command>dpkg --set-selections</command> のラッパーに過ぎず、"
+#~ "そのため状態は  &dpkg; により管理され、<option>--file</option> オプション"
+#~ "は効果がありません。"
+
+#~ msgid ""
+#~ "If a package comes from a archive without a signature, or with a "
+#~ "signature that apt does not have a key for, that package is considered "
+#~ "untrusted, and installing it will result in a big warning. <command>apt-"
+#~ "get</command> will currently only warn for unsigned archives; future "
+#~ "releases might force all sources to be verified before downloading "
+#~ "packages from them."
+#~ msgstr ""
+#~ "アーカイブ由来のパッケージが、署名されなかったり、apt が持っていないキーで"
+#~ "署名されていた場合、信頼されていないと見なし、インストールの際に重要な警告"
+#~ "を表示します。<command>apt-get</command> は、現在未署名のパッケージに対し"
+#~ "て警告するだけですが、将来のリリースでは、アーカイブからパッケージをダウン"
+#~ "ロードする前に、すべてのソースに対して、強制的に検証される可能性がありま"
+#~ "す。"
+
+#~ msgid ""
+#~ "No action; perform a simulation of events that would occur but do not "
+#~ "actually change the system.  Configuration Item: <literal>APT::Get::"
+#~ "Simulate</literal>."
+#~ msgstr ""
+#~ "動作なし - なにが起こるのかのシミュレーションを行い、実際にはシステムの変"
+#~ "更を行いません。設定項目: <literal>APT::Get::Simulate</literal>"
+
+#~ msgid ""
+#~ "Simulated runs performed as a user will automatically deactivate locking "
+#~ "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::"
+#~ "Get::Show-User-Simulation-Note</literal> is set (as it is by default) a "
+#~ "notice will also be displayed indicating that this is only a simulation. "
+#~ "Runs performed as root do not trigger either NoLocking or the notice - "
+#~ "superusers should know what they are doing without further warnings from "
+#~ "<literal>apt-get</literal>."
+#~ msgstr ""
+#~ "ユーザとしてシミュレーションを実行すると、自動ではロックを行いません "
+#~ "(<literal>Debug::NoLocking</literal>)。また、<literal>APT::Get::Show-User-"
+#~ "Simulation-Note</literal> オプションが設定されている (デフォルト) と、これ"
+#~ "がシミュレーションであるという注意を表示します。root 権限で実行すると、"
+#~ "NoLocking も 注意も行われません (スーパーユーザは <literal>apt-get</"
+#~ "literal> による警告などなくても、何をしているのか知っていなければなりませ"
+#~ "ん)。"
+
+#~ msgid ""
+#~ "Ignore if packages can't be authenticated and don't prompt about it.  "
+#~ "This is useful for tools like pbuilder.  Configuration Item: "
+#~ "<literal>APT::Get::AllowUnauthenticated</literal>."
+#~ msgstr ""
+#~ "パッケージを確認できない場合に無視し、それについて質問しません。pbuilder "
+#~ "のようなツールで便利です。設定項目: <literal>APT::Get::"
+#~ "AllowUnauthenticated</literal>"
+
+#~ msgid ""
+#~ "Version 2 of this protocol dumps more information, including the protocol "
+#~ "version, the APT configuration space and the packages, files and versions "
+#~ "being changed. Version 3 adds the architecture and <literal>MultiArch</"
+#~ "literal> flag to each version being dumped."
+#~ msgstr ""
+#~ "このプロトコルのバージョン 2 では、(プロトコルのバージョンや APT 設定ス"
+#~ "ペース、パッケージを含む) 詳細情報やファイル、変更されているバージョンを出"
+#~ "力します。バージョン 3 では出力の各バージョンにアーキテクチャと "
+#~ "<literal>MultiArch</literal> フラグが追加されています。"
+
+#~ msgid ""
+#~ "to the versions that are not installed and do not belong to the target "
+#~ "release."
+#~ msgstr ""
+#~ "インストールされておらず、ターゲットリリースに含まれないバージョン。"
+
+#~ msgid ""
+#~ "Each line specifying a source starts with type (e.g. <literal>deb-src</"
+#~ "literal>)  followed by options and arguments for this type.  Individual "
+#~ "entries cannot be continued onto a following line. Empty lines are "
+#~ "ignored, and a <literal>#</literal> character anywhere on a line marks "
+#~ "the remainder of that line as a comment."
+#~ msgstr ""
+#~ "取得元の各行は、タイプ (例: <literal>deb-src</literal>) で始まり、そのタイ"
+#~ "プのオプションや引数が続きます。個々のエントリは、次行に続けられません。空"
+#~ "行は無視され、<literal>#</literal> 文字を行のどこにおいても、それ以降はコ"
+#~ "メントになります。"
+
+#~ msgid "deb [ options ] uri suite [component1] [component2] [...]"
+#~ msgstr ""
+#~ "deb [ オプション ] uri スイート [コンポーネント1] [コンポーネント2] [...]"
+
+#~ msgid ""
+#~ "     Types: deb deb-src\n"
+#~ "     URIs: http://example.com\n"
+#~ "     Suites: stable testing\n"
+#~ "     Sections: component1 component2\n"
+#~ "     Description: short\n"
+#~ "      long long long\n"
+#~ "     [option1]: [option1-value]\n"
+#~ "\n"
+#~ "     Types: deb\n"
+#~ "     URIs: http://another.example.com\n"
+#~ "     Suites: experimental\n"
+#~ "     Sections: component1 component2\n"
+#~ "     Enabled: no\n"
+#~ "     Description: short\n"
+#~ "      long long long\n"
+#~ "     [option1]: [option1-value]\n"
+#~ "   "
+#~ msgstr ""
+#~ "     Types: deb deb-src\n"
+#~ "     URIs: http://example.com\n"
+#~ "     Suites: stable testing\n"
+#~ "     Sections: component1 component2\n"
+#~ "     Description: short\n"
+#~ "      long long long\n"
+#~ "     [option1]: [option1-value]\n"
+#~ "\n"
+#~ "     Types: deb\n"
+#~ "     URIs: http://another.example.com\n"
+#~ "     Suites: experimental\n"
+#~ "     Sections: component1 component2\n"
+#~ "     Enabled: no\n"
+#~ "     Description: short\n"
+#~ "      long long long\n"
+#~ "     [option1]: [option1-value]\n"
+#~ "   "
+
+#~ msgid ""
+#~ "<literal>options</literal> is always optional and needs to be surrounded "
+#~ "by square brackets. It can consist of multiple settings in the form "
+#~ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+#~ "replaceable></literal>.  Multiple settings are separated by spaces. The "
+#~ "following settings are supported by APT (note however that unsupported "
+#~ "settings will be ignored silently):"
+#~ msgstr ""
+#~ "<literal>オプション</literal> は、常に省略可能で、角カッコで囲む必要があり"
+#~ "ます。複数の設定を <literal><replaceable>設定</replaceable>=<replaceable>"
+#~ "値</replaceable></literal> の形式で定義できます。複数の設定は空白で区切り"
+#~ "ます。以下の設定は APT がサポートしているものです (未サポートのものは黙っ"
+#~ "て無視します)。"
+
+#~ msgid ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> which can be "
+#~ "used to add/remove architectures from the set which will be downloaded."
+#~ msgstr ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> あるいは <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> を使って、ダウン"
+#~ "ロードするアーキテクチャを追加、削除できます。"
+
+#~ msgid ""
+#~ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+#~ "this source are always authenticated even if the <filename>Release</"
+#~ "filename> file is not signed or the signature can't be checked. This "
+#~ "disables parts of &apt-secure; and should therefore only be used in a "
+#~ "local and trusted context. <literal>trusted=no</literal> is the opposite "
+#~ "which handles even correctly authenticated sources as not authenticated."
+#~ msgstr ""
+#~ "<literal>trusted=yes</literal> により、<filename>Release</filename> ファイ"
+#~ "ルが未署名だったり、署名がチェックできなかったりしても、この取得元からの"
+#~ "パッケージを常に認証すると指定します。これは &apt-secure; の一部を無効にし"
+#~ "てしまうため、ローカルで信頼できる場合にのみ、使用するようにしてください。"
+#~ "<literal>trusted=no</literal> は反対に、正しく認証された取得元であっても、"
+#~ "未認証として扱います。"
+
+#~ msgid "Some examples:"
+#~ msgstr "例:"
+
+#~ msgid ""
+#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "
+#~ "non-free\n"
+#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
+#~ "contrib non-free\n"
+#~ "   "
+#~ msgstr ""
+#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "
+#~ "non-free\n"
+#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
+#~ "contrib non-free\n"
+#~ "   "