Release 1.3~exp21.3_exp2

1 files changed, 73 insertions, 46 deletions

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 7c0f6f38f..cc9f4acc9 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 1.3~exp1\n"
+"Project-Id-Version: apt-doc 1.3~exp2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"POT-Creation-Date: 2016-06-11 17:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1151,8 +1151,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:1
 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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1797,11 +1797,10 @@ msgstr ""
 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>."
+"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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2850,6 +2849,33 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1
 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:1
+#, 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:1
+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 "
@@ -3305,11 +3331,12 @@ msgstr ""
 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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
@@ -3321,7 +3348,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:1
 #, no-wrap
-msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
+msgid "Acquire::CompressionTypes::Order { \"xz\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3331,15 +3358,14 @@ msgid ""
 "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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
@@ -3353,15 +3379,15 @@ msgstr ""
 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."
+"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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -6100,12 +6126,12 @@ msgstr ""
 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 "
+"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."
@@ -6117,12 +6143,13 @@ 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>, "
+"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>."
+"<literal>Valid-Until</literal>, <literal>Signed-By</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal> and "
+"<literal>Description</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -6219,9 +6246,9 @@ msgstr ""
 #: apt-ftparchive.1.xml:1
 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 ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>