merge with lp:~mvo/apt/debian-sid : move all my ABI break changes

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

diff --git a/doc/po/ja.po b/doc/po/ja.po
index ee2d4aca1a050db4a6e8591266858a5c616a215e..80da7c0a2a97d357ea4d2cd5cb62f31d1a042cb8 100644 (file)
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -1685,7 +1685,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:456 apt.conf.5.xml:478
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
 msgid "options"
 msgstr "オプション"
 
@@ -6340,6 +6340,14 @@ msgid ""
 "multiple servers at the same time.)"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:280
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:281
@@ -6348,9 +6356,16 @@ msgstr "https"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:282
-msgid ""
-"HTTPS URIs. Cache-control and proxy options are the same as for "
-"<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option is "
+#, fuzzy
+#| msgid ""
+#| "HTTPS URIs. Cache-control and proxy options are the same as for "
+#| "<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option "
+#| "is not supported yet."
+msgid ""
+"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
+"options are the same as for <literal>http</literal> method and will also "
+"default to the options from the <literal>http</literal> method if they are "
+"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
 "not supported yet."
 msgstr ""
 "HTTPS URI - キャッシュの制御やプロキシオプションは <literal>http</literal> メ"
@@ -6596,6 +6611,53 @@ msgid ""
 "prefer uncompressed files to support the usage of local mirrors."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:396
+msgid "Languages"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:397
+msgid ""
+"The Languages subsection controls which <filename>Translation</filename> "
+"files are downloaded and in which order APT tries to display the Description-"
+"Translations. APT will try to display the first available Description for "
+"the Language which is listed at first. Languages can be defined with their "
+"short or long Languagecodes. Note that not all archives provide "
+"<filename>Translation</filename> files for every Language - especially the "
+"long Languagecodes are rare, so please inform you which ones are available "
+"before you set here impossible values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:413
+#, no-wrap
+msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:403
+msgid ""
+"The default list includes \"environment\" and \"en\". "
+"\"<literal>environment</literal>\" has a special meaning here: It will be "
+"replaced at runtime with the languagecodes extracted from the "
+"<literal>LC_MESSAGES</literal> enviroment variable.  It will also ensure "
+"that these codes are not included twice in the list. If "
+"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
+"<filename>Translation-en</filename> file (if available) will be used.  To "
+"force apt to use no Translation file use the setting <literal>Acquire::"
+"Languages=none</literal>. \"<literal>none</literal>\" is another special "
+"meaning code which will stop the search for a fitting <filename>Translation</"
+"filename> file.  This can be used by the system administrator to let APT "
+"know that it should download also this files without actually use them if "
+"not the environment specifies this languages. So the following example "
+"configuration will result in the order \"en, de\" in an english and in \"de, "
+"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
+"if APT is not used in a french localization, in such an environment the "
+"order would be \"fr, de, en\".  <placeholder type=\"programlisting\" id=\"0"
+"\"/>"
+msgstr ""
+
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:217