Merging upstream version 2.9.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 126 insertions, 2 deletions

diff --git a/doc/po/ja.po b/doc/po/ja.po
index f2d045f..ad96ef5 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-04-12 18:21+0000\n"
+"POT-Creation-Date: 2024-04-22 17:38+0000\n"
 "PO-Revision-Date: 2017-01-06 04:50+0900\n"
 "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -146,6 +146,33 @@ msgstr ""
 
 #. type: Plain text
 #: apt.ent
+#, fuzzy, no-wrap
+#| msgid ""
+#| "     <varlistentry>\n"
+#| "      <term><option>-v</option></term>\n"
+#| "      <term><option>--version</option></term>\n"
+#| "      <listitem><para>Show the program version.\n"
+#| "     </para>\n"
+#| "     </listitem>\n"
+#| "     </varlistentry>\n"
+msgid ""
+"     <varlistentry>\n"
+"      <term><option>--audit</option></term>\n"
+"      <listitem><para>Show audit (and notice) messages. This overrides the quiet option, but only for notice messages, not progress ones.\n"
+"     </para>\n"
+"     </listitem>\n"
+"     </varlistentry>\n"
+msgstr ""
+"          <varlistentry>\n"
+"      <term><option>-v</option></term>\n"
+"      <term><option>--version</option></term>\n"
+"      <listitem><para>プログラムのバージョンを表示します。\n"
+"     </para>\n"
+"     </listitem>\n"
+"     </varlistentry>\n"
+
+#. type: Plain text
+#: apt.ent
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -173,7 +200,19 @@ msgstr ""
 
 #. type: Plain text
 #: apt.ent
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "     <varlistentry>\n"
+#| "      <term><option>-o</option></term>\n"
+#| "      <term><option>--option</option></term>\n"
+#| "     <listitem><para>Set a Configuration Option; This will set an arbitrary\n"
+#| "      configuration option. The syntax is <option>-o Foo::Bar=bar</option>.\n"
+#| "      <option>-o</option> and <option>--option</option> can be used multiple\n"
+#| "      times to set different options.\n"
+#| "     </para>\n"
+#| "     </listitem>\n"
+#| "     </varlistentry>\n"
+#| "\">\n"
 msgid ""
 "     <varlistentry>\n"
 "      <term><option>-o</option></term>\n"
@@ -185,6 +224,44 @@ msgid ""
 "     </para>\n"
 "     </listitem>\n"
 "     </varlistentry>\n"
+msgstr ""
+"          <varlistentry>\n"
+"      <term><option>-o</option></term>\n"
+"      <term><option>--option</option></term>\n"
+"     <listitem><para>設定オプションのセット。任意の設定オプションをセットします。\n"
+"     構文 <option>-o Foo::Bar=bar</option> となります。\n"
+"     異なるオプションを設定するため、<option>-o</option> と <option>--option</option> は、\n"
+"     複数回使用できます。\n"
+"     </para>\n"
+"     </listitem>\n"
+"     </varlistentry>\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent
+#, fuzzy, no-wrap
+#| msgid ""
+#| "     <varlistentry>\n"
+#| "      <term><option>-o</option></term>\n"
+#| "      <term><option>--option</option></term>\n"
+#| "     <listitem><para>Set a Configuration Option; This will set an arbitrary\n"
+#| "      configuration option. The syntax is <option>-o Foo::Bar=bar</option>.\n"
+#| "      <option>-o</option> and <option>--option</option> can be used multiple\n"
+#| "      times to set different options.\n"
+#| "     </para>\n"
+#| "     </listitem>\n"
+#| "     </varlistentry>\n"
+#| "\">\n"
+msgid ""
+"     <varlistentry>\n"
+"      <term><option>--no-color</option></term>\n"
+"      <term><option>--color</option></term>\n"
+"<listitem><para>Turn colors on or off. Colors are on by default on supported terminals for &apt; and\n"
+"can also be disabled using the <envar>NO_COLOR</envar> or <envar>APT_NO_COLOR</envar> environment variables,\n"
+"or further configured by the <option>APT::Color</option> configuration option and scope, see &apt-conf; for information on that.\n"
+"     </para>\n"
+"     </listitem>\n"
+"     </varlistentry>\n"
 "\">\n"
 msgstr ""
 "          <varlistentry>\n"
@@ -4430,6 +4507,53 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
 msgid ""
+"This scope defines colors and styles. The basic colors supported are "
+"<option>red</option>, <option>green</option>, <option>yellow</option>, "
+"<option>blue</option>, <option>magenta</option>, <option>cyan</option>, and "
+"<option>white</option>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"The subscope <option>action</option> defines the colors for package lists in "
+"<option>install</option> and similar commands. The following options may be "
+"set: <option>APT::Color::Action::Upgrade</option>, <option>APT::Color::"
+"Action::Install</option>, <option>APT::Color::Action::Install-Dependencies</"
+"option>, <option>APT::Color::Action::Downgrade</option>, <option>APT::Color::"
+"Action::Remove</option>; corresponding to their lists in the &apt; output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Each color may reference one or more other color options by name, relative "
+"to <option>APT::Color</option>. Their escape sequences will be combined."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
+#: apt.conf.5.xml
+#, no-wrap
+msgid ""
+"APT::Color::Bold \"\\x1B[1m\";\n"
+"APT::Color::Action::Install \"cyan\";\n"
+"APT::Color::Action::Upgrade \"bold action::install\";\n"
+"        "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Colors may be turned on or off completely by setting <option>APT::Color</"
+"option> to <option>yes</option> or <option>no</option>, by utilizing "
+"<envar>NO_COLOR</envar> or <envar>APT_NO_COLOR</envar> environment "
+"variables, or using the <option>--color</option>, <option>--no-color</"
+"option> command-line options."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: 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 "